mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29,073 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

29073 Commits

Author SHA1 Message Date
Joas Schilling 1f197134c8 Look up services in the app container before trying the core container 2015-12-18 13:45:07 +01:00
Joas Schilling 412e4ed3f6 Register app containers in the OC container 2015-12-18 13:45:07 +01:00
Thomas Müller 22d1b1285e Merge pull request #21277 from owncloud/querybuild-joblist 
Use the query builder for the joblist queries
 2015-12-18 13:44:02 +01:00
Thomas Müller b4a896c00d Merge pull request #21279 from owncloud/remove-tmp-methods 
Remove unneeded methods in OC_Helper
 2015-12-18 11:58:20 +01:00
Morris Jobke 4af7bf07bf OC_Helper::userAvatarSet is not used anymore 2015-12-18 11:30:30 +01:00
Morris Jobke a18c0983d5 Use TempManager instead of tmpFile 2015-12-18 11:25:33 +01:00
Morris Jobke 90b0831cec Use TempManager instead of tmpFolder 2015-12-18 11:19:53 +01:00
Thomas Müller 6a7dbf3cf2 Merge pull request #21278 from owncloud/exclude-scrutinizer-autofixer 
Exclude scrutinizer-auto-fixer
 2015-12-18 10:29:25 +01:00
Lukas Reschke ce2aeda9fe Exclude scrutinizer-auto-fixer 2015-12-18 10:27:42 +01:00
Thomas Müller 9e97bef935 Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType 
Use proper public API for OC_Helper::getFileNameMimeType
 2015-12-18 10:15:33 +01:00
Thomas Müller 551e553bf4 Merge pull request #21264 from owncloud/deprecated_oc_user_methods 
Cleanup OC_User deprecated methods
 2015-12-18 10:15:18 +01:00
Joas Schilling 0f836cfe9e Make sure the interface and the implementation match 2015-12-18 10:04:30 +01:00
Joas Schilling 345e68cafa Use the query builder for the joblist queries 2015-12-18 09:50:23 +01:00
Thomas Müller 1456e910ad Merge pull request #21269 from owncloud/we-shall-cleanup-xml-parser-errors 
Assert that there are no xml error left
 2015-12-18 09:17:53 +01:00
Thomas Müller 2622116b57 Merge pull request #21190 from owncloud/bump_doctrine_deps 
[3rdparty] Bump doctrine deps
 2015-12-18 08:48:34 +01:00
Thomas Müller 228a75e2ec Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRoute 
Replace deprecated OC_Helper::linkToRoute calls
 2015-12-18 07:56:42 +01:00
Thomas Müller d77019f566 Merge pull request #21247 from owncloud/placeholder_size 
Add a default size to the avatar placeholders
 2015-12-18 07:56:23 +01:00
Roeland Jago Douma e67e5fed0a [3rdparty] Bump doctrine deps 2015-12-18 07:53:35 +01:00
Roeland Jago Douma 2a280e2fad Remove private deprecated OC_Helper::linkToRoute 2015-12-17 18:46:43 +01:00
Roeland Jago Douma 9fe3d2f1f8 OC_Helper::linkToRoute is deprecated 
Replaced all calls to OC_Helper::linkToRoute with
OC::$server->getURLGenerator()->linkToRoute
 2015-12-17 18:46:42 +01:00
Thomas Müller b3c8e9ca32 Clear xml errors in updater 2015-12-17 17:46:07 +01:00
Thomas Müller 9b423f3532 Clear xml errors in ocs client 2015-12-17 17:34:15 +01:00
Thomas Müller 2709244acd Only perform tearDown operations on the database if we have a connection to it ..... 2015-12-17 17:29:50 +01:00
Thomas Müller 8f6a257f1b Use proper base class 2015-12-17 17:29:17 +01:00
Thomas Müller 62b82cfe4b Clear xml errors 2015-12-17 17:28:44 +01:00
Thomas Müller 26f416b9f5 Assert that there are no xml error left 2015-12-17 17:18:42 +01:00
Morris Jobke ecdf88e41b Use proper public API for OC_Helper::getFileNameMimeType 2015-12-17 17:07:48 +01:00
Thomas Müller 792b270f22 Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsmanager 
Add carddav backend to OCP\ContactsManager
 2015-12-17 16:36:48 +01:00
