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 |
Robin Appelman
|
d9ef6da2e4
|
code style
|
2012-10-28 12:47:42 +01:00 |
Bart Visscher
|
939b51e46f
|
Fix download url generation
|
2012-10-27 15:10:21 +02:00 |
Bart Visscher
|
0120f3fd62
|
Merge branch 'routing'
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
|
2012-10-27 11:58:02 +02:00 |
Thomas Müller
|
e4c0bb59e5
|
Merge pull request #39 from scambra/date-l10n-fixes
Date l10n fixes
|
2012-10-18 08:09:58 -07:00 |
Jörn Friedrich Dreyer
|
e307bf31c8
|
fix oc-605
|
2012-10-18 14:19:34 +02:00 |
Bart Visscher
|
6081bfa2bc
|
Merge branch 'master' into routing
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
|
2012-10-17 16:38:11 +02:00 |
scambra
|
c814a7a841
|
use interpolation for some translations in js
|
2012-10-16 20:53:31 +02:00 |
scambra
|
5ecce8bfb7
|
Translate modification date when file is created/uploaded, use same strings as lib/template.php
|
2012-10-16 20:25:11 +02:00 |
Bart Visscher
|
4af5b016cc
|
Whitespace cleanup
|
2012-10-14 21:04:08 +02:00 |
Robin Appelman
|
5b2f3c7f72
|
fix blocking drag & drop upload of folders
|
2012-10-12 15:30:16 +02:00 |
Lukas Reschke
|
e5f2d46c6f
|
Sanitize user input
|
2012-10-12 14:10:05 +02:00 |
Björn Schießle
|
32e2d7ef8f
|
check if ID was assigned
|
2012-10-08 17:47:02 +02:00 |
Björn Schießle
|
2923d24921
|
add data-id directly after upload/creation to the file list (bugfix for #1917)
|
2012-10-08 17:30:35 +02:00 |
Björn Schießle
|
4dba91838f
|
add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views.
|
2012-10-08 10:28:29 +02:00 |
Michael Gapczynski
|
4b446f3edd
|
Revert part of 5beca59b , fixes file upload bug oc-1926
|
2012-10-07 17:17:37 -04:00 |
Björn Schießle
|
5e2bce24b4
|
enable user to download selected files from publically shared directory
|
2012-10-05 16:12:04 +02:00 |
Björn Schießle
|
5beca59b9c
|
check if element really exists before calling it. (e.g. for public shared files view, elements like "navigation" doesn't exist)
|
2012-10-05 10:32:38 +02:00 |
Björn Schießle
|
92b37119e3
|
remove textbox after pressing "enter" even if the name is the same
|
2012-10-02 18:38:17 +02:00 |
Bart Visscher
|
c9317b5a68
|
Merge branch 'master' into routing
|
2012-09-28 21:41:21 +02:00 |
Bart Visscher
|
4e2f575938
|
Correctly fix oc-1016 and fix downloading of files
|
2012-09-28 21:18:20 +02:00 |
Bart Visscher
|
bf1057143c
|
Merge branch 'master' into routing
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
|
2012-09-28 15:38:49 +02:00 |
Robin Appelman
|
cfbca40fbe
|
fix sharing for newly uploaded or created files
|
2012-09-26 13:25:11 +02:00 |
Robin Appelman
|
a22a5d6807
|
some js style fixes
|
2012-09-23 03:16:52 +02:00 |
Thomas Müller
|
d5055639b2
|
Merge pull request #15 from scambra/delete-fixes
use post to delete files, get has a limit and fails with many files
|
2012-09-21 16:11:11 -07:00 |
scambra
|
107b641708
|
translate rename and history actions
|
2012-09-21 12:30:13 +02:00 |
icewind1991
|
4ea128ee43
|
Merge pull request #13 from scambra/safari-fixes
fix js success callback on safari when uploading files
|
2012-09-20 02:24:27 -07:00 |
scambra
|
1b411df83e
|
use post to delete files, get has a limit and fails with many files
|
2012-09-20 08:28:35 +02:00 |
scambra
|
aee8949c92
|
fix js success callback on safari when uploading files
|
2012-09-20 08:02:55 +02:00 |
Björn Schießle
|
223bf3e47c
|
fix for bug #1752 (Renaming of folders in files view does not work correctly in firefox 15)
|
2012-09-19 14:05:09 +02:00 |
Björn Schießle
|
c199c4ad67
|
Merge branch 'master' of github.com:owncloud/core
|
2012-09-19 12:03:58 +02:00 |
Björn Schießle
|
6596094a28
|
add generated unique file name to the uploadingFiles list instead of the original name
|
2012-09-19 12:02:36 +02:00 |
Björn Schießle
|
1e880feab1
|
execute lastAction() before add new one
|
2012-09-19 11:56:31 +02:00 |
Tom Needham
|
8a74a39c42
|
Fix oc-1769, renaming folders with extensions
|
2012-09-18 22:08:34 +00:00 |
Tom Needham
|
597fed4fde
|
Fix oc-1726, cannot delete multiple files one by one without refresh
|
2012-09-17 15:29:15 +00:00 |
Thomas Müller
|
21bffbfb69
|
Enhanced space handling - thx fmms
|
2012-09-17 11:14:44 +03:00 |
Thomas Müller
|
7a7d2a06b3
|
Adding a few more string to translation
|
2012-09-17 10:54:06 +03:00 |
Robin Appelman
|
7da3492ab5
|
show the size of new files when using New->From Url
|
2012-09-16 17:05:08 +02:00 |
Bart Visscher
|
5eba579827
|
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
|
2012-09-07 15:51:44 +02:00 |
Michael Gapczynski
|
73d726d1b2
|
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
|
2012-09-07 00:02:22 -04:00 |
Michael Gapczynski
|
d936590f77
|
Don't pass content for a new text file from UI, fixes bug oc-1660
|
2012-09-06 16:01:51 -04:00 |
Michael Gapczynski
|
837eb1871d
|
Don't delete the file anymore to replace it in the UI, just overwrite it
|
2012-09-05 22:13:50 -04:00 |
Michael Gapczynski
|
a5211e31bc
|
Add permissions to new files/folders, bug fix for oc-1649
|
2012-09-05 21:47:09 -04:00 |