summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-2148-121/+173
|
* Merge pull request #1247 from ↵Thomas Müller2013-01-201-0/+3
|\ | | | | | | | | owncloud/clear-queries-cache-on-schema-change-master cached queries need to be reset on schema change because they become inv...
| * cached queries need to be reset on schema change because they become invalidThomas Mueller2013-01-201-0/+3
|/ | | | fixes: https://github.com/owncloud/apps/issues/468
* [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 VisualPHPUnit
| * 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
| | | | | | | | For Windows systems
* | Merge pull request #1214 from Raydiation/masterBernhard Posselt2013-01-191-0/+17
|\ \ | | | | | | Load Classpaths of apps before appinfo/routes.php
| * | 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 file
| * | | Remove uneeded fileLukas Reschke2013-01-181-54/+0
| | | | | | | | | | | | | | | | | | | | I don't saw any usage of this file through the code, I assume it can safely be removed.
* | | | Merge pull request #1228 from owncloud/generating_zip_messageJan-Christoph Borchardt2013-01-191-1/+1
|\ \ \ \ | |_|_|/ |/| | | Make the ZIP download information friendlier
| * | | 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
|\ \ \ | |/ / |/| | the maximum upload size is now part of the response of the upload and de...
| * | 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
| | | | | | | | | | | | | | | logic to call it every 5 minutes make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
| * | load jquery-visibilityThomas Mueller2013-01-111-0/+1
| | |
| * | adding jquery-visibilityThomas Mueller2013-01-111-0/+32
| | | | | | | | | | | | | | | https://github.com/mathiasbynens/jquery-visibility MIT and GPL licensed
| * | Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-11275-5555/+8279
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| * \ \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-06502-7419/+14471
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js lib/helper.php
| * | | | the maximum upload size is now part of the response of the upload and delete ↵Thomas Müller2012-12-206-17/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation. the maximum upload size is updated within the browser once an upload or delete operation has been finished
* | | | | Merge pull request #1224 from davidgumberg/patch-2Lukas Reschke2013-01-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Typo fix (comment) /lib/base.php
| * | | | | 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 ↵Björn Schießle2013-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error if OC_App::getStorage() fails. Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
* | | | | Merge pull request #1205 from owncloud/ocs_apiThomas Müller2013-01-181-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Return 401 headers when trying to access a restricted api call
| * | | | | 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.
| * | | | | | in case of maintenance the error page returns http status 503.Thomas Mueller2013-01-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary to enable the desktop sync client to react properly. Currently the SabreDAV plugin OC_Connector_Sabre_MaintenancePlugin is not executed because this error page is returned before the SabreDAV code is executed
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1876-215/+288
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #1148 from seancomeau/topic/setupFrank Karlitschek2013-01-161-5/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix issue #108
| * | | | | | 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 ↵Sean Comeau2013-01-101-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | error text to user
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1791-1695/+1975
| | | | | | |
* | | | | | | Merge pull request #1204 from Raydiation/masterBart Visscher2013-01-163-10/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Dont resize content div with javascript but use css box-sizing to do it
| * | | | | | | 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
|/ / / / / / /
* | | | | | | Merge pull request #1180 from owncloud/whitespace-cleanupBart Visscher2013-01-1651-1058/+1056
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Whitespace cleanup
| * | | | | | | Whitespace cleanupBart Visscher2013-01-1634-107/+105
| | | | | | | |
| * | | | | | | Spaces to tabsBart Visscher2013-01-1618-951/+951
|/ / / / / / /
* | | | | | | Merge pull request #1185 from owncloud/fixing-1162-masterJan-Christoph Borchardt2013-01-162-5/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | handling proper display of files/folders with negative size
| * | | | | | | handling proper display of files/folders with negative sizeThomas Mueller2013-01-142-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs #1162
* | | | | | | | Merge pull request #1192 from schiesbn/versioning_history_issue_1189Björn Schießle2013-01-161-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix for issue #1186, missing variables added