Commit Graph

9116 Commits

Author SHA1 Message Date
Lukas Reschke 967b7947a1 Add the default-src 2013-01-20 12:19:09 +01:00
Lukas Reschke c82d6e5153 Add CSP header 2013-01-20 12:06:33 +01:00
Robin Appelman 4c05661875 Merge branch 'filesystem' of github.com:owncloud/core into filesystem 2013-01-20 03:11:50 +01:00
Robin Appelman 83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Michael Gapczynski 664f33a29c Update mtimes of all parent folders after change inside 2013-01-19 21:04:25 -05:00
Michael Gapczynski 68272fa253 Remove unnecessary ob_end_clean() from template tests 2013-01-19 20:28:45 -05:00
Jenkins for ownCloud ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +01:00
Thomas Mueller 5d6c1d52bd replace #notification with OC.Notification call 2013-01-19 21:37:05 +01:00
Lukas Reschke 10a9ddd9b2 Merge pull request #1233 from owncloud/visualphpunit
Add listener for VisualPHPUnit
2013-01-19 11:25:31 -08:00
Lukas Reschke 8daefd00fb Sanitize the exception 2013-01-19 19:57:17 +01:00
Lukas Reschke 42b924da0e Also replace the backslash with a minus
For Windows systems
2013-01-19 19:47:26 +01:00
Bernhard Posselt f1939866f3 Merge pull request #1214 from Raydiation/master
Load Classpaths of apps before appinfo/routes.php
2013-01-19 09:44:48 -08:00
Thomas Mueller b8318e6df4 Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/js/files.js
2013-01-19 15:58:15 +01:00
Lukas Reschke 53b95cb8fd Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
Remove uneeded file
2013-01-19 05:56:27 -08:00
Jan-Christoph Borchardt ae244972cb Merge pull request #1228 from owncloud/generating_zip_message
Make the ZIP download information friendlier
2013-01-19 04:33:39 -08:00
Lukas Reschke 02bd8dd45a Change the second part of the notification 2013-01-19 13:12:27 +01:00
Michael Gapczynski 8ca30d244c Implement getETag() in shared storage 2013-01-19 00:02:40 -05:00
Michael Gapczynski cd8d8360b0 Disable fancy folder sharing for now 2013-01-18 23:57:13 -05:00
Michael Gapczynski 5df6f9d14d Fix merge 2013-01-18 23:56:47 -05:00
Michael Gapczynski bc8957a195 Add listener for VisualPHPUnit 2013-01-18 23:03:53 -05:00
Thomas Mueller 1dd70ac506 update used space percent after each ajax call and display the notification 2013-01-19 00:31:49 +01:00
Thomas Mueller cdd07b3339 introducing class OCA/files/lib/Helper with new function to build an array with storage stats
DRYing the code by using \OCA\files\lib\Helper::buildFileStorageStatistics()
now returning used space percent on each ajax call
2013-01-19 00:31:09 +01:00
Jenkins for ownCloud a17ca3a69a [tx-robot] updated from transifex 2013-01-19 00:05:38 +01:00
Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Lukas Reschke f447e6469f Remove uneeded file
I don't saw any usage of this file through the code, I assume it can
safely be removed.
2013-01-18 23:07:11 +01:00
Thomas Müller 31cc9aa80d Merge pull request #986 from owncloud/fixing-784-master
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
Lukas Reschke ad57db3e87 Make the message friendlier 2013-01-18 22:35:26 +01:00
Jörn Friedrich Dreyer 5e16510a53 hide upload progress bar and cancel action in IE < 10 2013-01-18 22:06:42 +01:00
Lukas Reschke edf3572835 Merge pull request #1224 from davidgumberg/patch-2
Typo fix (comment) /lib/base.php
2013-01-18 12:33:15 -08:00
Thomas Mueller 5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
davidgumberg 487e401361 Typo fix (comment) /lib/base.php 2013-01-18 10:52:29 -08:00
Björn Schießle adbc576439 handle group restore 2013-01-18 17:50:44 +01:00
Bart Visscher 9ffd4197ae Fix wrong word in comment 2013-01-18 16:38:40 +01:00
Björn Schießle d2c5f9bec7 fix error message, add "appid" to the output to know which app caused the error if OC_App::getStorage() fails.
Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
2013-01-18 15:14:42 +01:00
Björn Schießle 8fdcd72d7f expire files in trash bin after 30 days 2013-01-18 15:12:38 +01:00
Thomas Müller 0ed635240a Merge pull request #1205 from owncloud/ocs_api
Return 401 headers when trying to access a restricted api call
2013-01-18 05:52:51 -08:00
Björn Schießle ca14af2fdd remove unneeded function 2013-01-18 14:11:55 +01:00
Björn Schießle d16164b0cd remove item in the trash bin view after successful undelete 2013-01-18 14:09:22 +01:00
Björn Schießle d5151fa61c first version of the trash bin app 2013-01-18 13:11:29 +01:00
Thomas Müller 5df57e4ada Merge pull request #1181 from owncloud/return-503-in-maintenance
in case of maintenance the error page returns http status 503.
2013-01-18 04:02:03 -08:00
Björn Schießle 1318450791 introduce option to disable download action 2013-01-18 10:51:13 +01:00
Björn Schießle 82d4da0d3d call the trash bin view 2013-01-18 10:23:31 +01:00
Jenkins for ownCloud 824fcf6624 [tx-robot] updated from transifex 2013-01-18 00:04:36 +01:00
TheSFReader 73522fe189 Add ebook specific mimetypes 2013-01-17 22:20:57 +01:00
TheSFReader eb9cd0858e Add ebook specific mimetypes 2013-01-17 21:57:04 +01:00
Bernhard Posselt 2b95ae1e6d spaces to tabs 2013-01-17 21:44:40 +01:00
Bernhard Posselt a8094abac7 load classpaths of apps before routes 2013-01-17 21:42:46 +01:00
tomneedham b4954c0c89 Correct spelling of 'Authorization' 2013-01-17 16:30:14 +00:00
Thomas Mueller 130c9cad03 relative storage info without decimals 2013-01-17 16:52:57 +01:00
Thomas Mueller b7d3bf5f81 rename space -> storage 2013-01-17 16:49:10 +01:00