Noveen Sachdeva
1b1f403a5d
Add duration of last job execution to the table
2017-04-25 17:39:58 +02:00
Julius Härtl
7548825743
Responsive app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:24 +02:00
Joas Schilling
ac0c21f4a7
Trigger change when a user is enabled/disabled
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 17:20:35 +02:00
Victor Dubiniuk
131df248ef
Catch session already closed exception in destructor
2017-04-25 16:28:52 +02:00
Morris Jobke
5a9224fb4c
Merge pull request #3531 from nextcloud/theming-scss
...
Theming using SCSS variables
2017-04-25 10:56:13 -03:00
Joas Schilling
f1ffb728b9
Allow meta info and icons
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:31:21 +02:00
Roeland Jago Douma
82c9eb1c56
Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link
...
Fix sharing a password protected link
2017-04-25 14:12:44 +02:00
Julius Härtl
1c54463853
Use theming cachebuster for server resources
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
Julius Haertl
68a63ad3f3
Implement scss variable injection by OC_Defaults
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Add Scss variables to example theme and theming app
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Use SCSSCacher to build theming css
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Update theming.scss
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Code cleanup
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Inject SCSSCacher for easier testing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix typehint
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Generate absolute URLs
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Fix tests to always use absolute urls for theming images
Signed-off-by: Julius Härtl <jus@bitgrid.net>
MailheaderColor -> ColorPrimary
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 11:39:45 +02:00
Joas Schilling
35414884d3
Add lists to HTML emails
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 13:48:27 +02:00
Daniel Calviño Sánchez
faea890b87
Extract updateSharePasswordIfNeeded function
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 13:38:36 +02:00
Daniel Calviño Sánchez
51e658da2a
Join if block to preceding if chain
...
If getShareType() returns "email" it can not also return "user", "group"
nor "link", so the if block can be added to the preceding if chain.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 13:17:46 +02:00
Joas Schilling
3d671cc536
Merge pull request #4443 from nextcloud/cleanup-unused-imports
...
Remove unused use statements
2017-04-24 11:47:37 +02:00
Daniel Calviño Sánchez
dcc8cce28b
Fix double hashing of shared link passwords
...
The plain text password for a shared links was hashed and, then, the
hashed password was hashed again and set as the final password. Due to
this the password introduced in the "Authenticate" page for the shared
link was always a wrong password, and thus the file could not be
accessed.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
Morris Jobke
c54a59d51e
Remove unused use statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
Morris Jobke
2b6f6dac00
Remove unused variables
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 18:20:51 -05:00
Roeland Jago Douma
867b3ee234
Merge pull request #4396 from nextcloud/scan-non-existing
...
show error when trying to scan non existing path
2017-04-21 19:47:33 +02:00
Roeland Jago Douma
d46b155916
Merge pull request #4428 from nextcloud/file-by-id-limit-user
...
limit the user when searching for a file by id if we know the user already
2017-04-21 19:43:53 +02:00
Robin Appelman
6fbe991afb
limit the user when searching for a file by id if we know the user already
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-21 17:11:26 +02:00
Roeland Jago Douma
e9b00f84b8
Merge pull request #4406 from nextcloud/fix-unit-test-problems
...
Fix unit test problems
2017-04-21 09:35:01 +02:00
Bjoern Schiessle
972b4c04e2
respect password policy for auto generated passwords
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
d8dcd72118
allow admin to enforce password on mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Robin Appelman
a0e5107c0b
check for existence before we start the db transaction
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-20 13:25:49 +02:00
Joas Schilling
9871e4eaee
Kill dead code
...
> No tests found in class "Test\Share\MailNotificationsTest".
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:43:19 +02:00
Joas Schilling
140580f9d8
Merge pull request #4398 from nextcloud/fix_accesslistcode
...
Get proper accesslist for userFolder
2017-04-20 11:03:22 +02:00
Roeland Jago Douma
ae2db5e60d
Get proper accesslist for userFolder
...
If the accesslist is requested for a users root folder we should
properly construct the path
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 10:28:32 +02:00
Joas Schilling
799b229a68
Merge pull request #4381 from nextcloud/2954_take_2
...
Fix group settings routes and fix route regression
2017-04-20 10:25:16 +02:00
Morris Jobke
fbedea0807
Add PHPDoc and handle exception in ScanAppData as well
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:04:16 -05:00
Morris Jobke
16c4755e03
Rename renderHTML to renderHtml
...
* fixes #4383
* improves consistency
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 15:46:41 -05:00
Robin Appelman
ce2dba0796
show error when trying to scan non existing path
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-19 14:36:38 +02:00
Lukas Reschke
a3569a1452
Merge pull request #4382 from nextcloud/use-proper-reply-to
...
Add "Reply-To" on ShareByMailProvider mails
2017-04-19 12:04:18 +02:00
Morris Jobke
f1ddb939a0
Merge pull request #4371 from nextcloud/dont-allow-dot-usernames
...
Better validation of allowed user names
2017-04-18 20:04:32 -05:00
Morris Jobke
269600a04f
Merge pull request #4369 from nextcloud/fix-translations
...
Fix translations
2017-04-18 18:01:50 -05:00
Joas Schilling
1c0bffe87f
Fix translations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Morris Jobke
47fe5e8f41
Merge pull request #4380 from nextcloud/show-instance-name-in-from
...
Add instance name to default sender
2017-04-18 16:22:56 -05:00
Lukas Reschke
203ef88509
Add "Reply-To" on ShareByMailProvider mails
...
Fixes https://github.com/nextcloud/server/issues/4209
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 22:23:07 +02:00
Roeland Jago Douma
d12ec7cff1
Revert "Match slashes in ../{id} resource routes"
...
This reverts commit 31f9be7a75
.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-18 21:50:36 +02:00
Lukas Reschke
bae64e810e
Add instance name to default sender
...
Otherwise your mail program shows "foo@mail.com" instead of "Nextcloud" or whatever your instance name is.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 21:44:37 +02:00
Joas Schilling
a5b4308a51
Don't put the SMTP password into the HTML code
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 15:44:20 +02:00
Joas Schilling
a3922bbcdc
Better validation of allowed user names
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 14:29:34 +02:00
Morris Jobke
10290eb006
Merge pull request #2834 from nextcloud/accesListToShareManager
...
Access list to share manager
2017-04-15 13:06:24 -05:00
Roeland Jago Douma
f40b9fa9bd
Merge pull request #4330 from nextcloud/activities-for-password-mail-change
...
Add activities when email or password is changed
2017-04-14 08:16:43 +02:00
Lukas Reschke
8149945a91
Make BruteForceProtection annotation more clever
...
This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware.
Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 23:05:33 +02:00
Morris Jobke
d0c0f6cfc1
Merge pull request #4326 from nextcloud/downstream-27562
...
Reorder the entries of the log for easier reading
2017-04-13 13:11:47 -05:00
Lukas Reschke
81d3732bf5
Merge pull request #4308 from nextcloud/lost-password-email
...
Update email template for lost password email
2017-04-13 20:02:15 +02:00
Morris Jobke
d36751ee38
Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login
...
Fix login controller test and consolidate login
2017-04-13 12:16:38 -05:00
Morris Jobke
ac05d6dd67
Improve PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 12:16:12 -05:00
Joas Schilling
695696a4a6
Use constants
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:04:32 -05:00
Roeland Jago Douma
0f5682321e
Fix server container registration
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 14:52:09 +02:00
Roeland Jago Douma
aef95b9b7d
Not needed in the DIContainer anymore
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 13:37:39 +02:00
Roeland Jago Douma
b96297e9cc
Do not set full path if not currentAccess
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:53 +02:00
Joas Schilling
f57ef55249
Add samples to the docs
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:53 +02:00
Joas Schilling
29f2088a7b
Catch exceptions and use as many results as possible
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:53 +02:00
Joas Schilling
629b7c0fc3
Adjust docs and make !$currentAccess simpler
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling
5b57bb955b
Fix default share provider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling
2fcf334c6a
Fix tests for ShareHelper
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling
3c1365c0d1
Fix returned paths for remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling
4bcb7d88b5
Return the token as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling
cf7c320949
Also return the token
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling
91e650791d
Return the paths for the users without setting them all up
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
0c2dc3bc8c
Fix comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
12afd7d1d5
Add mail element to access list
...
* Each provider just returns what they have so adding an element won't
require changing everything
* Added tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
2cbac3357b
Offload acceslist creation to providers
...
* This allows for effective queries.
* Introduce currentAccess parameter to speciy if the users needs to have
currently acces (deleted incomming group share). (For notifications)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
97f8ca6595
Added ShareHelper
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma
a1edcc8ecf
Port Encryption/file to new getAccessList
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma
88299ec27c
Added to public interface
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma
7dcc98eb20
Add owner to access list
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma
d84df15590
Add getAccessList to ShareManager
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:48 +02:00
Joas Schilling
1110b51aa3
Allow to read the old email on the hook as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:34:02 +02:00
Lukas Reschke
e39e6d0605
Remove expired attempts
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:18 +02:00
Lukas Reschke
a1ae5275f9
Move to dedicated MiddleWare
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:17 +02:00
Lukas Reschke
511524c668
Add isset() as it can be an empty result
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:17 +02:00
Lukas Reschke
d729bde98c
Register in ServerContainer
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
Lukas Reschke
66835476b5
Add support for ratelimiting via annotations
...
This allows adding rate limiting via annotations to controllers, as one example:
```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```
Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
Joas Schilling
f23a36b0a6
Add activities when email or password is changed
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 11:13:19 +02:00
Lukas Reschke
01f3698175
Merge pull request #3966 from nextcloud/downstream-26570
...
Override config.php values through environment variables
2017-04-13 10:51:09 +02:00
Morris Jobke
7cb6038fca
Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login
...
Dont create a log entry on email login
2017-04-13 01:04:11 -05:00
Morris Jobke
1f962f9115
Update email template for lost password email
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 15:19:53 -05:00
Roeland Jago Douma
b3b24172e4
Merge pull request #4307 from nextcloud/sharing-emails
...
New emails for sharebymail
2017-04-12 21:23:11 +02:00
Morris Jobke
a7da2ef977
Merge pull request #4282 from nextcloud/oci-connect-string
...
use the same oci connectstring in all code paths
2017-04-12 13:11:00 -05:00
Morris Jobke
124fdf8062
Merge pull request #4331 from nextcloud/query-builder-sum
...
Add sum() to the query function builder
2017-04-12 12:55:09 -05:00
Morris Jobke
31024b7700
Merge pull request #4329 from nextcloud/move-out-shared-folder
...
Fix moving files out of a shared folder
2017-04-12 11:44:26 -05:00
Joas Schilling
4b639e2763
No newlines when heading is empty
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:27 +02:00
Bjoern Schiessle
0a464dfb61
make the plain text footer standard compliant and add a space after '--'. It also adds a line break in front so that there is some spacing between the mail body and the footer
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-12 17:16:27 +02:00
Joas Schilling
1c8c62272c
Use instance name as alt-text
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
Joas Schilling
506c7731a6
Don't duplicate the sentence with the header
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
Morris Jobke
33e077c1c1
Properly escape heading, body and button text
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Morris Jobke
050ce1d40b
Add addBodyButton to add a single button to email templates
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Robin Appelman
ac45af68cd
Add sub() to the query function builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 16:09:35 +02:00
Roeland Jago Douma
dccb8928a1
Merge pull request #4325 from nextcloud/downstream-27522
...
Optimize put - Dont try to fetch filecache for not existing filecache…
2017-04-12 16:04:03 +02:00
Björn Schießle
b90e91144b
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
...
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
Robin Appelman
8500debe79
use unjailed path when moving files out of a shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:56:51 +02:00
Robin Appelman
2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:55:47 +02:00
Juan Pablo Villafáñez
38e5135cb9
Reorder the entries of the log for easier reading
2017-04-12 13:03:19 +02:00
Piotr M
dc78f1251e
Optimize put - Dont try to fetch filecache for not existing filecache in encription
2017-04-12 12:54:20 +02:00
Joas Schilling
bd37021587
Fix casing of same origin frame option
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 12:37:32 +02:00
Lukas Reschke
b5d31e4e65
Merge pull request #4309 from nextcloud/remove-unused-code
...
Removes unused code for link share emails
2017-04-12 10:15:59 +02:00
Morris Jobke
be9a514dff
Allow to set text versions for the plain text email
...
* allows different texts for HTML and text version of the email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:50:06 -05:00
Morris Jobke
8fa5141aaa
Removes unused code for link share emails
...
* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:32:48 -05:00
Lukas Reschke
3600dd4f52
Add IEMailTemplate to public OCP API
...
Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 16:35:46 +02:00
Roeland Jago Douma
53bca14a27
Do proper DI
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
449011dae7
remove discovery manager in favour of the OCSDiscoveryService
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
0dea31d48b
add tests for discovery service
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
45aee2e479
provide public discovery service to discover OCS end-points on another server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:03:59 +02:00
Lukas Reschke
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
Morris Jobke
11d6fe1023
Merge pull request #4283 from nextcloud/shares-by-folder-quote
...
properly quota table names in getSharesInFolder
2017-04-10 19:39:19 -05:00
Morris Jobke
a045f3c4d7
Merge pull request #4146 from nextcloud/unread-comments-folder
...
Allow getting the unread comment count for an entire folder at once
2017-04-10 13:21:39 -05:00
Robin Appelman
a555672f21
properly quota table names in getSharesInFolder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:59:40 +02:00
Robin Appelman
421ca6439f
use the same oci connectstring in all code paths
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:58:52 +02:00
Björn Schießle
18580395d4
Merge pull request #4277 from nextcloud/permissions-mask-scanner
...
Dont use the permissions mask while scanning
2017-04-10 16:04:12 +02:00
Roeland Jago Douma
e9c6fe2fd8
Merge pull request #4222 from nextcloud/dav-search-fileid
...
Allow searching file by fileid
2017-04-10 15:57:56 +02:00
Robin Appelman
a7c611039d
Dont use the permissions mask while scanning
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 15:19:21 +02:00
Roeland Jago Douma
afea05d296
Merge pull request #4210 from nextcloud/downstream-26643
...
Removed path to datadir in exception
2017-04-10 12:43:46 +02:00
Joas Schilling
9e3a3eebf9
Lowercase "data" correctly
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-10 11:13:46 +02:00
Joas Schilling
bc217cdf87
Also send the new account data with the event
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-10 10:22:57 +02:00
Morris Jobke
5b4adf66e5
Move OC_Defaults to OCP\Defaults
...
* currently there are two ways to access default values:
OCP\Defaults or OC_Defaults (which is extended by
OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
it hard to work on theme values
* this extended the public interface with the missing
methods and uses them everywhere to only rely on the
public interface
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
Morris Jobke
ca9d25169d
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
...
Unified sharing options
2017-04-07 17:14:05 -05:00
Roeland Jago Douma
6c0cafb10f
Merge pull request #4253 from nextcloud/downstream-27599
...
make JobList::next() lock free
2017-04-07 22:18:40 +02:00
Jörn Friedrich Dreyer
c993c363e0
make JobList::next() lock free
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-07 13:07:09 -05:00
Lukas Reschke
281ad406e8
Add support for theming
...
Add support for theming in generated emails and simplify API
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Morris Jobke
0560e69913
New layout for welcome email
...
* thanks to @espina2 for make this nice design
* the button says "Set password" if the admin didn't specified a password
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-07 12:03:32 -05:00
Bjoern Schiessle
3323d01db1
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Joas Schilling
9f3d9b5b23
Don't force the use of Accept-Language anymore
...
This is not intended anymore, since it falls back to force english
when the header is not set. Also 0228bc6e66
makes clear that the order should be:
1. User setting
2. Accept language
3. Admin default
This is the case since the commit from above, unless via OCS and DAV.
Both forced to accept-language falling back to english.
By removing the force, it now also matches the w3 priority list:
https://www.w3.org/International/questions/qa-lang-priorities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 11:10:04 +02:00
Joas Schilling
7ad791efb4
Dont create a log entry on email login
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 10:15:20 +02:00
Arthur Schiwon
fbadb37b9b
use known LockdownManager
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:27:30 +02:00
Arthur Schiwon
0a463e55ae
Save correct login name
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
Morris Jobke
4eddb95fc4
Add method to $methodsWithSensitiveParameters
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-06 15:22:43 +02:00
Arthur Schiwon
daf9d23547
don't regenerate Session ID twice, also fixes tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
Arthur Schiwon
50844e8c47
regenerate session id on successful login, fixes integration test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
Arthur Schiwon
7b3fdfeeaa
do login routine only once when done via LoginController
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:42 +02:00
Robin Appelman
baec42e80a
Save the scope of an auth token in the session
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-05 17:58:33 +02:00
Robin Appelman
bb7e236e74
Allow searching file by fileid
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-05 15:22:53 +02:00
Kawohl
bee0a3699e
removed path to datadir
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 19:07:59 -05:00
Morris Jobke
95a21e2f2a
Check for boolean false and add tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
Morris Jobke
0fcb37adcb
OC_ -> NC_
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
Philipp Schaffrath
695a17804e
Override config.php values through ENV variables ( #26570 )
...
* added functionality to override config.php values with 'OC_' prefixed environment variables
* use getenv to read environment variables since apache does not set $_ENV variables, fixed test
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
Morris Jobke
fa4107893d
Merge pull request #4138 from nextcloud/resources_match_fullid
...
Match slashes in ../{id} resource routes
2017-04-04 15:52:53 -05:00
Morris Jobke
b78876236d
Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-selection
...
Redirect to 2FA selection screen
2017-04-04 15:47:35 -05:00
Morris Jobke
52eaf6cfbb
Merge pull request #3310 from duritong/patch-1
...
only chmod logfile if necessary
2017-04-04 11:42:26 -05:00
Lukas Reschke
e0227cb458
Merge pull request #2095 from nextcloud/bruteforcesetttings
...
Introduce bruteforce settings
2017-04-04 11:57:43 +02:00
Roeland Jago Douma
efb21a948e
Merge pull request #4093 from nextcloud/endorse-password-protection
...
Endorse password protection
2017-04-04 11:04:21 +02:00
Roeland Jago Douma
31f9be7a75
Match slashes in ../{id} resource routes
...
Fixes #2954
Before we could match on <prefix>/{id} however if the id contains a /
this would not match properly. But since we define the resource routes
internally we now make sure that we match all chars (up until the ?).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 08:37:11 +02:00
Roeland Jago Douma
2a9192334e
Don't try to parse empty body if there is no body
...
Fixes #3890
If we do a put request without a body the current code still tries to
read the body. This patch makes sure that we do not try to read the body
if the content length is 0.
See RFC 2616 Section 4.3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 08:22:33 +02:00
Christoph Wurst
a7cc8c86ab
Redirect to 2FA selection screen
...
Apps like 'rainloop' use \OCP\Util::isLoggedIn() to check whether the
current request is authenticated. Since we redirected to the index
page before, it resulted in an infinite redirection loop. This change
sets the redirection URL to the 2FA selection page, which is the only
allowed page in that authentication state.
Fixes https://github.com/nextcloud/server/issues/3702
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-03 14:31:57 +02:00
Christoph Wurst
cbe44043be
Merge pull request #4131 from nextcloud/fix-jscombiner
...
Fix check for cache value in JSCombiner
2017-04-03 11:27:39 +02:00
Bjoern Schiessle
b85b6f2439
feature endorse password for share links
...
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set. by Timo Benk
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:57:52 +02:00
Bjoern Schiessle
dac6826ad7
setting to disable sending password by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle
b84fd7c361
set expire date for all share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
3cc0d15f92
add secure drop functionallity to mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c191173d59
allow password protected mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
0d5147bd49
add new password column to the share table in order to set passwords for share by mails
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
Morris Jobke
ed00bab80b
Fixed layout of bruteforcesettings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-02 21:19:30 +02:00
Roeland Jago Douma
be674c19a5
Respect bruteforce settings in the Throttler
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:50 +02:00
Roeland Jago Douma
dca555b7f3
Adds security section to the admin page
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:09 +02:00
Björn Schießle
85da9378c0
Merge pull request #4140 from nextcloud/no_encryption_no_wrapper
...
Don't add the Encryption Storage Wrapper if there are no encryption modules
2017-03-31 14:49:38 +02:00
Roeland Jago Douma
548871a9f3
Merge pull request #3832 from nextcloud/fix_1303
...
Do not clear CSRF token on logout (fix for #1303 )
2017-03-30 18:25:50 +02:00
Joas Schilling
a51e4dd259
Merge pull request #4150 from nextcloud/capped-memcache-push
...
support pushing to CappedMemoryCache
2017-03-30 15:16:33 +02:00
Robin Appelman
11c1e5dd86
fix whitespace in cleantags
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:49:09 +02:00
Robin Appelman
40154dd6a3
use castColumn
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:30 +02:00
Robin Appelman
212d9fd277
Add test for getting unread comment count by folder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:27 +02:00
Robin Appelman
429f8ae011
Allow getting the unread comment count for an entire folder at once
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:24 +02:00
Robin Appelman
0aeb595784
user ids are strings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:24:46 +02:00
Robin Appelman
dc4b983639
support pushing to CappedMemoryCache
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:21:32 +02:00
Robin Appelman
d4a7cfec7c
rename fun to func
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:06 +02:00
Robin Appelman
fee818f493
Add tests for query builder (i)like
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:03 +02:00
Robin Appelman
3355fd549f
dont double escape
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:59 +02:00
Robin Appelman
4125bdeb93
fix licence headers
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:52 +02:00
Robin Appelman
4b7bc2af0e
Move all children of a folder in a single query
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:48 +02:00
Robin Appelman
4279b13270
Add function builder to the query builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:26 +02:00
Robin Appelman
a65652fc1e
add support for escaping like parameters when using the query builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:22 +02:00
Robin Appelman
83f3990e06
Add MD5() to sqlite
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:19 +02:00
Lukas Reschke
1ee7e1c0b1
Merge pull request #4132 from nextcloud/fix-safari-gzip
...
Fix gzip files for Safari
2017-03-30 10:47:28 +02:00
Roeland Jago Douma
111c9f7563
Don't add the Encryption Storage Wrapper if there are no encryption modules
...
fixes #4125
If there is no encryption module enabled it makes no sense to setup the
encryption wrapper (because we can't do anything anyway).
This saves reading the header of files.
Especialy on external storage/objectstore this should improve
performance
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 18:57:56 +02:00
Jan-Christoph Borchardt
354a24e0aa
also rename defaultMailHeaderColor to defaultColorPrimary
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Julius Härtl
698396a927
Add fallback to getMailHeaderColor so we don't break existing themes
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-29 18:23:23 +02:00
Jan-Christoph Borchardt
9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Roeland Jago Douma
626d03e3d4
Merge pull request #4116 from nextcloud/swift-cache-token
...
Cache swift authentication token in memcache
2017-03-29 11:23:13 +02:00
Joas Schilling
784e06073b
Merge pull request #4129 from nextcloud/remove-verbose-error-message
...
Remove verbose error message
2017-03-29 10:01:17 +02:00
Morris Jobke
9813023aab
Fix gzip files for Safari
...
* Safari support gzip only if the filename does not
end on .gz - so this renames them to .gzip
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:11:51 -06:00
Morris Jobke
1f7124a57b
Merge pull request #4120 from nextcloud/newest-item-first-in-activity
...
Change the order on merging activities so the newest item is first
2017-03-28 17:51:30 -06:00
Morris Jobke
dbf6b7ff86
Merge pull request #4127 from nextcloud/update-legacy-csp-policy
...
Update legacy CSP policy
2017-03-28 17:47:32 -06:00
Morris Jobke
51e5c0766c
Fix check for cache value in JSCombiner
...
* fixes following log output, because there was empty string
stored in the cache
Invalid argument supplied for foreach() at lib/private/Template/JSCombiner.php#108
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-28 17:43:39 -06:00
Morris Jobke
16b8c0c691
Merge pull request #4070 from nextcloud/gzip_scss_js
...
GZip generated CSS/JS files
2017-03-28 17:11:17 -06:00
Lukas Reschke
49ba822fef
Remove verbose error message
...
There's no need to have this included in the error message.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-29 00:34:33 +02:00
Lukas Reschke
3a90ab7e0a
Update legacy CSP policy
...
Aligns it with the one enforced by the AppFramework
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-28 23:55:31 +02:00
Roeland Jago Douma
a40405531c
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 23:13:59 +02:00
Roeland Jago Douma
4821c00ea8
Merge pull request #4004 from nextcloud/backport-27172
...
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
2017-03-28 21:56:44 +02:00
Roeland Jago Douma
54f9b35f71
Allow to gzip CSS/JS files
...
Since in production the SCSS files are compiled once and the javascript
files are combined once we can just as well gzip them aggresively.
This means that once they are requested and the browser supports gzip we
can just serve the gzipped file saving precious bandwidth.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 21:46:23 +02:00
Robin Appelman
6991b79d40
serialize the token to json instead of using php's serialize
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 21:33:07 +02:00
Robin Appelman
205d5586e8
cache swift tokens in memcache
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 12:37:41 -06:00
Robin Appelman
e26f138fc5
Merge pull request #4112 from nextcloud/swift-config
...
Better error messages for objectsack swift configuration
2017-03-28 17:51:18 +02:00
Joas Schilling
644b37c7e4
Change the order on merging activities so the newest item is first
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-28 17:19:34 +02:00
Robin Appelman
8dbca71a77
better error messages for invalid regions, urltypes and service names
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 17:00:11 +02:00
Robin Appelman
5062d0ac50
better error messages when swift authentication fails
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 11:02:18 +02:00
Morris Jobke
da11931815
Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-items
...
Don't spam the log with "Undefined index showInHeader"
2017-03-27 15:53:08 -06:00
Morris Jobke
f76a3b532d
Merge pull request #4096 from nextcloud/touch-floor
...
round the mtime in touch
2017-03-27 09:46:10 -06:00
Robin Appelman
8de4209c3e
round the mtime in touch
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 17:07:48 +02:00
Georg Ehrke
fc044caab1
Merge pull request #4072 from nextcloud/move-x-frame-options-into-php
...
Move X-Frame-Options into PHP
2017-03-27 15:05:22 +02:00
Joas Schilling
81d87b01fe
Don't spam the log with "Undefined index showInHeader"
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-27 10:24:10 +02:00
Joas Schilling
8d3c461151
Allow to specify the id
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 23:07:54 +02:00
Joas Schilling
918f6fd10b
Make sure help is always after users
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 22:32:12 +02:00
Morris Jobke
900f11fd91
Fix order as @jancborchardt requested
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 14:30:21 -06:00
Joas Schilling
0229c16e5f
Don't use the dropdown for one item only
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:23:18 +02:00
Joas Schilling
e0b040d623
Allow multiple navigation links from info.xml
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:15:25 +02:00
Joas Schilling
7cc5130e82
Allow apps to register a setting via info.xml
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 20:37:39 +02:00
Joas Schilling
433958e2e3
Move app management to the settings menu
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 20:26:05 +02:00
Joas Schilling
054e161eb5
Manage the right side menu via the navigation manager as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 19:40:41 +02:00
Joas Schilling
ec330c7ac4
Register the app management in the normal way
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 19:08:51 +02:00
Lukas Reschke
bff6c8aafc
Move X-Frame-Options into PHP
...
The public calendar view should be embeddable and we can't do that if the .htaccess sets a global X-Frame-Options.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 17:26:11 +02:00
Joas Schilling
3668673d7b
Create a notification when the update server couldn't be reached for some days
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 10:59:58 +02:00
Jörn Friedrich Dreyer
5da845609d
no ternary
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-25 21:25:38 -06:00
Jörn Friedrich Dreyer
3d0005d001
fix constant
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-25 21:25:30 -06:00
Robin McCorkell
ef57c03dd2
Add Redis Cluster support
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-25 21:25:27 -06:00
Lukas Reschke
d81cdcbe88
Don't run JSCombiner when not installed
...
When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-25 15:25:06 +01:00
Morris Jobke
2f7669179e
Merge pull request #4043 from nextcloud/merge-js-for-template-prepend
...
Merge JS for template prepend
2017-03-24 15:42:08 -06:00
Lukas Reschke
6a470e5935
Merge JS for template prepend
...
Shaves off 14 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:37:13 +01:00
Lukas Reschke
4d68324ba6
Merge sharing backend JS
...
Removes 8 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:17:38 +01:00
Roeland Jago Douma
b5299b1403
Add return
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma
90910290d1
Add debug mode
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma
242f8964cf
Add caching
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma
8e89ad21a2
[PoC] JS Combiner
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:10 +01:00
Lukas Reschke
f94bc6f8bb
Merge pull request #4013 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-24 10:49:57 +01:00
Morris Jobke
1397b84777
Merge pull request #3928 from nextcloud/downstream-17978
...
Adjust 4 byte MySQL code to upstream
2017-03-23 23:45:43 -06:00
Morris Jobke
d197f609a8
Merge pull request #3889 from nextcloud/downstream-26950
...
Sharing dialog: make autocomplete sorting case insensitive
2017-03-23 23:45:28 -06:00
Morris Jobke
dbaebc53b0
fix sorting in the backend
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 15:41:25 -06:00
Morris Jobke
b59f6dcca4
Merge pull request #3850 from nextcloud/search-order
...
Fix search ordering
2017-03-23 15:25:27 -06:00
Robin Appelman
2d02a4735c
Fix search ordering
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 15:24:50 -06:00
Morris Jobke
eee7e97a6e
Merge pull request #4001 from nextcloud/backport-27389
...
Ensure that FileInfo return values as required by its phpdoc.
2017-03-23 13:00:49 -06:00
Lukas Reschke
9039b71a23
Merge pull request #4000 from nextcloud/backport-27216
...
allow configuring authType for DAV backend
2017-03-23 19:28:49 +01:00
Joas Schilling
88015bc51f
Fix type hints and doc blocks
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 17:52:47 +01:00
Roeland Jago Douma
eda98ed3df
Merge vendor js
...
There is a bunch of javascript we always load from vendors. This
combines this into 1 javascript file. Which reduces the number of
request by ~10.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-23 13:40:23 +01:00
Lukas Reschke
9675bbd830
Merge pull request #3978 from nextcloud/scss_deps_memcache
...
Cache SCSS dependency file in memcache
2017-03-23 11:56:35 +01:00
Lukas Reschke
d6cff564f6
Merge pull request #3994 from nextcloud/only_init_backbone_once
...
Only initialize backbone once
2017-03-23 11:54:54 +01:00
Vincent Petry
89c42a76c3
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
...
The CacheWrapper will properly forward the call to the wrapped cache.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 00:02:48 -06:00
Piotr M
5c7079f8c6
Ensure that FileInfo return values as required by its phpdoc.
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 20:03:46 -06:00
Jörn Friedrich Dreyer
9eca1da1dd
allow configuring authType for DAV backend
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:13:42 -06:00
Roeland Jago Douma
e4d4fb5352
Only initialize backbone once
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 22:48:58 +01:00
Roeland Jago Douma
e3925ba2a1
Cache SCSS dependency file in memcache
...
Since reading a file from disks can be costly. Lets store the dependency
json also in memcache.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 20:14:08 +01:00
Morris Jobke
e25b997d0b
Merge pull request #3497 from nextcloud/mount-shared-last
...
mount shared mounts last
2017-03-22 13:12:54 -06:00
Robin Appelman
714f198a5d
mount shared mounts last
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-22 17:15:42 +01:00
Roeland Jago Douma
4518a28924
Revert "Bundle vendor js"
2017-03-22 17:01:54 +01:00
blizzz
0b5e1814be
Merge pull request #3977 from nextcloud/di_ng2
...
Make DI work for all apps
2017-03-22 15:36:52 +01:00
Roeland Jago Douma
ec3f5aa6e2
Merge pull request #3795 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-22 13:34:21 +01:00
Joas Schilling
9667ac2b8e
Register the namespace with the autoloading to allow reverse recovery
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 11:55:04 +01:00
Joas Schilling
3f86f1276f
Also cache the namespace from appinfo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 11:50:31 +01:00
Joas Schilling
5695a4ec92
Don't do a recursive search
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 10:44:13 +01:00
Joas Schilling
9208f6379c
buildAppNamespace already has the fallback
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 10:13:14 +01:00
Roeland Jago Douma
a427e130ae
When debug don't load the bundled file
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:58:28 +01:00
Joas Schilling
5a6e29e4a8
Remove ownCloud Root Authority as per todo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 08:54:40 +01:00
Roeland Jago Douma
98a14909e1
Bundle more default vendor js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:49:03 +01:00
Roeland Jago Douma
7195a9323d
Merge vendor js
...
There is a bunch of javascript we always load from vendors. This
combines this into 1 javascript file. Which reduces the number of
request by ~10.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:48:10 +01:00
Morris Jobke
3329f44a76
Address comments
...
* fix URL to documentation
* improve logic of UTF8mb4 check
* fix connection parameter creation - it's done already in ConnectionFactory::createConnectionParams
* remove unused attributes of MDB2SchemaReader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:42 -06:00
Morris Jobke
713f684a8b
Adding tests for 4 byte unicode characters
...
* success on SQLite and Postgres
* failure on MySQL due to the limited charset that only supports up to 3 bytes
Add config option to update charset of mysql to utf8mb4
* fully optional
* requires additional options set in the database
only disable unicode test on mysql
Fixing ctor call
Adding docker based unit test execution for mysql utf8mb4
Add mysqlmb4 test configuration to Jenkinsfile
fix collation on utf8mb4
Properly setup charset and collation in the doctrine connection
Allow files containing 4-byte chars in case the database supports it
During setup of a mysql database we try to detect if charset 'utf8mb4' can be used
Fix mysql settings
Add console command to migrate the charset
Set ROW_FORMAT before setting collation to mb4
Also select tables with wrong collation
Faster MySQL docker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:12 -06:00
Roeland Jago Douma
67909cf87b
Make DI work for all apps
...
As stated in https://github.com/nextcloud/server/pull/3901#issuecomment-288135309
appid's don't have to match the namespace.
Work around this
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 20:53:37 +01:00
Lukas Reschke
99bf437640
Remove test code
...
This seems to have been commited by mistake with 6dbe417c51
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 16:59:10 +01:00
Joas Schilling
348d97dfd6
Merge pull request #3844 from nextcloud/unshare_event
...
Unshare event
2017-03-21 16:57:09 +01:00
Roeland Jago Douma
92f50c7d87
Core is also a special app
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 10:42:33 +01:00
Roeland Jago Douma
48c34522ed
Move a lot of stuff over to the ServerContainer
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 10:29:59 +01:00
Roeland Jago Douma
c92b9ce2c4
Fix settings tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
21641302a9
Add DI intergration tests
...
* Moved some interface definitions to Server.php (more to come)
* Build/Query only for existing classes in the AppContainer
* Build/Query only for classes of the App in the AppContainer
* Offload other stuff to the servercontainer
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
7cece61ff6
Extend DI tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
246e9ce547
More elegant handling of recursion
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
df14684817
PoC of moving the interface classes to the servercontainer
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
886202123c
Update query method for DIContainer
...
To align with https://github.com/nextcloud/server/issues/2043#issuecomment-287348294
This would mean that AppContainers only hold the AppSpecific services
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:17 +01:00
Lukas Reschke
21cf1b22e9
Merge pull request #3530 from nextcloud/scss-variables
...
Implement scss variables
2017-03-20 19:49:53 +01:00
Christoph Wurst
03a92eaf74
Merge pull request #3957 from nextcloud/downstream-27307
...
Follow up to #3949 (app exists on enable)
2017-03-20 18:10:05 +01:00
Julius Härtl
29ec58f1b5
Add tests for SCSSCacher
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 14:12:35 +01:00
Lukas Reschke
450a899f01
Merge pull request #3945 from nextcloud/downstream-27298
...
Adding file, line, class and function to the query logger (#27298 )
2017-03-20 13:16:10 +01:00
Julius Haertl
4fbf9a4feb
Add tests for SCSSCacher
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
Julius Haertl
2bd06e0d37
Add variables.scss and import it for each scss file
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:05 +01:00
Joas Schilling
85a5c24934
Merge pull request #3939 from nextcloud/downstream-27159
...
Fix malformed logging in exception
2017-03-20 12:46:48 +01:00
Joas Schilling
257fbd85eb
Merge pull request #3929 from nextcloud/downstream-27068
...
cache loadUser if not exists
2017-03-20 12:44:54 +01:00
Joas Schilling
35f6b8716e
Merge pull request #3884 from nextcloud/downstream-26956
...
Skip null groups in group manager
2017-03-20 12:27:38 +01:00
Lukas Reschke
a3739906f6
Merge pull request #3924 from nextcloud/preview_fixes
...
Do not generate the max preview twice
2017-03-20 11:45:51 +01:00
Lukas Reschke
ac1aff7d92
Merge pull request #3950 from nextcloud/downstream-27149
...
Forbid to upload part files via web UI
2017-03-20 11:44:57 +01:00
Lukas Reschke
ab9e3525cc
Move error message to log entry
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 11:06:08 +01:00
Joas Schilling
6d30b35ed7
Some more code fixes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:45:27 +01:00
Joas Schilling
591e75df5c
Don't use a generic exception
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:33:16 +01:00
Morris Jobke
c969d8005e
Merge pull request #3949 from nextcloud/downstream-27307
...
Check if app exists before enabling
2017-03-20 03:21:02 -06:00
Lukas Reschke
373bfea427
Merge pull request #3940 from nextcloud/downstream-27048
...
Add postLogout hook to finish sessions from external session managers…
2017-03-20 10:15:34 +01:00
Lukas Reschke
20c80cba6f
Add exception to PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 10:13:57 +01:00
Morris Jobke
20534e0d1e
Merge pull request #3943 from nextcloud/downstream-27318
...
Output maintenance mode message on STDERR
2017-03-20 02:42:31 -06:00
Vincent Petry
aacfef463c
Add tests for database user backend caching
...
Add comment, closeCursor in user DB query
Invalidate user in cache after successful creation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:03:03 -06:00
Jörn Friedrich Dreyer
592c04a9db
cache loadUser if not exists
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:01:41 -06:00
Morris Jobke
85d7e600c1
Merge pull request #3941 from nextcloud/downstream-27254
...
HTTP 1.1 used when giving 403 and 404 errors while attempting to down…
2017-03-20 01:53:05 -06:00
Roeland Jago Douma
81647a58db
Merge pull request #3931 from nextcloud/downstream-27295
...
Don't store empty groupids
2017-03-20 08:48:09 +01:00
Morris Jobke
55df840bd9
Merge pull request #3935 from nextcloud/downstream-27293
...
log where a resource was not found
2017-03-20 01:31:20 -06:00
Felix Heidecke
11f838f9e4
Add ignore_files to config,
...
test files against ignore_files list on upload
fix typo and indentation
Move blacklist declaration to lib/public/Files/FileInfo.php,
Rename *ignored to *blacklisted
Mocked blacklist_files for testing
Mocked blacklist_files for testing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 01:17:12 -06:00
noveens
5481a9b84a
checking if app exists in the FileStream now
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 00:38:29 -06:00
Thomas Müller
45567572c8
Adding file, line, class and function to the query logger ( #27298 )
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:39:51 -06:00
Morris Jobke
590e98a659
ownC -> Nextc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:20:24 -06:00
noveens
8948f66d0e
maintenance warning printed on STDERR rather than STDOUT
...
redundant check removed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:19:54 -06:00
noveens
8c27437ac0
HTTP 1.1 used when giving 403 and 404 errors while attempting to download non-existent file
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:14:26 -06:00
Felix Rupp
e7dc1f4326
Add postLogout hook to finish sessions from external session managers ( #27048 )
...
* Add postLogout hook to finish sessions from external session managers like CAS
* Add postLogout hook to finish sessions from external session managers like CAS
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:00:12 -06:00
kdslkdsaldsal
fc57d4b96c
Fix malformed logging in exception
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:56:35 -06:00
Martin
53b8330e6d
Defining App "cron" for "Invalidating tokens older than" message #27167 ( #27201 )
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:51:47 -06:00
Jörn Friedrich Dreyer
6b71dd11b7
log where a resource was not found
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:21:19 -06:00
Jörn Friedrich Dreyer
4e1aca4e3c
don't store empty groupids
...
gives an exception on oracle and shouldn't be added in the first place
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:01:37 -06:00
Morris Jobke
edd55b0ea9
Use SystemConfig instead of AllConfig for DB stuff
...
* preparation for followup PRs to clean up the DB bootstrapping
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 15:53:49 -06:00
Morris Jobke
c02527e414
Merge pull request #3927 from nextcloud/minor-fixes
...
Namespace and array syntax fixes
2017-03-19 15:49:38 -06:00