Commit graph

543 commits

Author SHA1 Message Date
Christopher
90da518e3e Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Björn Schießle
9be836814c Merge pull request #4239 from owncloud/decrypt_files_again
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
kondou
edd92e4c09 Merge branch 'master' into fix_jslint_kondou
Conflicts:
	apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
Thomas Müller
12f4494de0 Merge pull request #4339 from owncloud/mimetype-defaults
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again
Conflicts:
	apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Jan-Christoph Borchardt
7e4dcd268f vertically center rename input box 2013-08-17 10:46:03 +02:00
Georg Ehrke
164502477d use jQuery.get instead of jQuery.ajax 2013-08-16 17:25:38 +02:00
Jörn Friedrich Dreyer
f94e603698 progress fixes 2013-08-16 11:40:55 +02:00
Jan-Christoph Borchardt
d2767faf61 Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
2013-08-15 15:31:42 -07:00
Thomas Müller
57f7ff2dbd communicate size of newly created file back and update UI 2013-08-16 00:31:27 +02:00
Thomas Müller
bd1895bdf8 Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-15 14:08:01 -07:00
Bjoern Schiessle
7adfc27caf remove whitespaces and some leftover code from testing 2013-08-15 13:13:16 +02:00
Jan-Christoph Borchardt
2fd5178a00 adjust New file dialog for new styles 2013-08-15 12:50:26 +02:00
Georg Ehrke
4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Jan-Christoph Borchardt
cba0f69622 increase row height to 50px, properly position everything, checkboxes, actions etc 2013-08-14 20:41:20 +02:00
Jörn Friedrich Dreyer
9da49264ea change filelist ui updates 2013-08-14 17:49:45 +02:00
Georg Ehrke
4f525c864d lazy load preview icons 2013-08-14 13:27:01 +02:00
Georg Ehrke
3cbbe395eb don't use hardcoded size for preview 2013-08-14 11:38:52 +02:00
Jörn Friedrich Dreyer
e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +02:00
kondou
4002491947 Reword a phrase 2013-08-14 06:29:19 +02:00
Bjoern Schiessle
53bb89824d check if some encrypted files are left after the app was disabled and warn the user 2013-08-12 17:25:27 +02:00
kondou
9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
Jörn Friedrich Dreyer
ff67f115d4 fix #2711 using a custom event, also use css selectors over filterAttr 2013-08-08 13:50:04 +02:00
kondou
1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +02:00
kondou
aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Georg Ehrke
ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
Jan-Christoph Borchardt
1a1c100719 fix loading.gif size for both upload and deletion, force visiblity 2013-07-30 10:44:01 +02:00
Thomas Müller
7425efade7 Merge branch 'master' into oc_preview
Conflicts:
	3rdparty
	lib/template.php
2013-07-30 00:34:36 +02:00
Victor Dubiniuk
33fe24dc3d Replace delete icon with spinner 2013-07-29 19:27:11 +03:00
Bjoern Schiessle
4a9f5f64da remove whitespaces 2013-07-29 17:15:20 +02:00
Björn Schießle
a00cff7c05 disable "deleted files" button if trash bin is empty 2013-07-26 11:14:29 +02:00
Thomas Müller
2a42021815 Merge branch 'master' into delete-fix
Conflicts:
	core/css/styles.css
