aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | Refactor newavatar.php and show (for now) an alert on problems when setting n...kondou2013-08-251-2/+4
| * | | | | | | | | Have /avatar.php as a central avatar-pointkondou2013-08-251-34/+36
| * | | | | | | | | Improve styling & enable avatar-upload at personal pagekondou2013-08-251-1/+1
| * | | | | | | | | Load avatar from path, if one's providedkondou2013-08-251-6/+6
| * | | | | | | | | Add unittests & check filetype in setLocalAvatar()kondou2013-08-251-2/+8
| * | | | | | | | | Modularize get(), async getAvatar, avatars @ usermgmtkondou2013-08-254-22/+98
| * | | | | | | | | Add basic avatars and gravatarkondou2013-08-253-0/+79
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-132-5/+52
* | | | | | | | | | Merge pull request #4712 from owncloud/fileapi-forewardThomas Müller2013-09-1316-2/+1995
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cleanup public storage interface a bitRobin Appelman2013-09-121-46/+0
| * | | | | | | | | | Merge branch 'master' into fileapi-forewardRobin Appelman2013-09-1231-543/+691
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | add storage backend interface to public namespaceRobin Appelman2013-09-103-2/+345
| * | | | | | | | | | improve phpdoc for the public files interfaceRobin Appelman2013-09-104-51/+105
| * | | | | | | | | | move filesystem expceptions to global namespaceRobin Appelman2013-09-1010-57/+99
| * | | | | | | | | | move public files api to a clearer namespaceRobin Appelman2013-09-103-13/+13
| * | | | | | | | | | update phpdoc for public fileapiRobin Appelman2013-09-062-10/+10
| * | | | | | | | | | extract interfaces from fileapi for public namespaceRobin Appelman2013-09-066-3/+259