Robin Appelman
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01: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
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
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
Thomas Mueller
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01: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
Jenkins for ownCloud
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +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
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01: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
Jenkins for ownCloud
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
Robin Appelman
7debfac0dc
Cache: more efficient upgrading
2013-01-15 19:11:12 +01:00
Robin Appelman
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
Bart Visscher
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
Robin Appelman
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
Jenkins for ownCloud
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Lukas Reschke
9eb16e06f7
Merge pull request #1135 from owncloud/allow_default_click_behaviour
...
allow default click behaviour
2013-01-14 11:24:02 -08:00
Thomas Müller
51a4240051
Merge pull request #1170 from owncloud/correctIndention
...
Remove ugly indentation - Trivial
2013-01-14 04:59:53 -08:00
Jenkins for ownCloud
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
Lukas Reschke
2a7e5faa37
Remove ugly indentation
2013-01-13 01:02:11 +01:00
Jenkins for ownCloud
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
Thomas Mueller
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 +01:00
Thomas Mueller
938254a1c0
load jquery-visibility
2013-01-11 16:45:32 +01:00
Thomas Mueller
362860c5b5
adding jquery-visibility
...
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
2013-01-11 16:44:25 +01:00
Thomas Mueller
3d33e8f845
fixing indent - sorryy wrong setting on the IDE :-(
...
replace missing calls to OC.Notification.show
2013-01-11 15:02:34 +01:00
Thomas Mueller
9afdc14d40
adding accidentally removed line - THX @bartv2
2013-01-11 14:55:49 +01:00
Thomas Mueller
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 +01:00
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Thomas Mueller
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Thomas Müller
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
Jenkins for ownCloud
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
Jörn Friedrich Dreyer
780fb37758
allow default click behaviour
2013-01-09 15:21:55 +01:00
Jörn Friedrich Dreyer
a40c95242f
more translations
2013-01-09 12:48:57 +01:00
Thomas Mueller
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
Jenkins for ownCloud
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
Thomas Mueller
7b9e6d2f2c
fixing string concatenation in javascript
...
refs ae54364d7c
2013-01-08 00:32:41 +01:00
Jenkins for ownCloud
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
Jörn Friedrich Dreyer
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
Jörn Friedrich Dreyer
da442b024c
remove aborted uploads
2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer
cbb118d4a3
adapt to isFileNameValid, whitespace cleanup
2013-01-07 10:39:35 +01:00
Robin Appelman
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
Jenkins for ownCloud
0b007235b9
[tx-robot] updated from transifex
2013-01-07 00:06:32 +01:00
Thomas Mueller
a0d6f0e127
fixing undefined $eventSource
2013-01-06 23:36:31 +01:00
Thomas Mueller
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Thomas Mueller
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
Thomas Mueller
07b3b23a39
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:28:21 +01:00
Thomas Mueller
b4191b7da5
rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!
...
adding file name checks and notifications to isFileNameValid() for . and empty file name
2013-01-06 12:52:00 +01:00
Thomas Mueller
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
Robin Appelman
a5dcbc3d8a
Files: prevent people from renaming files to '.'
2013-01-05 03:30:05 +01:00
Jenkins for ownCloud
934d9dcc42
[tx-robot] updated from transifex
2013-01-05 00:03:58 +01:00
Thomas Mueller
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
Jörn Friedrich Dreyer
9cd7bb2c8d
reverse z-index of a and input to make upload work again in ie8/9
2013-01-04 13:48:29 +01:00
Jörn Friedrich Dreyer
de496ed16d
remove initial iframe, is added automatically by jquery upload mechanism
2013-01-04 13:47:47 +01:00
Jenkins for ownCloud
90f39cd703
[tx-robot] updated from transifex
2013-01-04 13:23:31 +01:00
Robin Appelman
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
Thomas Müller
b673748151
Merge pull request #1063 from owncloud/translate_not_enough_space_available
...
add translation call for 'Not enough space available' upload error
2013-01-03 06:46:36 -08:00
Jörn Friedrich Dreyer
fc64e8ec58
fix error when wrong dir was specified
2013-01-03 13:34:56 +01:00
Jörn Friedrich Dreyer
f19787f84c
move $l to top
2013-01-03 12:00:07 +01:00
Jörn Friedrich Dreyer
ea732e5b29
also translate 'No file was uploaded. Unknown error'
2013-01-03 11:57:17 +01:00
Jenkins for ownCloud
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
Thomas Müller
e0e7c98100
Merge pull request #1041 from owncloud/fixing-856-master
...
Fixing #856 master
2013-01-02 14:58:54 -08:00
Thomas Mueller
3ea9432d43
fixing undefined variable $l
2013-01-02 22:15:43 +01:00
Jörn Friedrich Dreyer
0405edc798
add translation call for 'Not enough space available' upload error
2013-01-02 21:00:50 +01:00
Jörn Friedrich Dreyer
03b8a065cf
input/form switching cleanup
2013-01-02 17:03:16 +01:00
Jörn Friedrich Dreyer
a6733ff012
abort rename on ESC keyup
2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer
740b6623aa
show notification when renaming a file to ''
2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer
32c2b0d50e
enable enter in ie by using .submit()+form instead of .change(), use notifications when name is empty
2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer
8148c187a3
whitespace cleanup
2013-01-02 16:07:10 +01:00
Thomas Mueller
48f6dccdb7
notifications are now shown/hidden using the js functions hideNotification and showNotification.
...
storage warnings are displayed in a notification.
as soon as a notification is hidden the storage warning will come back.
2013-01-02 15:09:40 +01:00
Thomas Mueller
48c7bed59b
make usedSpacePercent available in the files app
2013-01-02 15:06:49 +01:00
Jenkins for ownCloud
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
Lukas Reschke
f70f9f3bc4
Merge pull request #1043 from owncloud/fix_breadcrumb_slashes
...
Replace %2F with / in breadcrumbs
2012-12-30 08:56:32 -08:00
Jenkins for ownCloud
66e57f5fb1
[tx-robot] updated from transifex
2012-12-30 00:05:52 +01:00
Michael Gapczynski
b5b48428ab
Replace %2F with / in breadcrumbs
2012-12-28 19:41:37 -05:00
Thomas Mueller
a3206b4e97
only show the max possible upload of 2GB on a 32 bit system.
...
for a 64 bit system we have no such limitation
refs #856
Conflicts:
apps/files/templates/admin.php
2012-12-28 22:17:38 +01:00
Thomas Mueller
7b72424a39
Revert "fixed max possible upload size for files app in admin screen"
...
This reverts commit 7f2208b9a1
.
Conflicts:
apps/files/admin.php
2012-12-28 22:14:32 +01:00
Jenkins for ownCloud
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
Robin Appelman
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
Jenkins for ownCloud
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
Jenkins for ownCloud
05fda76776
[tx-robot] updated from transifex
2012-12-22 00:26:25 +01:00
Thomas Müller
39d874cd90
the maximum upload size is now part of the response of the upload and delete operation.
...
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +01:00
Jan-Christoph Borchardt
bdc8d0098a
Merge pull request #869 from owncloud/files-styles
...
Files styles
2012-12-20 05:39:09 -08:00
Jan-Christoph Borchardt
86d510ba28
fix switched values from previous commit
2012-12-20 13:30:57 +01:00