2013-07-23 16:24:34 +02:00
Jan-Christoph Borchardt
48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
Jan-Christoph Borchardt
4bfd61fb7f use new delete icon for deleted files as well 2013-07-18 18:46:37 +02:00
Jan-Christoph Borchardt
8a25d1ad06 remove unnecessary tipsy for Files delete 2013-07-18 18:41:01 +02:00
Jan-Christoph Borchardt
197c979d26 use background image instead of img for Files delete icon 2013-07-18 18:40:09 +02:00
Björn Schießle
cb81ceb31d add new file above summary if it is the first file in the list 2013-07-12 10:40:24 +02:00
Georg Ehrke
a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Georg Ehrke
cf449d42e8 properly encode path 2013-07-10 12:30:20 +02:00
Georg Ehrke
d332b1d4a2 implement preview loading after upload 2013-07-02 11:13:22 +02:00
Thomas Müller
5fff4e0d08 Merge pull request #3903 from owncloud/nonpublic-uploading
Fix upload regressions
2013-07-01 12:35:32 -07:00
Robin Appelman
492c0571a0 fix detection of public upload in filelist.js 2013-07-01 15:47:40 +02:00
Morris Jobke
b19033b353 Merge pull request #3223 from owncloud/fix-2820
if rename of file fails, the rename is undone in the view - fix 2820
2013-07-01 01:28:17 -07:00
Bart Visscher
e3df2b8c87 Merge pull request #1044 from owncloud/fix_extra_slash
Remove duplicate / for first folder in root
2013-06-28 12:00:35 -07:00
Bart Visscher
89dc8be9f5 update to !== 2013-06-28 21:00:09 +02:00
Roman Geber
da0caadf4e Added file-upload to GIT repo
Optimized CSS identifiers
2013-06-26 22:51:38 +02:00
Roman Geber
ddb0ff346d Public upload feature 2013-06-25 12:24:14 +02:00
Robin Appelman
6778a45d45 use json to encode user list 2013-06-19 15:02:18 +02:00
Robin Appelman
85585ede02 allow scanning files for multiple users 2013-06-19 01:26:08 +02:00
Morris Jobke
e0547a25ab if rename of file fails, the rename is undone in the view - #fix 2820
Changes:
 * OC.dialog -> OC.Notification
 * Added test
 * Fixed OC.Notification.show() issue for queued items
 * Highlight failed item and show notification
2013-06-15 09:58:27 +02:00
Jan-Christoph Borchardt
0872f641dd darker low threshold color for file size and age fading, better contrast 2013-06-11 14:30:13 +02:00
davidak
56006ea852 small typo fix: added 2 whitespaces 2013-05-24 14:31:06 +02:00
Jörn Friedrich Dreyer
591b383f2d peselect filename without extension on rename 2013-05-13 15:54:45 +02:00
Robin Appelman
3de40f7cfb Files: set the proper mimetype when creating a new text file 2013-05-06 17:55:22 +02:00
Lukas Reschke
3a6e39b990 It's a class 2013-04-28 23:28:41 +02:00
Lukas Reschke
6cf6103ed2 Move onclick handler 2013-04-28 23:25:58 +02:00
Lukas Reschke
1ee224d8cb Merge pull request #3108 from owncloud/fileactions-order
Files: fix the order fileactions are computed for a file
2013-04-24 10:55:38 -07:00
Morris Jobke
637dd685db fix wrong shared icon description
fix #2928

