5d6c1d52bd
replace #notification with OC.Notification call
2013-01-19 21:37:05 +07:00
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +07:00
53b95cb8fd
Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
...
Remove uneeded file
2013-01-19 05:56:27 +07:00
ae244972cb
Merge pull request #1228 from owncloud/generating_zip_message
...
Make the ZIP download information friendlier
2013-01-19 04:33:39 +07:00
02bd8dd45a
Change the second part of the notification
2013-01-19 13:12:27 +07:00
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +07: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 +07:00
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +07: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 +07:00
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 +07: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 +07:00
ad57db3e87
Make the message friendlier
2013-01-18 22:35:26 +07:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +07:00
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +07:00
130c9cad03
relative storage info without decimals
2013-01-17 16:52:57 +07:00
b7d3bf5f81
rename space -> storage
2013-01-17 16:49:10 +07:00
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +07:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +07:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +07: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 +07:00
73c4d0faff
initialize $versionCreated
2013-01-16 10:20:09 +07:00
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +07: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 +07:00
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +07: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 +07:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +07:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +07:00
7455056d2d
Merge pull request #1169 from owncloud/webdav_L10n
...
user_webdavauth - l10n - Trivial
2013-01-14 12:28:51 +07:00
9eb16e06f7
Merge pull request #1135 from owncloud/allow_default_click_behaviour
...
allow default click behaviour
2013-01-14 11:24:02 +07:00
51a4240051
Merge pull request #1170 from owncloud/correctIndention
...
Remove ugly indentation - Trivial
2013-01-14 04:59:53 +07:00
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +07:00
e0173303e6
merge conflict fixed, settings-personal.php is no longer needed
...
Conflicts:
apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +07:00
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +07:00
2a7e5faa37
Remove ugly indentation
2013-01-13 01:02:11 +07:00
9cfc195b7c
The => This
...
Sounds better for me.
2013-01-13 00:45:45 +07:00
90d0d08826
Improved the help text
2013-01-13 00:37:58 +07:00
fb7f9e25c3
legend - l10n
2013-01-13 00:32:44 +07:00
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +07:00
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +07:00
d276d21c76
- code clean-up
...
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +07:00
e560cba76b
adding a ajax call to get the current file storage stats like free space
...
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
2013-01-11 16:47:28 +07:00
938254a1c0
load jquery-visibility
2013-01-11 16:45:32 +07:00
362860c5b5
adding jquery-visibility
...
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
2013-01-11 16:44:25 +07:00
3d33e8f845
fixing indent - sorryy wrong setting on the IDE :-(
...
replace missing calls to OC.Notification.show
2013-01-11 15:02:34 +07:00
9afdc14d40
adding accidentally removed line - THX @bartv2
2013-01-11 14:55:49 +07:00
99a0ea44ee
function description fixed
2013-01-11 14:24:00 +07:00
67d00bc6bb
some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed
2013-01-11 14:23:28 +07:00
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +07:00
6be9c0a974
some code clean-up
2013-01-11 11:12:32 +07:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +07:00
Thomas Mueller
Lukas Reschke
Jan-Christoph Borchardt
Bart Visscher
Björn Schießle
Björn Schießle
blizzz