mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,033 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

9033 Commits

Author SHA1 Message Date
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
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
Robin Appelman 6871a150bd Cache: use a database transition for scanning each folder 
gives a massive speed improvement while scanning files
 2013-01-16 21:58:17 +01:00
Robin Appelman bb43cf378b Files: make sure keybinds js is loaded after files js 2013-01-16 21:36:25 +01:00
Robin Appelman f9c42a196f Cache: no longer using this file 2013-01-16 21:36:04 +01: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
Robin Appelman 29ec007979 Cache: dont migrate permissions, cache them on demain instead 2013-01-16 19:11:33 +01:00
Robin Appelman 5445b94416 merge master into filesystem 2013-01-16 19:04:50 +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
Björn Schießle f71a5dec99 initialize 2013-01-16 10:18:40 +01:00
Thomas Müller 1f7bf57ece Merge pull request #1195 from owncloud/cache_prepared 
Cache prepared statements in OC_DB
 2013-01-15 22:23:34 -08:00
Robin Appelman f18fc1c510 Clear cached prepared statements when switching between mdb2 and pdo 2013-01-16 01:12:13 +01:00
Jenkins for ownCloud 0398bfffca [tx-robot] updated from transifex 2013-01-16 00:21:21 +01:00
Thomas Müller 4668f8c86e Merge pull request #1178 from owncloud/return_true_because_of_ponies 
Remove uneeded return
 2013-01-15 14:01:48 -08:00