aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* fixing copyright and add class documentationThomas Müller2013-09-252-13/+105
|
* Merge pull request #4968 from owncloud/user_checkpwdThomas Müller2013-09-256-39/+41
|\ | | | | User: move checkPassword from User to Manager to not break API
| * Adjust Tests and satisfy themArthur Schiwon2013-09-241-4/+6
| |
| * 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-246-38/+38
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-241-0/+2
|/
* 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-241-3/+12
|
* Merge pull request #4869 from owncloud/fixing-4866-masterThomas Müller2013-09-232-2/+25
|\ | | | | recreate an etag within the scanner if the cache contains an empty etag
| * Merge remote-tracking branch 'owncloud/master' into fixing-4866-masterAndreas Fischer2013-09-2329-99/+424
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | |
| * | 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-201-0/+2
| | | | | | | | | | | | boolean to an integer to make pg happy
| * | etag changes are now propagated up the file treeThomas Müller2013-09-161-0/+14
| | |
| * | recreate an etag within the scanner if the cache contains an empty etagThomas Müller2013-09-161-1/+7
| | |
* | | Merge pull request #4856 from owncloud/fix-link-expirationAndreas Fischer2013-09-231-1/+12
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 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
| | |
* | | Merge pull request #4896 from owncloud/sharing_allow_disable_passwordBjörn Schießle2013-09-231-9/+13
|\ \ \ | | | | | | | | sharing, allow user to disable password protection
| * | | 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-221-0/+2
|\ \ \ | | | | | | | | remove deleted files while scanning
| * | | remove deleted files while scanningRobin Appelman2013-08-061-0/+2
| | | |
* | | | Merge pull request #4623 from owncloud/convert-oc_preferencesBart Visscher2013-09-224-73/+282
|\ \ \ \ | | | | | | | | | | 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-192-72/+218
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-223-3/+10
| | | |
* | | | files: when filtering search results, ensure results are children of the ↵Robin Appelman2013-09-221-6/+8
| | | | | | | | | | | | | | | | fakeroot not just path starting the same
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-205-3/+27
| | | |
* | | | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-191-0/+1
|\ \ \ \ | | | | | | | | | | Use more object oriented way for console commands
| * | | | Use more object oriented way for console commandsBart Visscher2013-09-011-0/+1
| | | | |
* | | | | Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-192-2/+5
|\ \ \ \ \ | | | | | | | | | | | | initial scrollto implementation
| * | | | | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-172-2/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use places/folder icon, move link construction to JS, only show icon on hover, use 'searchresult' as css class name, add filter/unfilter methods, highlight searched files in current filelist only filter when correct FileList is present
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1814-4/+75
|/ / / /
* | | | Merge pull request #4825 from owncloud/fix-sharing-expiration-oracleBart Visscher2013-09-161-1/+3
|\ \ \ \ | |_|_|/ |/| | | Fix Sharing "Expiration Date" on Oracle
| * | | Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc.Andreas Fischer2013-09-121-0/+1
| | | |
| * | | Create instance of Doctrine\Common\EventManager() in OC_DB.Andreas Fischer2013-09-121-1/+2
| | | |
* | | | Add OCP\DB::getErrorMessage() to public namespace.Thomas Tanghus2013-09-161-0/+11
| | | |
* | | | adding null check on a mount's storageThomas Müller2013-09-151-0/+6
| | | |
* | | | Merge pull request #4506 from owncloud/oc_avatarsBernhard Posselt2013-09-145-0/+111
|\ \ \ \ | | | | | | | | | | OC Avatars
| * \ \ \ Merge branch 'master' into oc_avatarskondou2013-09-1218-94/+181
| |\ \ \ \
| * | | | | Bring another enable_avatars to $_ and fix $thus->$thiskondou2013-09-112-1/+2
| | | | | |
| * | | | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatarskondou2013-09-091-19/+22
| | | | | |
| * | | | | Use \OC_App for checking whether encryption is enabledkondou2013-09-051-1/+1
| | | | | |
| * | | | | Fix some bugs and remove \OCP\Avatar for nowkondou2013-09-041-12/+0
| | | | | |