Björn Schießle
|
54eeb8b8fc
|
fix merge conflict
|
2013-01-31 10:55:59 +01:00 |
Robin Appelman
|
207aa22d12
|
merge master into filesystem
|
2013-01-30 19:24:24 +01:00 |
Jörn Friedrich Dreyer
|
81a398c22c
|
use $.trim() for IE8
|
2013-01-30 13:29:24 +01:00 |
Jörn Friedrich Dreyer
|
99dfaee1f6
|
reset checkbox after getting selected files instead of ofter dragging, speed up revert
|
2013-01-30 12:59:35 +01:00 |
Jörn Friedrich Dreyer
|
1d0ee61f3a
|
use post instead of get
|
2013-01-30 12:59:35 +01:00 |
Jörn Friedrich Dreyer
|
0089b17749
|
add multselect dnd
|
2013-01-30 12:59:34 +01:00 |
Thomas Müller
|
5761bd771f
|
Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
hide upload progress bar and cancel action in IE < 10
|
2013-01-30 02:48:12 -08:00 |
Björn Schießle
|
8067a1394e
|
fix merge conflicts
|
2013-01-28 11:18:04 +01:00 |
Robin Appelman
|
930b9b9cd0
|
merge master into filesystem
|
2013-01-26 18:49:45 +01:00 |
Björn Schießle
|
dfab3d3d7f
|
call the trash bin view
|
2013-01-22 15:33:53 +01:00 |
Björn Schießle
|
9d77317de8
|
add trash button to web interface
|
2013-01-22 15:32:57 +01:00 |
Robin Appelman
|
83d6221322
|
merge master into filesytem
|
2013-01-20 03:11:04 +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 |
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
|
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 |
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 |
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 |
Robin Appelman
|
9bf367e7f8
|
merge master into filesystem
|
2013-01-15 14:57:23 +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
|
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
|
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 |
Jörn Friedrich Dreyer
|
780fb37758
|
allow default click behaviour
|
2013-01-09 15:21:55 +01:00 |
Thomas Mueller
|
7b9e6d2f2c
|
fixing string concatenation in javascript
refs ae54364d7c
|
2013-01-08 00:32:41 +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 |
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
|
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
|
03b8a065cf
|
input/form switching cleanup
|
2013-01-02 17:03:16 +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 |
Robin Appelman
|
7e36f730ec
|
merge master into filesystem
|
2012-12-25 14:29:29 +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
|
5107ccbeda
|
move CSS from JS to CSS
|
2012-12-20 10:53:50 +01:00 |
Michael Gapczynski
|
915126cae8
|
Trigger last action before continuing with creating a new file/folder/from link
|
2012-12-16 16:25:08 -05:00 |