summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adding unit testsThomas Müller2013-09-251-0/+93
* remove unneccessary codeThomas Müller2013-09-251-13/+11
* $path already contains the full path to the fileThomas Müller2013-09-251-1/+0
* fixing copyright and add class documentationThomas Müller2013-09-253-13/+106
* 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
| |\ \
| * | | Move bool to int conversion to buildParts(), so it also happens for update().Andreas Fischer2013-09-211-1/+3
| * | | Do not convert boolean to integer in tests. put() already does this.Andreas Fischer2013-09-211-1/+0
| * | | Only update the etag. Do not re-submit any other unchanged data.Andreas Fischer2013-09-201-2/+3
| * | | Use update() instead of put().Andreas Fischer2013-09-201-3/+1
| * | | when storing back the data field 'encrypted' it is necessary to cast the bool...Thomas Müller2013-09-202-0/+3
| * | | etag changes are now propagated up the file treeThomas Müller2013-09-162-6/+29
| * | | Merge branch 'master' into fixing-4866-masterThomas Müller2013-09-16297-7339/+12951
| |\ \ \
| * | | | recreate an etag within the scanner if the cache contains an empty etagThomas Müller2013-09-162-1/+24
* | | | | Merge pull request #4950 from owncloud/fix_preview_shared_folderThomas Müller2013-09-232-3/+7
|\ \ \ \ \
| * | | | | implement previews for public uploadGeorg Ehrke2013-09-231-1/+5
| * | | | | fix previews in shared foldersGeorg Ehrke2013-09-231-2/+2
* | | | | | Merge pull request #4856 from owncloud/fix-link-expirationAndreas Fischer2013-09-232-1/+60
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Perform expiration date checking before returning share data for token.Andreas Fischer2013-09-161-1/+12
| * | | | | Tests whether expired/valid link share is still accessible.Andreas Fischer2013-09-161-0/+48
* | | | | | Merge pull request #4896 from owncloud/sharing_allow_disable_passwordBjörn Schießle2013-09-232-10/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | initialize variableBjoern Schiessle2013-09-201-0/+1
| * | | | | calculate correct permissions while toggle the password protectionBjoern Schiessle2013-09-201-1/+11
| * | | | | make sure that both $permissions and $oldPermissions have the same typeBjoern Schiessle2013-09-201-1/+1
| * | | | | only remember password if the user changes the permissions, otherwise the use...Bjoern Schiessle2013-09-181-9/+13
* | | | | | Merge pull request #4327 from owncloud/scanfile-removeThomas Müller2013-09-222-0/+12
|\ \ \ \ \ \
| * | | | | | remove deleted files while scanningRobin Appelman2013-08-062-0/+12
* | | | | | | Merge pull request #4623 from owncloud/convert-oc_preferencesBart Visscher2013-09-225-73/+461
|\ \ \ \ \ \ \
| * | | | | | | update inherit docs commentBart Visscher2013-09-191-3/+3
| * | | | | | | Fix insert/update/delete helper functions for oracleBart Visscher2013-09-192-1/+55
| * | | | | | | Add missing return true statements to legacy preferences functionsBart Visscher2013-09-191-0/+9
| * | | | | | | Add missing staticBart Visscher2013-09-191-1/+1
| * | | | | | | Convert OC_Preference to object interfaceBart Visscher2013-09-193-72/+397