aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adding file_exists check just to be on the save sideThomas Müller2013-09-241-1/+2
* handle error situation of rename properThomas Müller2013-09-231-1/+6
* 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
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-22171-472/+674
* | | | | | | Merge pull request #4929 from owncloud/fixing-4416-masterMorris Jobke2013-09-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | setting a default on filecache column unencrypted_sizeThomas Müller2013-09-201-1/+1
* | | | | | | | Merge pull request #4938 from owncloud/scan-filter-outside-viewJörn Friedrich Dreyer2013-09-222-6/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | files: when filtering search results, ensure results are children of the fake...Robin Appelman2013-09-222-6/+22
| |/ / / / / / /
* | | | | | | | Merge pull request #4927 from owncloud/fix_namespaces_and_autoloadingThomas Müller2013-09-2114-27/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | remove unneccessary lib in namespaceJörn Friedrich Dreyer2013-09-2010-20/+19
| * | | | | | | namespaces use upcasefirst partsJörn Friedrich Dreyer2013-09-2013-26/+26
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-20441-7022/+10867
* | | | | | | | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-198-60/+137
|\ \ \ \ \ \ \ \
| * | | | | | | | Add copyright, remove starting blank lineBart Visscher2013-09-193-1/+13
| * | | | | | | | Check all installed apps for console commandsBart Visscher2013-09-141-1/+1
| * | | | | | | | Use appinfo/register_command.php to add commands to the console commandBart Visscher2013-09-133-2/+25
| * | | | | | | | Cleanup and more style fixesBart Visscher2013-09-022-8/+5
| * | | | | | | | Change Files Scan command to use OC\User\ManagerBart Visscher2013-09-022-8/+19
| * | | | | | | | Use more object oriented way for console commandsBart Visscher2013-09-016-60/+94
* | | | | | | | | Merge pull request #4908 from owncloud/fix_css_selectorBart Visscher2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | css selectors never have a : before []Jörn Friedrich Dreyer2013-09-191-1/+1