summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Updated method names and added a few more tests.Thomas Tanghus2013-09-192-9/+9
* fixing namespaces and rename hasCategory to hasTagThomas Müller2013-09-181-9/+9
* Merge branch 'appframework-master' into vcategories_publicThomas Müller2013-09-1817-94/+311
|\
| * updating php docsThomas Müller2013-09-184-8/+21
| * Note to self 2: Do as you preach. Test!Thomas Tanghus2013-09-184-6/+6
| * Note to self: Test before pushing!!!Thomas Tanghus2013-09-181-1/+1
| * Merge branch 'appframework-master' into public_cacheThomas Tanghus2013-09-187-56/+89
| |\
| | * Add some docs to the sessions interface.Thomas Tanghus2013-09-181-2/+14
| | * Still some session leftovers.Thomas Tanghus2013-09-171-10/+0
| | * Purge session from Request - and fix some stylesThomas Tanghus2013-09-173-45/+16
| | * Add interface for Session and add getter in server container.Thomas Tanghus2013-09-174-1/+62
| * | Use new emitter systemThomas Tanghus2013-09-181-1/+3
| * | Add legacy wrapperThomas Tanghus2013-09-171-0/+10
| * | OC_Cache namespace changes and add UserCache to server container.Thomas Tanghus2013-09-1711-30/+186
| |/
* | OC_VCategories=>OC\Tags. Public interface + getter in server containerThomas Tanghus2013-09-185-833/+813
* | Merge branch 'appframework-master' into vcategories_publicThomas Tanghus2013-09-1793-483/+6833
|\|
| * fix namingThomas Müller2013-09-171-1/+1
| * Merge branch 'master' into appframework-masterThomas Müller2013-09-173-1/+20
| |\
| | * 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
| * | | class files have to be lowercaseThomas Müller2013-09-171-0/+0
| * | | adding interface for middlewareThomas Müller2013-09-171-0/+88
| * | | /OC/Server has created too early causing issues with config operations as OC:...Thomas Müller2013-09-151-3/+3
| * | | adding getRootFolder() to server container and hooking up the new files apiThomas Müller2013-09-152-0/+28
| * | | Merge branch 'master' into appframework-masterThomas Müller2013-09-157-5/+163
| |\| |
| | * | 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