aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | User: move checkPassword from User to Manager to not break API
| * 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 typo
| * fixing typoBoris Rybalkin2013-09-231-1/+1
| | | | | | Typo in comment "feature" => "future"
* | Merge pull request #4930 from owncloud/fix-apps-settingsThomas Müller2013-09-241-1/+3
|\ \ | | | | | | Fix the apps enabling/disabling in settings
| * | 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
|\ \ \ | |_|/ |/| | clear permissions cache when scanning a file
| * | 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!" message
| * | Fix not displaying "Upload something!" messagekondou2013-09-231-1/+1
|/ / | | | | | | Fix #4940
* | Merge pull request #4869 from owncloud/fixing-4866-masterThomas Müller2013-09-233-14/+62
|\ \ | | | | | | recreate an etag within the scanner if the cache contains an empty etag
| * | 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (98 commits) [tx-robot] updated from transifex files: when filtering search results, ensure results are children of the fakeroot not just path starting the same setting a default on filecache column unencrypted_size [tx-robot] updated from transifex remove unneccessary lib in namespace namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic! initialize variable calculate correct permissions while toggle the password protection make sure that both $permissions and $oldPermissions have the same type Add copyright, remove starting blank line update inherit docs comment Fix insert/update/delete helper functions for oracle Add missing return true statements to legacy preferences functions Add missing static Convert OC_Preference to object interface fix race condition in lazy preview loading use {count} instead of 'One' for more versatile translation fix double translation of error message use n to translate title fixing typos and l10n ... Conflicts: tests/lib/files/cache/scanner.php
| * | | 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 ↵Thomas Müller2013-09-202-0/+3
| | | | | | | | | | | | | | | | boolean to an integer to make pg happy
| * | | 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
|\ \ \ \ \ | | | | | | | | | | | | Fix preview for shared folder and public upload
| * | | | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token) * owncloud/fix-link-expiration: Perform expiration date checking before returning share data for token. Tests whether expired/valid link share is still accessible.
| * | | | | 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | sharing, allow user to disable password protection
| * | | | | 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 ↵Bjoern Schiessle2013-09-181-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | user disabled the password protection
* | | | | | Merge pull request #4327 from owncloud/scanfile-removeThomas Müller2013-09-222-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove deleted files while scanning
| * | | | | | remove deleted files while scanningRobin Appelman2013-08-062-0/+12
| | | | | | |
* | | | | | | Merge pull request #4623 from owncloud/convert-oc_preferencesBart Visscher2013-09-225-73/+461
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Convert OC_Preference to object interface
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixing 4416 master
| * | | | | | | | setting a default on filecache column unencrypted_sizeThomas Müller2013-09-201-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 11:59:50 +0000