translation of string "Shared" has to be marked as located in "files" for the translation extractor
2013-04-24 16:13:17 +02:00
Robin Appelman
ab7fcebeb3 Files: fix the order fileactions are computed for a file 2013-04-24 15:26:36 +02:00
Robin Appelman
1507d1ef26 Files: Fix XSS when creating dropshadow 2013-04-22 21:55:54 +02:00
Bart Visscher
802a5a331b Fix displaying spinner on delete 2013-04-19 13:46:11 +02:00
Bart Visscher
6d6dfffea7 Merge pull request #2279 from owncloud/refactor_upload_js
Refactor upload js
2013-04-06 15:44:08 -07:00
kondou
de2e546617 Translate 'Error' in core 2013-04-06 16:52:55 +02:00
root
74b02db337 Fixed things in alert-messages
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
2013-04-05 01:56:32 +02:00
Jörn Friedrich Dreyer
7ecbaef16c use css browser switch instead of deprecated jquery browser detection 2013-03-28 19:13:37 +01:00
Jörn Friedrich Dreyer
dac875eb9c '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly 2013-03-28 18:50:49 +01:00
Jörn Friedrich Dreyer
e31d74037a use local variable to walk DOM only once 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
868d7b956d use === to compare empty string '' 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
831b7ca803 don't update progress bar in ie < 10 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
c1a944a655 return created table row, use as context in fileupload events 2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer
4dd4167f80 refactor files.js, make proper use of fileupload events 2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer
df31ee5a90 Merge pull request #2575 from owncloud/fixing-1461-master
Fix upload progressbar in IE8 and IE9
2013-03-28 10:01:39 -07:00
Thomas Mueller
586a47b186 fixes #1463 - file size is now displayed correctly in IE8 2013-03-26 21:28:01 +01:00
Thomas Mueller
cf50e67e1b prevent to fire delete ajax a second time.
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
2013-03-26 16:27:56 +01:00
Thomas Mueller
e0e5cb73bf fixes #1461 2013-03-26 14:14:30 +01:00
Björn Schießle
d121180d46 Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download
let public link download handle json encoded file lists [master]
2013-03-26 01:56:47 -07:00
Björn Schießle
e5f40ddaae only prevent shared action for the Shared folder in the root dir 2013-03-13 11:33:20 +01:00
Björn Schießle
f971ce0b66 let public link download handle json encoded file lists 2013-03-13 11:15:17 +01:00
Björn Schießle
b2da2f769a don't add share action to the Shared folder 2013-03-12 17:28:36 +01:00
Björn Schießle
4a4f705adc json encode list of files 2013-03-07 14:15:02 +01:00
Michael Gapczynski
0488968443 Merge pull request #2034 from owncloud/fix_bug47
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
Georg Ehrke
ff9476b3e3 fix oc#47 2013-03-01 18:30:25 +01:00
Bernhard Posselt
1d83d76b45 fixed bug that prevented a newly created file to be opened with registered files actions 2013-02-25 17:50:17 +01:00
Björn Schießle
3ef8c0bda3 Merge pull request #1892 from owncloud/files_remove_row_on_delete
delete table row if file was deleted instead of just hide it
2013-02-25 07:44:35 -08:00
Björn Schießle
dbf2bfc8cd delete table row if file was deleted instead of just hide it 2013-02-25 16:32:54 +01:00
Jörn Friedrich Dreyer
664e7a3fc2 use distance option to delay dragging in sane browsers 2013-02-25 15:08:14 +01:00
Thomas Müller
7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465
Fix 1465
2013-02-25 04:34:13 -08:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Jörn Friedrich Dreyer
0dd7fd0599 IE8 does not support window.onclick 2013-02-21 17:38:25 +01:00
Bernhard Posselt
3b9d9eea09 replaced for in loops with normal enumerating loops to fix #1803 2013-02-20 21:57:50 +01:00
VicDeo
fde0a8b520 Add Ability to the app to detect more details on the file 2013-02-18 13:22:43 +03:00
Thomas Mueller
a03d70209f fixing undefined originalEvent 2013-02-14 12:19:50 +01:00
Robin Appelman
37ea784294 Files: always show share action at the right
Fixes #1619
2013-02-11 16:09:04 +01:00
Jörn Friedrich Dreyer
855c9480b7 only encodeURIComponent once 2013-02-09 13:07:52 +01:00
Michael Gapczynski
e928a342c4 Check if extra / is necessary for the folder URL 2013-02-09 13:07:52 +01:00
Bernhard Posselt
ab4ae2b952 Merge pull request #1560 from owncloud/fix_replacing
remove (comment out) old code to fix replacing of files
2013-02-09 03:28:40 -08:00
Björn Schießle
ca243f3fac Merge pull request #1521 from schiesbn/label_fixed
don't call the delete button unshare, unshare operation no longer available
2013-02-09 03:14:25 -08:00
Georg Ehrke
8961e675c7 remove (comment out) old code to fix replacing of files 2013-02-09 11:28:13 +01:00
Jörn Friedrich Dreyer
5a15221910 Merge pull request #1550 from owncloud/fix-files-download-links
Fix files router download links
2013-02-09 01:28:25 -08:00
Jörn Friedrich Dreyer
bf4a073dca count divs in actions instead of action div itself (is set to 100%) 2013-02-10 12:38:16 +01:00
Jörn Friedrich Dreyer
676f89bbdb extract common code 2013-02-09 14:42:03 +01:00
Jörn Friedrich Dreyer
0c73cae77b Merge pull request #1565 from owncloud/fix_replacing
remove code properly to make @DeepDiver1975 happy ;)
2013-02-09 03:58:06 -08:00
Georg Ehrke
2137bbe330 remove code properly 2013-02-09 12:38:40 +01:00
Bart Visscher
ed1dc3e064 Fix files router download links 2013-02-08 22:05:13 +01:00
Thomas Müller
ce8fc20e0b remove unused code 2013-02-08 18:04:27 +01:00
Thomas Müller
1d3c1328fa remove undefined function FileList.finishDelete 2013-02-08 15:51:28 +01:00
Björn Schießle
c72537cd85 don't call the delete button unshare, unshare operation no longer available 2013-02-07 12:42:09 +01:00
Björn Schießle
e2516a2b65 allow to delete single files from the trash bin permanently 2013-02-06 16:23:22 +01:00
Thomas Müller
04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Thomas Mueller
b1da1db0eb Merge branch 'master' into from_live_to_on
Conflicts:
	apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Thomas Mueller
