summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-2434-170/+244
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-23166-1081/+4115
|
* Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-226-18/+24
|\ | | | | Fix rendering of database connection error page
| * Make database connection error messages less verboseMichael Gapczynski2013-01-211-2/+3
| |
| * returning http status code 503 in case connecting to the database failedThomas Mueller2013-01-211-0/+8
| |
| * Merge branch 'master' into fix-issue-1085Michael Gapczynski2013-01-07148-2782/+3647
| |\
| * | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-076-18/+15
| | |
* | | Merge pull request #1259 from TheSFReader/masterThomas Müller2013-01-221-0/+2
|\ \ \ | | | | | | | | Add two specific mimetype extensions (ebooks): for epub and mobi files
| * | | Add ebook specific mimetypesTheSFReader2013-01-171-1/+0
| | | |
| * | | Add ebook specific mimetypesTheSFReader2013-01-171-0/+3
| | | |
* | | | Merge pull request #1237 from owncloud/fix-template-testsicewind19912013-01-221-4/+0
|\ \ \ \ | | | | | | | | | | Remove unnecessary ob_end_clean() from template tests
| * | | | Remove unnecessary ob_end_clean() from template testsMichael Gapczynski2013-01-191-4/+0
| | | | |
* | | | | Merge pull request #1105 from owncloud/files_encryptionSam Tuke2013-01-2238-793/+4118
|\ \ \ \ \ | | | | | | | | | | | | Files encryption
| * \ \ \ \ Merge branch 'master' into files_encryptionSam Tuke2013-01-22740-9271/+9056
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/templates/settings.php
* | | | | | Merge pull request #1255 from owncloud/leftcontent_fixicewind19912013-01-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix scrolling of leftcontent
| * | | | | | Fix scrolling of leftcontentRobin Appelman2013-01-211-1/+1
| | | | | | |
* | | | | | | enable unittesting on appframework and apptemplateadvancedThomas Mueller2013-01-211-1/+2
|/ / / / / /
* | | | | | [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
| | | | | | | | | |