aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* OC_Cache namespace changes and add UserCache to server container.Thomas Tanghus2013-09-1713-44/+270
* use \OC::$server->getPreviewManager() instead of \OCP\PreviewThomas Müller2013-09-174-6/+6
* fix namingThomas Müller2013-09-171-1/+1
* Merge branch 'master' into appframework-masterThomas Müller2013-09-17307-7383/+13212
|\
| * Merge pull request #4825 from owncloud/fix-sharing-expiration-oracleBart Visscher2013-09-165-11/+218
| |\
| | * Calculate dateInPast and dateInFuture.Andreas Fischer2013-09-121-5/+8
| | * Compare objects directly. Also use $expected and $actual.Andreas Fischer2013-09-121-6/+6
| | * Add database tests for INSERT/SELECT date format.Andreas Fischer2013-09-123-0/+80
| | * 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 comment explaining how $dateInFuture was picked.Andreas Fischer2013-09-121-0/+2
| | * Coding style: { for methods start are supposed to be on the same line.Andreas Fischer2013-09-121-12/+6
| | * Expiration tests for sharing with groups.Andreas Fischer2013-09-121-6/+76
| | * Do not repeat shareUserOneTestFileWithUserTwo() code.Andreas Fischer2013-09-121-25/+22
| | * Make dates test class properties.Andreas Fischer2013-09-121-2/+5
| | * Try to make Oracle happy by also specifying seconds.Andreas Fischer2013-09-121-2/+2
| | * Test whether a still-valid user share is still accessible.Andreas Fischer2013-09-121-11/+34
| | * Test whether an expired user share is still accessible.Andreas Fischer2013-09-121-0/+33
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-09-16297-7339/+12951
| * | Merge pull request #4838 from owncloud/refactor_upload_jsThomas Müller2013-09-163-33/+26
| |\ \
| | * | refactor upload js & html to always use only js to fill form dataJörn Friedrich Dreyer2013-09-133-33/+26
| * | | Merge pull request #4862 from owncloud/db_to_publicThomas Müller2013-09-161-0/+11
| |\ \ \
| | * | | Add OCP\DB::getErrorMessage() to public namespace.Thomas Tanghus2013-09-161-0/+11
| |/ / /
| * | | Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scann...icewind19912013-09-151-0/+6
| |\ \ \
| | * | | 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
* | | | first log the exceptionThomas Müller2013-09-151-1/+1
* | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-15214-1077/+5087
|\| | |
| * | | Merge pull request #4835 from owncloud/fix-apps-heightMorris Jobke2013-09-151-2/+2
| |\ \ \
| | * | | use lineheight instead of padding and heightBernhard Posselt2013-09-131-2/+2
| | |/ /
| * | | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enterMorris Jobke2013-09-151-2/+4
| |\ \ \
| | * | | no autoFocus if no users returnedPete McFarlane2013-09-111-1/+3
| | * | | Added autoFocus to #shareWith autocomplete optionsPete McFarlane2013-09-111-3/+3
| * | | | Merge pull request #4853 from owncloud/external-shared_mimetype-iconsThomas Müller2013-09-152-16/+10
| |\ \ \ \
| | * | | | Use external and shared icons in OC.Dialogs.filepicker()kondou2013-09-142-16/+10
| * | | | | Merge pull request #4506 from owncloud/oc_avatarsBernhard Posselt2013-09-1420-2/+578
| |\ \ \ \ \
| | * | | | | Remove superfluous $kondou2013-09-141-1/+1
| | * | | | | Merge branch 'master' into oc_avatarskondou2013-09-12511-3418/+12124
| | |\ \ \ \ \
| | * | | | | | Add a comment to clear defaultavatar-functionalitykondou2013-09-111-0/+1
| | * | | | | | Bring another enable_avatars to $_ and fix $thus->$thiskondou2013-09-113-2/+3
| | * | | | | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatarskondou2013-09-097-36/+41
| | * | | | | | Have the "notsquare" error as data, not as messagekondou2013-09-062-2/+2
| | * | | | | | Use \OC_App for checking whether encryption is enabledkondou2013-09-051-1/+1
| | * | | | | | Clean up avatars and preliminary use JSON->rawlist.phpkondou2013-09-054-18/+18
| | * | | | | | Fix an IE8 bug with the avatarcropper.kondou2013-09-052-10/+12
| | * | | | | | Have login-checks and CSRF checkskondou2013-09-053-8/+16
| | * | | | | | Use proper controller namingkondou2013-09-042-8/+10