wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33919 commits 157 branches 562 tags 714 MiB
Commit graph

33919 commits

This branch
This branch
All branches
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
Nextcloud bot
39c180117e
[tx-robot] updated from transifex 2016-08-17 13:30:52 +00: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
Marius Blüm
baaf1521ce Merge pull request #787 from nextcloud/files_external-settings-polish 
Files external settings polish
 2016-08-17 12:32:33 +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
e32d6d80a1 Merge pull request #890 from nextcloud/issue-879-quota-unlimited-via-api 
Allow to retrieve the quota itself via the provisioning api
 2016-08-17 11:51:04 +02:00
Roeland Jago Douma
c5d0a056de Merge pull request #868 from nextcloud/changepasswordcontroller 
Make ChangePassword a real Controller
 2016-08-17 11:50:41 +02:00
Morris Jobke
9a7193ce83
Fix casing of external storage app 2016-08-17 10:44:00 +02:00
Joas Schilling
a9f36067fd
Fix constant name, copy-pasterino 2016-08-17 10:41:13 +02:00
Joas Schilling
04c5259df0
Allow to retrieve the quota itself via the provisioning api 2016-08-17 10:41:13 +02:00
Morris Jobke
27796a4077
layout refinements 2016-08-17 10:40:59 +02:00
Robin Appelman
644770c950
hide files external in personal settings if it's empty 2016-08-17 10:40:59 +02:00
Robin Appelman
ff89354588
don't show dependency info if we cant create new mounts 2016-08-17 10:40:59 +02:00
Robin Appelman
c62e512989
hide global credentials in personal when a user cant add mounts 2016-08-17 10:40:59 +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
56a3c853cc Merge pull request #845 from nextcloud/fix_ocs_middleware 
Extend OCS Middleware
 2016-08-17 10:23:55 +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
Roeland Jago Douma
789082e014
Add tests for ChangePasswordController 2016-08-17 10:21:18 +02:00
Roeland Jago Douma
32a6f5f182
Moved ChangePassword to an actual Controller 
* Still no full DI because of encryption fu
* Remove old "Controller"
 2016-08-17 10:21:14 +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
Nextcloud bot
0cc8b8b244
[tx-robot] updated from transifex 2016-08-17 00:09:19 +00:00
Roeland Jago Douma
8f3dc0ba43
Remove IE_8 user agent string 2016-08-16 21:01:32 +02:00
Roeland Jago Douma
9fd274c447
Remove IE8 support from ViewController 
* Update tests
* Fix getMock in tests
 2016-08-16 20:58:33 +02:00
Roeland Jago Douma
fd95985a21
Remove IE8 support in CertificateController 
* Also fix getMock warnings in tests
 2016-08-16 20:51:43 +02:00
Roeland Jago Douma
0cb8f74cd1
Delete IE8 support in the avatar controller 2016-08-16 20:48:04 +02:00
Roeland Jago Douma
64ff8ac6fa
Fix phpdoc in Comments 2016-08-16 20:33:09 +02:00
Lukas Reschke
2d861c9fea Merge pull request #796 from nextcloud/implement_712 
Admin page split
 2016-08-16 20:28:16 +02:00
Roeland Jago Douma
035f55c913
Fix phpdoc 2016-08-16 20:26:28 +02:00
Roeland Jago Douma
15c1b3c509
Fix phpdoc 2016-08-16 20:25:09 +02:00
Roeland Jago Douma
0dc22d13a9
Fix IL10N phpdoc 2016-08-16 20:24:50 +02:00
Arthur Schiwon
4943441bde
adjust tests to latest changes 2016-08-16 18:59:45 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712 2016-08-16 18:31:59 +02:00
Arthur Schiwon
4946cc220d
for new we cannot have nested settings, default module is only appended if available 2016-08-16 18:26:16 +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
Björn Schießle
9db189174c Merge pull request #870 from nextcloud/oc-missingprefixforlastinsertid 
Fix oracle support of external storage app
 2016-08-16 16:24:45 +02:00
Roeland Jago Douma
d14c6ef78c Merge pull request #860 from nextcloud/fix_updatenotifcations_warnings 
Fix deprecated getMock warning
 2016-08-16 14:50:31 +02:00
Arthur Schiwon
83ba2f2e90
final db indexes 2016-08-16 13:21:59 +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
Marius Blüm
dec4ee73c5 Merge pull request #871 from nextcloud/move-apps 
move apps between 'Language' and 'Session' in personal settings
 2016-08-16 11:25:48 +02:00
Marius Blüm
c994524e98 Merge pull request #834 from nextcloud/feature/similar-app-colors 
Use darker colors for app icons in app management.
 2016-08-16 11:07:48 +02:00
Nextcloud bot
8c424c7971
[tx-robot] updated from transifex 2016-08-16 00:10:47 +00:00
Arthur Schiwon
d96e8f5810
adopt to Controller constructor changes 2016-08-16 00:56:18 +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
Lukas Reschke
2061d40ba2 Merge pull request #862 from nextcloud/us_25767 
[us] How to polish code, eg: OC\User
 2016-08-15 21:53:52 +02:00
Lukas Reschke
63fb17a44f Merge pull request #882 from nextcloud/use-proper-test-execution 
Use proper casing
 2016-08-15 21:50:43 +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