summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesytemRobin Appelman2013-01-20301-4797/+5517
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-20150-2825/+3011
| * Merge pull request #1233 from owncloud/visualphpunitLukas Reschke2013-01-191-0/+3
| |\
| | * Add listener for VisualPHPUnitMichael Gapczynski2013-01-181-0/+3
| * | Sanitize the exceptionLukas Reschke2013-01-191-1/+1
| * | Also replace the backslash with a minusLukas Reschke2013-01-191-1/+2
| * | Merge pull request #1214 from Raydiation/masterBernhard Posselt2013-01-191-0/+17
| |\ \
| | * | spaces to tabsBernhard Posselt2013-01-171-12/+12
| | * | load classpaths of apps before routesBernhard Posselt2013-01-171-0/+17
| * | | Merge pull request #1230 from owncloud/remove-unused-autocomplete.phpLukas Reschke2013-01-191-54/+0
| |\ \ \
| | * | | Remove uneeded fileLukas Reschke2013-01-181-54/+0
| * | | | Merge pull request #1228 from owncloud/generating_zip_messageJan-Christoph Borchardt2013-01-191-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Change the second part of the notificationLukas Reschke2013-01-191-1/+1
| | * | | Make the message friendlierLukas Reschke2013-01-181-1/+1
| | |/ /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1920-118/+140
| * | | Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-188-16/+171
| |\ \ \ | | |/ / | |/| |
| | * | fixing indentThomas Mueller2013-01-185-73/+73
| | * | adding a ajax call to get the current file storage stats like free spaceThomas Mueller2013-01-112-0/+42
| | * | load jquery-visibilityThomas Mueller2013-01-111-0/+1
| | * | adding jquery-visibilityThomas Mueller2013-01-111-0/+32
| | * | Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-11275-5555/+8279
| | |\ \
| | * \ \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-06502-7419/+14471
| | |\ \ \
| | * | | | the maximum upload size is now part of the response of the upload and delete ...Thomas Müller2012-12-206-17/+98
| * | | | | Merge pull request #1224 from davidgumberg/patch-2Lukas Reschke2013-01-181-1/+1
| |\ \ \ \ \
| | * | | | | Typo fix (comment) /lib/base.phpdavidgumberg2013-01-181-1/+1
| |/ / / / /
| * | | | | Fix wrong word in commentBart Visscher2013-01-181-1/+1
| * | | | | fix error message, add "appid" to the output to know which app caused the err...Björn Schießle2013-01-181-1/+1
| * | | | | Merge pull request #1205 from owncloud/ocs_apiThomas Müller2013-01-181-0/+2
| |\ \ \ \ \
| | * | | | | Correct spelling of 'Authorization'tomneedham2013-01-171-1/+1
| | * | | | | Fix incorrect indentationTom Needham2013-01-161-2/+2
| | * | | | | Return 401 headers when authentication is required for the api callTom Needham2013-01-161-0/+2
| * | | | | | Merge pull request #1181 from owncloud/return-503-in-maintenanceThomas Müller2013-01-181-0/+6
| |\ \ \ \ \ \
| | * | | | | | in case of maintenance the error page returns http status 503.Thomas Mueller2013-01-141-0/+6
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1876-215/+288
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #1148 from seancomeau/topic/setupFrank Karlitschek2013-01-161-5/+35
| |\ \ \ \ \ \
| | * | | | | | Rename TestException to DatabaseSetupExceptionSean Comeau2013-01-141-5/+5
| | * | | | | | Use a custom exception instead of adding a delimiter to the error messageSean Comeau2013-01-141-8/+31
| | * | | | | | Throw an exception when creating a MySQL user fails and display exception err...Sean Comeau2013-01-101-3/+10
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1791-1695/+1975
| * | | | | | | Merge pull request #1204 from Raydiation/masterBart Visscher2013-01-163-10/+8
| |\ \ \ \ \ \ \
| | * | | | | | | dont show horizontal scrollbarBernhard Posselt2013-01-161-1/+1
| | * | | | | | | dont resize content div with javascript but use css box-sizing to do itBernhard Posselt2013-01-163-10/+8
| |/ / / / / / /
* | | | | | | | Implement getETag() in shared storageMichael Gapczynski2013-01-191-1/+8
* | | | | | | | Disable fancy folder sharing for nowMichael Gapczynski2013-01-181-28/+28
* | | | | | | | Fix mergeMichael Gapczynski2013-01-181-4/+4
* | | | | | | | Cache: use a database transition for scanning each folderRobin Appelman2013-01-161-3/+19
* | | | | | | | Files: make sure keybinds js is loaded after files jsRobin Appelman2013-01-161-1/+1
* | | | | | | | Cache: no longer using this fileRobin Appelman2013-01-161-61/+0
* | | | | | | | Cache: dont migrate permissions, cache them on demain insteadRobin Appelman2013-01-161-17/+0
* | | | | | | | merge master into filesystemRobin Appelman2013-01-16183-1516/+2341
|\| | | | | | |