c1072d0c09 call ajax scan only if a user is logged in - otherwise we'll get a 500 2013-01-31 23:26:40 +01:00
Robin Appelman
5417e44b2a Files: fix moving files by DnD 2013-01-31 17:56:44 +01:00
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
263c3f3a42 attach on to filelist instead of individual td elements for file link behaviour 2013-01-30 17:10:40 +01:00
Jörn Friedrich Dreyer
22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Björn Schießle
9ca0a93847 make spinner title translatable 2013-01-30 16:20:13 +01:00
Björn Schießle
1592764a60 show a spinner instead of the delete button while moving files to the trash bin 2013-01-30 14:32:20 +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
d10e137939 icons added; empty trash bin message added 2013-01-29 10:03:04 +01:00
Robin Appelman
74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Björn Schießle
320233ec3d merge conflict fixed 2013-01-28 15:10:00 +01: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
Lukas Reschke
2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +01:00
Thomas Müller
276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
2013-01-26 04:15:40 -08:00
Björn Schießle
367aadb3b7 rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view 2013-01-22 18:34:59 +01:00
Björn Schießle
16ae902e31 no undo notification for deleted file, we use the trash bin instead 2013-01-22 17:43:46 +01:00
Björn Schießle
1817c7895b allow to look into deleted directories 2013-01-22 15:33:54 +01:00
Björn Schießle
8259768732 introduce option to disable download action 2013-01-22 15:33:53 +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
Lukas Reschke
8223117569 Remove closing tag 2013-01-21 22:29:27 +01:00
Lukas Reschke
0d02caa684 No inline JS in apps 2013-01-21 20:34:28 +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
94068e5d08 Cache: show upgrade progress 2013-01-15 18:13:50 +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
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
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
Robin Appelman
a5dcbc3d8a Files: prevent people from renaming files to '.' 2013-01-05 03:30:05 +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
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
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
373b69d835 Merge pull request #974 from owncloud/fixing-120-master
setting the timezone is now part of the login process
2012-12-20 04:02:22 -08:00
Bart Visscher
8e44404ae0 Merge pull request #925 from owncloud/fix_issue_918
Trigger the last action before continuing with a file upload
2012-12-20 03:30:50 -08:00
Thomas Müller
a1bf6b54e6 remove timezone.js 2012-12-20 11:14:21 +01:00
Jan-Christoph Borchardt
5107ccbeda move CSS from JS to CSS 2012-12-20 10:53:50 +01:00
Thomas Müller
d085fdf8ea Merge pull request #842 from owncloud/restrict_keyboard_shortcuts
prevent keyboardshortcuts from catching events outside the main doc - e....
2012-12-17 07:38:53 -08: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
Michael Gapczynski
2607c565b0 Trigger the last action before continuing with a file upload, fixes issue #918 2012-12-16 16:19:51 -05:00
Robin Appelman
946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher
6ff38624a7 Merge pull request #875 from owncloud/multiplefiles_json
use json when deleting multiply files instead of using ; as delimiter
2012-12-14 16:26:09 -08:00
Robin Appelman
1443d6c3ef fix mimetype icons for new files 2012-12-13 22:31:43 +01:00
Robin Appelman
fda7d932ef remove unneeded line 2012-12-13 22:12:27 +01:00
Jan-Christoph Borchardt
e0ada2c24f bring back fixed multiselect bar so it’s visible when scrolled down, fix #746 2012-12-13 19:44:55 +01:00
Robin Appelman
6a2b41e5e8 use json encoding when deleting multiply files instead of using ; as delimiter 2012-12-13 18:11:00 +01:00
Thomas Mueller
e8897c2b7e prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup 2012-12-12 12:55:29 +01:00
Robin Appelman
7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +01:00
Jörn Friedrich Dreyer
80d8ca24ec fix svg -> png replacement for android, cleanup and remove obsolete css 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
8cf1e560bb add IE9 CSS checkbox fixes 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
810e02099e upload button HTML, CSS & JS cleanup 2012-12-07 15:32:24 +01:00
Thomas Müller
380db4a29e Merge pull request #640 from esthepiking/master
Keyboard Shortcuts
2012-12-06 13:42:14 -08:00
Erik Sargent
f0213735fc Code clean up 2012-12-05 08:23:28 -07:00
Erik Sargent
93208d0fe9 Remove rename 2012-12-04 09:40:17 -07:00
Erik Sargent
47fa3a8fe0 event.ctrlKey 2012-11-30 10:11:25 -07:00
Erik Sargent
5d13b0533d event.ctrlKey 2012-11-30 10:10:00 -07:00
Erik Sargent
2160663309 ctrl issue fix 2012-11-30 08:43:24 -07:00
Erik Sargent
6060d063a9 Cleanup 2012-11-29 16:52:41 -07:00
Robin Appelman
d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Erik Sargent
b6e3460871 documentation 2012-11-29 10:21:20 -07:00
Erik Sargent
fd4aecf525 cleanup 2012-11-29 10:18:34 -07:00
Erik Sargent
dafe028c11 Rename 2012-11-28 21:00:11 -07:00
Erik Sargent
a73a263543 Enter 2012-11-28 19:58:42 -07:00
Erik Sargent
8802dac02a Arrow key navigation 2012-11-28 17:32:05 -07:00
Erik Sargent
8722d3751c Keys array 2012-11-28 10:36:54 -07:00
Erik Sargent
b78dc3f48a keycode naming 2012-11-28 10:22:20 -07:00
Erik Sargent
0c6b53c25e no message 2012-11-28 09:55:38 -07:00
Erik Sargent
fa858d7149 initial setup 2012-11-28 09:50:54 -07:00
Erik Sargent
ccb9bb4be0 initial setup 2012-11-28 09:50:49 -07:00
Jörn Friedrich Dreyer
9a441d3e3a show drag shadow in firefox by using helper:'clone' 2012-11-27 17:38:21 +01:00
Arthur Schiwon
776be8d9f7 all but the first parameter are introduced by & 2012-11-26 14:34:28 +01:00
Robin Appelman
555dec2d92 merge master into filesystem 2012-11-23 16:20:56 +01:00
Thomas Müller
b5b7a67f8a Merge pull request #480 from owncloud/fix_435_and_437
Also reject names with \ in the name
2012-11-23 03:05:52 -08:00
Thomas Müller
97ed467224 Merge pull request #418 from libasys/Fix-IE8-fileactions-binding
Fixes two issues if you using IE8. IE8 has problems with .bind actions a...
2012-11-23 02:16:21 -08:00
Robin Appelman
95057e727d merge master into filesystem 2012-11-23 00:40:58 +01:00
Robin Appelman
8fb4dfd2ea use background scanner 2012-11-23 00:20:46 +01:00
Jörn Friedrich Dreyer
a81d7cd79f introduce Files.containsInvalidCharacters(), use when creating or renaming files 2012-11-22 13:03:17 +01:00
Thomas Mueller
cd495bf9ba some more invalid characters have been added 2012-11-22 11:52:05 +01:00
Bart Visscher
1793e85a52 Also reject names with \ in the name
fixes issues #435 and #437
2012-11-22 11:52:05 +01:00
blizzz
d4ec77e08b Merge pull request #482 from eMerzh/fix_prevent_shared_folder
Show error message to prevent adding a shared folder in the root dir fix...
2012-11-22 02:40:23 -08:00
Brice Maron
02bc440900 Show error message to prevent adding a shared folder in the root dir fix #468 2012-11-16 14:59:14 +00:00
Thomas Mueller
4a3b5125cf adding comments on the form array indexes 2012-11-16 11:58:33 +01:00
Thomas Mueller
7af4cf48c9 refs #461 - drag'n'drop upload to a sub folder is working now 2012-11-16 10:23:40 +01:00
Björn Schießle
8a93cc14f6 port of approved pull request #442 - 'Always set renaming to false, also if renaming was aborted, to finalize the operation and show the file actions again.' 2012-11-15 17:16:18 +01:00
libasys
eda9ce4cf8 Fixes two issues if you using IE8. IE8 has problems with .bind actions and since jquery 1.7.2 using .bind is old school style for event delegation. the new and better way is using .on() function. The second is using $.each instead of for() to walkthrough an array! Now it works perfect, the events after uploads are triggered. 2012-11-14 16:05:24 +01:00
icewind1991
66dfe270c6 Merge pull request #319 from owncloud/fileactions_newfile
Add fileactions to new files and folders
2012-11-12 14:57:06 -08:00
Jörn Friedrich Dreyer
bbef5b377e add i18n for cancel button 2012-11-12 10:52:28 +01:00
Georg Ehrke
84084b9430 Merge pull request #261 from owncloud/fix_opera_file_delete
fix file delete in opera - fixes #188
2012-11-08 08:55:19 -08:00
Robin Appelman
37fe9800b6 add actions to newly created files and folders
closes #231
2012-11-07 22:13:52 +01:00
Robin Appelman
42935c5564 reuse jquery object when adding files to the file list 2012-11-07 22:06:05 +01:00
Robin Appelman
e14054610f Revert "fix blocking drag & drop upload of folders"
Fixes #150