Roeland Jago Douma c64e827f00 Since avatar.js is now essentially empty remove it 2015-12-17 16:32:18 +01:00
Roeland Jago Douma 6248bad0f7 Add a default size to the avatar placeholders 
This removed the need to do an avatar request on the "empty" row in the
user settings.
 2015-12-17 16:30:23 +01:00
Thomas Müller 3818a055b9 Merge pull request #21255 from owncloud/usermanagement-show-password-error-temporary 
user management: show password error temporary
 2015-12-17 16:25:14 +01:00
Roeland Jago Douma 1f715289bf Removed deprecated function OC_User::deleteUser 
Replaced with proper OCP calls
 2015-12-17 16:18:40 +01:00
Roeland Jago Douma 9201b9713e Removed unused deprecated methods 2015-12-17 16:18:40 +01:00
Roeland Jago Douma 835911bce5 Removed deprecated private OC_User::createUser 
All function calls are replaced with the recommended (which was already
the body of the function).
 2015-12-17 16:18:40 +01:00
Roeland Jago Douma 7e44ea5da0 Remove deprecated function OC_User::getManager 
Private deprecated function => removed
Replaced all instances with suggested replacement
 2015-12-17 16:18:34 +01:00
Thomas Müller d402ac91d7 Merge pull request #21260 from owncloud/fix-undefined-l10n-var 
initialize l10n instance earlier, fixes an undefined var warning foll…
 2015-12-17 16:08:08 +01:00
Thomas Müller 3bcaaa6c3a Merge pull request #21259 from owncloud/load_big_avatar_only_personal 
Only load the big (128x128) avatar on the perosnal page
 2015-12-17 16:07:50 +01:00
Thomas Müller a9ad5c7b6b Merge pull request #21251 from owncloud/make-occ-more-error-proof 
occ command can only be called from ownCloud root directory
 2015-12-17 15:45:32 +01:00
Thomas Müller 1285b78086 Merge pull request #21200 from owncloud/files-authorizationheader 
Use Authorization headers for public webdav in web UI
 2015-12-17 15:30:13 +01:00
Arthur Schiwon 0ecbfae5ff initialize l10n instance earlier, fixes an undefined var warning followed by a php error 2015-12-17 15:08:15 +01:00
Thomas Müller 38f4407761 Merge pull request #21201 from mmattel/scanFiles_stat_output_II 
Statistics output for ./occ files:scan (rework)
 2015-12-17 14:43:55 +01:00
Thomas Müller e3ed42135d Merge pull request #21240 from owncloud/avatar_speedup 
Avatar speedup
 2015-12-17 14:43:21 +01:00
Thomas Müller 358b84c21d Merge pull request #21253 from owncloud/deprecated_oc_helper_linkTo 
Remove deprecated OC_Helper::linkTo
 2015-12-17 14:43:02 +01:00
Roeland Jago Douma a81836a42f Only load the big (128x128) avatar on the perosnal page 
Before the code was executed on every page if a user was logged in. Now
only on the personal page. Thus saving a request on all other pages.
 2015-12-17 13:55:22 +01:00
Thomas Müller 311a565f7f Merge pull request #21244 from owncloud/remove-unavailable-setting-from-sample-config 
enforce_home_folder_naming_rule cannot be configured in config.php
 2015-12-17 13:43:28 +01:00
michag86 7a86f10ebc Update users.js 2015-12-17 12:43:44 +01:00
Thomas Müller 21bd19b6ae Merge pull request #21241 from owncloud/fix_21226 
Do not try to get the avatar if there is no user
 2015-12-17 12:14:25 +01:00
Roeland Jago Douma 205c239eab Remove deprecated OC_Helper::linkTo function 2015-12-17 11:51:40 +01:00
Morris Jobke b8ceae68d5 occ command can only be called from ownCloud root directory 
* this changes into the ownCloud root directory and then should run just fine
* avoids weird error messages that are caused by this
 2015-12-17 10:56:26 +01:00
Roeland Jago Douma 19eeb23b91 OC_Helper::linkTo is deprecated 
Replaced with suggested (and calling body of)
 2015-12-17 10:53:21 +01:00