aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Base defaultavatar text on displaynamekondou2013-09-283-2/+7
* Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludesMorris Jobke2013-09-281-0/+14
|\
| * phpunit.xml: Port code coverage excludes from autotest to dist.Andreas Fischer2013-09-261-0/+14
* | Merge pull request #4207 from owncloud/search_shared_filesThomas Müller2013-09-272-12/+72
|\ \
| * | adding PHPDoc comments to getBackendThomas Müller2013-09-242-7/+12
| * | same for search by mimeJörn Friedrich Dreyer2013-09-191-4/+4
| * | add all results, sharing cache also returns entries for shared files in exter...Jörn Friedrich Dreyer2013-09-191-4/+4
| * | fix getAll(), refactor search by mime & searchJörn Friedrich Dreyer2013-09-191-18/+37
| * | return fixed path, skip shared files outside of 'files'Jörn Friedrich Dreyer2013-09-191-3/+6
| * | divide ids into chunks of 1kJörn Friedrich Dreyer2013-09-191-9/+18
| * | add initial search in shared filesJörn Friedrich Dreyer2013-09-192-2/+26
* | | Merge pull request #5001 from owncloud/fixing-user-external-backends-masterMorris Jobke2013-09-271-0/+1
|\ \ \
| * | | prelogin apps have to be loaded within setupBackend() otherwise required clas...Thomas Müller2013-09-261-0/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2731-121/+153
| |_|/ |/| |
* | | Merge pull request #4999 from owncloud/run-unit-tests-for-apps-masterMorris Jobke2013-09-261-2/+0
|\ \ \
| * | | Remove $RUNTIME_NOAPPS - setting to false was not enoughThomas Müller2013-09-261-2/+0
| * | | run unit tests for apps as wellThomas Müller2013-09-261-1/+1
* | | | Merge pull request #4990 from owncloud/user_fix_managerblizzz2013-09-262-1/+44
|\ \ \ \ | |_|/ / |/| | |
| * | | Missing Test for the previous commitArthur Schiwon2013-09-251-0/+43
| * | | manager checkPassword now returns User object, adjust internal user class acc...Arthur Schiwon2013-09-251-1/+1
* | | | Merge pull request #4887 from owncloud/sharing_disable_public_uploadBjörn Schießle2013-09-261-2/+2
|\ \ \ \
| * | | | we can leave the loop if the permission of the link share was checkedBjoern Schiessle2013-09-171-3/+1
| * | | | check only permission from link-share to decide if public upload is enabled o...Bjoern Schiessle2013-09-171-1/+3
* | | | | Merge pull request #4991 from owncloud/enc_fix_warningThomas Müller2013-09-262-5/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix check if app is enabledBjoern Schiessle2013-09-251-4/+3
| * | | | check if key exists before reading itBjoern Schiessle2013-09-251-1/+4
* | | | | Merge pull request #4987 from owncloud/different_color_placeholderMorris Jobke2013-09-251-2/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Shorten optional text-argument processingkondou2013-09-251-3/+2
| * | | | Make it possible to have a different color than the username for placeholderkondou2013-09-251-2/+14
* | | | | Merge pull request #4989 from owncloud/coverage-for-all-masterThomas Müller2013-09-251-6/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | collect coverage for all databases again - ci.owncloud.org has more RAM avail...Thomas Müller2013-09-251-6/+1
|/ / / /
* | | | Merge pull request #4968 from owncloud/user_checkpwdThomas Müller2013-09-259-101/+96
|\ \ \ \
| * | | | Adjust Tests and satisfy themArthur Schiwon2013-09-243-44/+51
| * | | | Fix docArthur Schiwon2013-09-241-1/+1
| * | | | Fix return value from User object to User IDArthur Schiwon2013-09-241-1/+1
| * | | | === not ==Arthur Schiwon2013-09-241-1/+1
| * | | | User: move checkPassword from User to Manager to not break APIArthur Schiwon2013-09-247-60/+48
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2435-208/+287
* | | | | Merge pull request #4963 from cyberb/patch-1Christopher2013-09-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fixing typoBoris Rybalkin2013-09-231-1/+1
* | | | | Merge pull request #4930 from owncloud/fix-apps-settingsThomas Müller2013-09-241-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix the apps enabling/disabling in settingsBart Visscher2013-09-201-1/+3
* | | | | Merge pull request #4917 from owncloud/scan-clear-permissionsThomas Müller2013-09-242-28/+54
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).Andreas Fischer2013-09-241-27/+27
| * | | | clear permissions cache when scanning a fileRobin Appelman2013-09-242-3/+29
|/ / / /
* | | | Merge pull request #4956 from owncloud/fix_not_displaying_emptycontentThomas Müller2013-09-231-1/+1
|\ \ \ \
| * | | | Fix not displaying "Upload something!" messagekondou2013-09-231-1/+1
|/ / / /
* | | | Merge pull request #4869 from owncloud/fixing-4866-masterThomas Müller2013-09-233-14/+62
|\ \ \ \
| * | | | Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.Andreas Fischer2013-09-231-15/+15
| * | | | Merge remote-tracking branch 'owncloud/master' into fixing-4866-masterAndreas Fischer2013-09-23634-8206/+21290
| |\ \ \ \