Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixing copyright and add class documentation | Thomas Müller | 2013-09-25 | 2 | -13/+105 |
| | |||||
* | Merge pull request #4968 from owncloud/user_checkpwd | Thomas Müller | 2013-09-25 | 6 | -39/+41 |
|\ | | | | | User: move checkPassword from User to Manager to not break API | ||||
| * | Adjust Tests and satisfy them | Arthur Schiwon | 2013-09-24 | 1 | -4/+6 |
| | | |||||
| * | Fix doc | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | |||||
| * | Fix return value from User object to User ID | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | |||||
| * | === not == | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | |||||
| * | User: move checkPassword from User to Manager to not break API | Arthur Schiwon | 2013-09-24 | 6 | -38/+38 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-24 | 1 | -0/+2 |
|/ | |||||
* | Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData). | Andreas Fischer | 2013-09-24 | 1 | -27/+27 |
| | |||||
* | clear permissions cache when scanning a file | Robin Appelman | 2013-09-24 | 1 | -3/+12 |
| | |||||
* | Merge pull request #4869 from owncloud/fixing-4866-master | Thomas Müller | 2013-09-23 | 2 | -2/+25 |
|\ | | | | | recreate an etag within the scanner if the cache contains an empty etag | ||||
| * | Merge remote-tracking branch 'owncloud/master' into fixing-4866-master | Andreas Fischer | 2013-09-23 | 29 | -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 Fischer | 2013-09-21 | 1 | -1/+3 |
| | | | |||||
| * | | Only update the etag. Do not re-submit any other unchanged data. | Andreas Fischer | 2013-09-20 | 1 | -2/+3 |
| | | | |||||
| * | | Use update() instead of put(). | Andreas Fischer | 2013-09-20 | 1 | -3/+1 |
| | | | |||||
| * | | when storing back the data field 'encrypted' it is necessary to cast the ↵ | Thomas Müller | 2013-09-20 | 1 | -0/+2 |
| | | | | | | | | | | | | boolean to an integer to make pg happy | ||||
| * | | etag changes are now propagated up the file tree | Thomas Müller | 2013-09-16 | 1 | -0/+14 |
| | | | |||||
| * | | recreate an etag within the scanner if the cache contains an empty etag | Thomas Müller | 2013-09-16 | 1 | -1/+7 |
| | | | |||||
* | | | Merge pull request #4856 from owncloud/fix-link-expiration | Andreas Fischer | 2013-09-23 | 1 | -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 Fischer | 2013-09-16 | 1 | -1/+12 |
| | | | |||||
* | | | Merge pull request #4896 from owncloud/sharing_allow_disable_password | Björn Schießle | 2013-09-23 | 1 | -9/+13 |
|\ \ \ | | | | | | | | | sharing, allow user to disable password protection | ||||
| * | | | make sure that both $permissions and $oldPermissions have the same type | Bjoern Schiessle | 2013-09-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | only remember password if the user changes the permissions, otherwise the ↵ | Bjoern Schiessle | 2013-09-18 | 1 | -9/+13 |
| |/ / | | | | | | | | | | user disabled the password protection | ||||
* | | | Merge pull request #4327 from owncloud/scanfile-remove | Thomas Müller | 2013-09-22 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | remove deleted files while scanning | ||||
| * | | | remove deleted files while scanning | Robin Appelman | 2013-08-06 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #4623 from owncloud/convert-oc_preferences | Bart Visscher | 2013-09-22 | 4 | -73/+282 |
|\ \ \ \ | | | | | | | | | | | Convert OC_Preference to object interface | ||||
| * | | | | update inherit docs comment | Bart Visscher | 2013-09-19 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Fix insert/update/delete helper functions for oracle | Bart Visscher | 2013-09-19 | 2 | -1/+55 |
| | | | | | |||||
| * | | | | Add missing return true statements to legacy preferences functions | Bart Visscher | 2013-09-19 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | Add missing static | Bart Visscher | 2013-09-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Convert OC_Preference to object interface | Bart Visscher | 2013-09-19 | 2 | -72/+218 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-22 | 3 | -3/+10 |
| | | | | |||||
* | | | | files: when filtering search results, ensure results are children of the ↵ | Robin Appelman | 2013-09-22 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | fakeroot not just path starting the same | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-20 | 5 | -3/+27 |
| | | | | |||||
* | | | | Merge pull request #4684 from owncloud/improved-console | Bart Visscher | 2013-09-19 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Use more object oriented way for console commands | ||||
| * | | | | Use more object oriented way for console commands | Bart Visscher | 2013-09-01 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #4263 from owncloud/search_scrollto | Jörn Friedrich Dreyer | 2013-09-19 | 2 | -2/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | initial scrollto implementation | ||||
| * | | | | | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 2 | -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 transifex | Jenkins for ownCloud | 2013-09-18 | 14 | -4/+75 |
|/ / / / | |||||
* | | | | Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle | Bart Visscher | 2013-09-16 | 1 | -1/+3 |
|\ \ \ \ | |_|_|/ |/| | | | Fix Sharing "Expiration Date" on Oracle | ||||
| * | | | Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc. | Andreas Fischer | 2013-09-12 | 1 | -0/+1 |
| | | | | |||||
| * | | | Create instance of Doctrine\Common\EventManager() in OC_DB. | Andreas Fischer | 2013-09-12 | 1 | -1/+2 |
| | | | | |||||
* | | | | Add OCP\DB::getErrorMessage() to public namespace. | Thomas Tanghus | 2013-09-16 | 1 | -0/+11 |
| | | | | |||||
* | | | | adding null check on a mount's storage | Thomas Müller | 2013-09-15 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #4506 from owncloud/oc_avatars | Bernhard Posselt | 2013-09-14 | 5 | -0/+111 |
|\ \ \ \ | | | | | | | | | | | OC Avatars | ||||
| * \ \ \ | Merge branch 'master' into oc_avatars | kondou | 2013-09-12 | 18 | -94/+181 |
| |\ \ \ \ | |||||
| * | | | | | Bring another enable_avatars to $_ and fix $thus->$this | kondou | 2013-09-11 | 2 | -1/+2 |
| | | | | | | |||||
| * | | | | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatars | kondou | 2013-09-09 | 1 | -19/+22 |
| | | | | | | |||||
| * | | | | | Use \OC_App for checking whether encryption is enabled | kondou | 2013-09-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix some bugs and remove \OCP\Avatar for now | kondou | 2013-09-04 | 1 | -12/+0 |
| | | | | | |