Commit graph

6108 commits

Author SHA1 Message Date
Vincent Petry
56b94b220d
Improve file_target finding logic when repairing unmerged shares
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
2016-08-17 15:31:35 +02:00
Robin Appelman
5a599d5c4e Merge pull request #899 from nextcloud/nfd-default
[us] Disable NFD encoding wrapper by default
2016-08-17 14:46:52 +02:00
Vincent Petry
9f523518f3 Disable NFD encoding wrapper by default
Seems I forgot to set it back to false after testing.
Will give a performance boost for all storages.
2016-08-17 11:54:33 +02:00
Roeland Jago Douma
ce0604bd06 Merge pull request #892 from nextcloud/fix_phpdoc
Some scrutinizer phpdoc fixes
2016-08-17 10:38:21 +02:00
Joas Schilling
027069cbae Merge pull request #846 from nextcloud/provisioning_api_ocs
Move Provisioning API to the AppFramework
2016-08-17 10:23:13 +02:00
Marius Blüm
c1632c3abd Merge pull request #893 from nextcloud/ie8_be_gone
IE8 be gone!
2016-08-17 09:02:58 +02:00
Roeland Jago Douma
8f3dc0ba43
Remove IE_8 user agent string 2016-08-16 21:01:32 +02:00
Roeland Jago Douma
64ff8ac6fa
Fix phpdoc in Comments 2016-08-16 20:33:09 +02:00
Roeland Jago Douma
035f55c913
Fix phpdoc 2016-08-16 20:26:28 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712 2016-08-16 18:31:59 +02:00
Arthur Schiwon
f76b64d3d7
add missing encryption modules to settings 2016-08-16 18:11:59 +02:00
Arthur Schiwon
58530ab42f
fix missing parameters in sharing settings page 2016-08-16 17:59:21 +02:00
Joas Schilling
f7bc5ad43b Merge pull request #864 from nextcloud/us_25652
[us] Ensure the user exists before calling a method on it
2016-08-16 12:57:34 +02:00
Björn Schießle
6dc956b192 Merge pull request #886 from nextcloud/capabilities_error_proof
Make the capabilities manager more error proof
2016-08-16 11:40:42 +02:00
Arthur Schiwon
208e551216
check registered sections and settings after an app got updated to garbage collect orphaned classes 2016-08-16 00:56:17 +02:00
Arthur Schiwon
9edca39b49
attempt to remove section and settings entries when an app got disabled 2016-08-16 00:56:17 +02:00
Lukas Reschke
6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +02:00
Roeland Jago Douma
c044aa34fa
Make the capabilities manager more error proof
If an app registers an invalid capabilty we should not crash hard.
Instead we should catch the exception. Log it (error) and carry on.

* Added tests
2016-08-15 20:37:19 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Arthur Schiwon
75a73a5a73
satisfy dependencies for files_external 2016-08-15 13:38:02 +02:00
Roeland Jago Douma
6c360ad79f
Add PHPdoc 2016-08-15 11:14:28 +02:00
Jörn Friedrich Dreyer
264aaf9ffa
use $userId instead of $user 2016-08-14 19:50:19 +02:00
Thomas Müller
26342061b9
Ensure the user exists before calling a method on it - fixes #24751 2016-08-14 19:50:03 +02:00
Jörn Friedrich Dreyer
291b3fd8b4
missing PHPDoc 2016-08-14 19:37:52 +02:00
Jörn Friedrich Dreyer
da5633c31a
Type compatability 2016-08-14 19:37:37 +02:00
Jörn Friedrich Dreyer
3593668413
Method is deprecated 2016-08-14 19:37:11 +02:00
Jörn Friedrich Dreyer
5aef60d2ca
Unreachable statement 2016-08-14 19:36:42 +02:00
Jörn Friedrich Dreyer
d2a16c4dc8
Unnecessary fully qualified names 2016-08-14 19:36:06 +02:00
Roeland Jago Douma
e3b0e50dda
Extend OCSMiddleware
* Always set 401 (v1.php and v2.php)
* Set proper error codes for v2.php
* Proper OCS output on unhandled exceptions
2016-08-14 18:34:01 +02:00
Roeland Jago Douma
deba0f9922
Move OCS Middleware before security middleware
This is required to be able to catch the NotLoggedIn exceptions etc in
the OCSMiddleware and convert them to proper OCS Responses.
2016-08-14 18:34:01 +02:00
Arthur Schiwon
8188bb4509
simplify encryption manager fetching in DIContainer 2016-08-13 01:26:11 +02:00
Arthur Schiwon
158d78e1ab
move mail settings and file handling to additional ones, thus files_external gets its own section 2016-08-13 01:02:25 +02:00
Arthur Schiwon
b99ecb3c23
move systemstags to sharign section, drop collaboration section 2016-08-13 00:33:09 +02:00
Arthur Schiwon
7a2b96c7e6
change casing in section display names 2016-08-13 00:06:10 +02:00
Arthur Schiwon
9aa6b99a56
added some missed diagnosis output 2016-08-12 16:52:20 +02:00
Bjoern Schiessle
18fd8ff70c
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy" 2016-08-12 15:32:28 +02:00
Arthur Schiwon
ac04ba6784
register app autoload instead of loading apps 2016-08-12 13:23:14 +02:00
Lukas Reschke
8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Arthur Schiwon
3dfdc8e311
adjust systemtags app 2016-08-11 19:05:06 +02:00
Arthur Schiwon
36c1b7eb31
adjust Theming app 2016-08-11 17:29:58 +02:00
Arthur Schiwon
ce6ad5de25
make sure shipped apps also setup their admin settings on a fresh install 2016-08-11 16:37:11 +02:00
Arthur Schiwon
a2f752bcf3
adjust files_external 2016-08-11 15:50:31 +02:00
Arthur Schiwon
14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope 2016-08-11 14:48:21 +02:00
Arthur Schiwon
f3b15a9ab9
fixes, improvements, and another app:
* setupSettings now also triggered on enable
* fixes detection of present admin section or settings in the DB
* add update routine in such cases
* encryption app migrated
2016-08-11 01:41:18 +02:00
Arthur Schiwon
0fc34c99f4
fix registration of admin settings and section on app install 2016-08-11 00:45:15 +02:00
Lukas Reschke
67d016833d Merge pull request #810 from nextcloud/shared-cachethepropagatorinstance
Store the shared propagator instance
2016-08-10 17:24:57 +02:00
Arthur Schiwon
1eb8b951c2
more admin page splitup improvements
* bump version to ensure tables are created
* make updatenotification app use settings api
* change IAdmin::render() to getForm() and change return type from Template to TemplateResponse
* adjust User_LDAP accordingly, as well as built-in forms
* add IDateTimeFormatter to AppFramework/DependencyInjection/DIContainer.php. This is important so that \OC::$server->query() is able to resolve the
constructor parameters. We should ensure that all OCP/* stuff that is available from \OC::$server is available here. Kudos to @LukasReschke
* make sure apps that have settings info in their info.xml are loaded before triggering adding the settings setup method
2016-08-10 15:21:25 +02:00
Björn Schießle
219f36d261 Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-id
get shared storage storage id without setting up the storage
2016-08-10 14:56:41 +02:00
Vincent Petry
412b5c5407
Store the shared propagator instance
This instead of recreating it for every call.
2016-08-10 10:57:49 +02:00
Morris Jobke
93047f5e4d Merge pull request #777 from nextcloud/ocs_capabilities
Move /cloud/capabilities and /cloud/user to Core
2016-08-10 00:43:13 +02:00