summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ocs_share_apiBjoern Schiessle2013-09-261081-16425/+51927
|\
| * 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
| | |\ \ \
| | * | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 03:06:30 +0000