1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
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
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
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
edf3572835
Merge pull request #1224 from davidgumberg/patch-2
...
Typo fix (comment) /lib/base.php
2013-01-18 12:33:15 -08:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
487e401361
Typo fix (comment) /lib/base.php
2013-01-18 10:52:29 -08:00
9ffd4197ae
Fix wrong word in comment
2013-01-18 16:38:40 +01:00
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
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
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
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
b4954c0c89
Correct spelling of 'Authorization'
2013-01-17 16:30:14 +00:00
130c9cad03
relative storage info without decimals
2013-01-17 16:52:57 +01:00
b7d3bf5f81
rename space -> storage
2013-01-17 16:49:10 +01:00
d85e440aa1
Merge pull request #1148 from seancomeau/topic/setup
...
Fix issue #108
2013-01-16 22:38:57 -08:00
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
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
358671ac1d
Fix incorrect indentation
2013-01-16 20:29:29 +00:00
098c84a29c
Return 401 headers when authentication is required for the api call
2013-01-16 20:27:43 +00:00
b659072686
dont show horizontal scrollbar
2013-01-16 19:55:16 +01:00
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
1d57a2e2a9
Merge pull request #1180 from owncloud/whitespace-cleanup
...
Whitespace cleanup
2013-01-16 09:25:57 -08:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
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
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
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
73c4d0faff
initialize $versionCreated
2013-01-16 10:20:09 +01:00
f71a5dec99
initialize
2013-01-16 10:18:40 +01:00
1f7bf57ece
Merge pull request #1195 from owncloud/cache_prepared
...
Cache prepared statements in OC_DB
2013-01-15 22:23:34 -08:00
f18fc1c510
Clear cached prepared statements when switching between mdb2 and pdo
2013-01-16 01:12:13 +01:00
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
4668f8c86e
Merge pull request #1178 from owncloud/return_true_because_of_ponies
...
Remove uneeded return
2013-01-15 14:01:48 -08:00
65ef780ed6
Fix regression caused by 31b1a73e1f
2013-01-15 22:44:40 +01:00
a08490364d
Cache prepared statements in OC_DB
2013-01-15 20:21:06 +01:00
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
b2a3a8d73b
Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into versioning_history_issue_1189
2013-01-15 14:35:48 +01:00
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +01:00
ef4e6f3d6c
fix for issue #1189 , missing variables added
2013-01-15 13:29:59 +01:00
bb9cc227c2
Merge pull request #1087 from owncloud/ldap_multiple_dns
...
LDAP: ability to configure more than one base DN
2013-01-15 04:01:57 -08:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
42678096bb
remove php closing tag
2013-01-14 23:51:58 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
44e5c052b3
handling proper display of files/folders with negative size
...
refs #1162
2013-01-14 23:39:31 +01:00
71ae41716a
Merge pull request #1182 from owncloud/sanitizeHTML-Clean
...
Expanded one line if statement - Trivial
2013-01-14 14:37:23 -08:00
ab287d2ba4
Move { to same line
2013-01-14 22:04:31 +01:00
c845e75693
Expand if to multiple lines
...
Oneliners are ugly.
2013-01-14 22:01:52 +01:00
53ca0db434
Merge pull request #1177 from owncloud/OC_User--isAdminUser()
...
Check if user is admin - bool
2013-01-14 12:53:18 -08:00
31ce320c52
in case of maintenance the error page returns http status 503.
...
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
2013-01-14 21:39:55 +01:00
Thomas Mueller
Lukas Reschke
davidgumberg
Bart Visscher
Björn Schießle
tomneedham
Frank Karlitschek
Bernhard Posselt
Jan-Christoph Borchardt
Björn Schießle
Robin Appelman
Daniel Molkentin
blizzz