summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Concatenate string in SQL instead of PHPJörn Friedrich Dreyer2013-11-011-10/+10
* Merge pull request #5443 from owncloud/fix-autoloader-cachingBart Visscher2013-11-012-24/+33
|\
| * Allow null as cache parameter (if no cache was found) and for cache removal.Andreas Fischer2013-10-221-1/+1
| * Only write-back on cache miss.Andreas Fischer2013-10-221-3/+3
| * Only use autoloader cache when 'instanceid' is available.Andreas Fischer2013-10-221-5/+9
| * Inject memoryCache into Autoloader. Remove recursion-prevention hack.Andreas Fischer2013-10-222-28/+33
* | Merge pull request #5658 from owncloud/session-error-full-sentenceMorris Jobke2013-11-011-1/+1
|\ \
| * | Make "Please contact your system administrator" a full sentence.Andreas Fischer2013-11-011-1/+1
* | | Merge pull request #5653 from owncloud/fix-api-documentationMorris Jobke2013-11-018-417/+413
|\ \ \ | |/ / |/| |
| * | fix documentation stuffMorris Jobke2013-10-318-417/+413
* | | Merge pull request #5551 from owncloud/fix-5202-masterMorris Jobke2013-10-311-1/+5
|\ \ \
| * | | When updating an appstore app, execute a database updateBart Visscher2013-10-251-1/+5
* | | | Merge pull request #5637 from owncloud/fix_privatedataJörn Friedrich Dreyer2013-10-315-51/+265
|\ \ \ \
| * | | | Get rid of the SELECT query. Try UPDATE, on failure INSERT.Andreas Fischer2013-10-311-8/+4
| * | | | testing update and deleteThomas Müller2013-10-311-0/+39
| * | | | fixing undefined index in delete()Thomas Müller2013-10-311-5/+7
| * | | | adding unit tests for deleteThomas Müller2013-10-311-0/+16
| * | | | PHPDoc comment updated - checkLoggedIn() removedThomas Müller2013-10-311-9/+10
| * | | | unit tests for set addedThomas Müller2013-10-311-5/+38
| * | | | no need to check if the user is logged inThomas Müller2013-10-311-1/+0
| * | | | fixing php notice: Undefined index keyThomas Müller2013-10-311-1/+1
| * | | | first two testsThomas Müller2013-10-311-0/+53
| * | | | no need to check if the user is logged in - this is already done in the ocs d...Thomas Müller2013-10-311-6/+6
| * | | | Merge branch 'master' into fix_privatedataThomas Müller2013-10-318-61/+81
| |\ \ \ \
| * | | | | increase version number to trigger db migrationFrank Karlitschek2013-10-301-1/+1
| * | | | | fix the privatedata key value storeFrank Karlitschek2013-10-303-43/+118
* | | | | | Merge pull request #5591 from owncloud/home-storageJörn Friedrich Dreyer2013-10-314-2/+123
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'master' into home-storageThomas Müller2013-10-30738-6458/+15220
| |\ \ \ \ \
| * | | | | | dont use the home storage for non-existing usersRobin Appelman2013-10-291-2/+2
| * | | | | | use the new home storage backend when no existing local storage backend exist...Robin Appelman2013-10-292-2/+21
| * | | | | | add specialized storage backend for home foldersRobin Appelman2013-10-292-0/+102
* | | | | | | Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermodeMorris Jobke2013-10-311-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Corretly hide "no permissions" message in controls in viewer modeVincent Petry2013-10-311-0/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | prefer closest over parentJörn Friedrich Dreyer2013-10-311-1/+1
* | | | | | | Merge pull request #5531 from owncloud/upgrade-form-occAndreas Fischer2013-10-313-77/+90
|\ \ \ \ \ \ \
| * | | | | | | Add some color to the occ upgrade output.Andreas Fischer2013-10-281-11/+11
| * | | | | | | Use "else if" to remove one level of indentation.Andreas Fischer2013-10-281-13/+11
| * | | | | | | Missed one write()->writeln(). Fixed.ringmaster2013-10-281-1/+1
| * | | | | | | Use writeln() instead of write()ringmaster2013-10-281-11/+11
| * | | | | | | Use the OutputInterface for output and return error codes.ringmaster2013-10-281-21/+30
| * | | | | | | Move all upgrade routines into the command-line tool.ringmaster2013-10-282-78/+55
| * | | | | | | Add `occ upgrade` command.ringmaster2013-10-242-0/+29
* | | | | | | | use data-file to retrieve filenameJörn Friedrich Dreyer2013-10-311-1/+1
* | | | | | | | Merge pull request #5638 from owncloud/admin-quotafieldMorris Jobke2013-10-313-6/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | fix translation stringsMorris Jobke2013-10-311-2/+2
| * | | | | | | | Fixed input field and tipsy positioning in singleselectVincent Petry2013-10-311-4/+3
| * | | | | | | | Improve quota input fieldVincent Petry2013-10-303-5/+27
* | | | | | | | | Adding link to documents repoThomas Müller2013-10-311-0/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #5642 from owncloud/fixing-5271-masterVicDeo2013-10-301-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | we should check if a user is logged in before we check for admin privilegeThomas Müller2013-10-301-0/+2
|/ / / / / / / /