aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* add blacklist to txt preview backendGeorg Ehrke2013-09-241-0/+10
* Merge pull request #4327 from owncloud/scanfile-removeThomas Müller2013-09-221-0/+2
|\
| * remove deleted files while scanningRobin Appelman2013-08-061-0/+2
* | Merge pull request #4623 from owncloud/convert-oc_preferencesBart Visscher2013-09-224-73/+282
|\ \
| * | 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 fake...Robin Appelman2013-09-221-6/+8
* | | [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 commandsBart Visscher2013-09-011-0/+1
* | | | Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-192-2/+5
|\ \ \ \
| * | | | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-172-2/+5
| | |/ / | |/| |
* / | | [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
|\ \ \
| * | | 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
|\ \ \ \
| * \ \ \ 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
| * | | | | fixing style, var name & PHPDocThomas Müller2013-09-041-1/+1
| * | | | | Merge branch 'master' into oc_avatarskondou2013-09-0411-235/+311
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into oc_avatarskondou2013-09-035-77/+25
| |\ \ \ \ \ \
| * | | | | | | Fix some of @jancborchardt's complaints in oc_avatarskondou2013-09-021-1/+1
| * | | | | | | Properly check for tmpavatar, invalidate cache, fix debug msgskondou2013-09-011-1/+2
| * | | | | | | Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-011-5/+7
| * | | | | | | Merge branch 'master' into oc_avatarskondou2013-09-012-137/+166
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into oc_avatarskondou2013-08-3130-19/+1581
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Fix \OCP\Avatarkondou2013-08-301-17/+1
| * | | | | | | | Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitestskondou2013-08-302-5/+21
| * | | | | | | | Use defaultavatarskondou2013-08-292-2/+6
| * | | | | | | | Merge branch 'master' into oc_avatarskondou2013-08-282-0/+51
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use OC.Router.generate, TODO use cache, prepare for defaultavatarskondou2013-08-281-13/+0
| * | | | | | | | | Merge branch 'master' into oc_avatarskondou2013-08-2823-120/+325
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Continue work on cropperkondou2013-08-284-5/+19
| * | | | | | | | | | Clean up some cruftkondou2013-08-261-4/+1
| * | | | | | | | | | Have a controller instead ofo avatar.php and fix some cropper-designkondou2013-08-261-1/+1
| * | | | | | | | | | Use Jcrop, have inline errormsg, work on cropping, clean up, WIPkondou2013-08-253-8/+21
| * | | | | | | | | | Fix spacing, have remove() and return JSON for custom-default-avatarskondou2013-08-251-54/+40
| * | | | | | | | | | Remove gravatar and no-avatar functionality, prepare for default avatars even...kondou2013-08-251-84/+30
| * | | | | | | | | | Clean up and prepare a bit for custom default avatarskondou2013-08-251-7/+6
| * | | | | | | | | | Several improvementskondou2013-08-252-7/+12