wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8758 commits 157 branches 562 tags 714 MiB
Commit graph

8758 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
Frank Karlitschek
d85e440aa1 Merge pull request #1148 from seancomeau/topic/setup 
Fix issue #108
 2013-01-16 22:38:57 -08:00
Jenkins for ownCloud
433fa19268 [tx-robot] updated from transifex 2013-01-17 00:27:40 +01:00
Bart Visscher
d42214ef81 Merge pull request #1204 from Raydiation/master 
Dont resize content div with javascript but use css box-sizing to do it
 2013-01-16 13:53:38 -08:00
Tom Needham
9dc668740a Check that api methods return the correct result type 2013-01-16 21:46:00 +00:00
Tom Needham
358671ac1d Fix incorrect indentation 2013-01-16 20:29:29 +00:00
Tom Needham
098c84a29c Return 401 headers when authentication is required for the api call 2013-01-16 20:27:43 +00:00
Bernhard Posselt
b659072686 dont show horizontal scrollbar 2013-01-16 19:55:16 +01:00
Bernhard Posselt
b7f507b925 dont resize content div with javascript but use css box-sizing to do it 2013-01-16 19:38:19 +01:00
Bart Visscher
1d57a2e2a9 Merge pull request #1180 from owncloud/whitespace-cleanup 
Whitespace cleanup
 2013-01-16 09:25:57 -08:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Jan-Christoph Borchardt
cb0fd30458 Merge pull request #1185 from owncloud/fixing-1162-master 
handling proper display of files/folders with negative size
 2013-01-16 05:18:53 -08:00
Björn Schießle
2b9c925a2b Merge pull request #1192 from schiesbn/versioning_history_issue_1189 
fix for issue #1186, missing variables added
 2013-01-16 01:26:43 -08:00
Björn Schießle
5935f6adff Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into versioning_history_issue_1189 2013-01-16 10:25:48 +01:00
Björn Schießle
73c4d0faff initialize $versionCreated 2013-01-16 10:20:09 +01:00