This reverts commit 5b2f3c7f72.
2012-11-07 21:59:18 +01:00
Björn Schießle
7b51a4e5f9 Merge pull request #306 from owncloud/crumb_drop_fix
extract the right file name for drag&drop.
2012-11-07 05:46:18 -08:00
Björn Schießle
168a2c7b6b get the right file name for drag&drop. This was necessary after the switch to css to show/hide file actions, otherwise the actions where part of the extracted file name. 2012-11-07 14:10:10 +01:00
Alessandro Cosentino
50dbb30eb9 Moved relative_modified_date from file/js to core/js 2012-11-06 10:56:42 -05:00
Georg Ehrke
bb0164c9fc fix file delete in opera - fixes #188 2012-11-05 18:42:44 +01:00
Robin Appelman
34fee8afaa remove debug statements 2012-11-05 13:52:02 +01:00
Robin Appelman
4f32f49fb1 this line shouldn't be here 2012-11-04 21:00:36 +01:00
Robin Appelman
f187aa6c93 some more code reuse for fileactions
also fixes an issue where some fileactions always worked on the last file in the list
2012-11-04 20:48:38 +01:00
Michael Gapczynski
60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Robin Appelman
0fbb99690b properly replace fileaction icons with pngs when needed 2012-10-28 16:03:52 +01:00
Robin Appelman
fe6b987b3d use css to show/hide fileactions 2012-10-28 12:47:42 +01:00