wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9501 commits 157 branches 562 tags 714 MiB
Commit graph

244 commits

Author SHA1 Message Date
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