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 |
|
Bart Visscher
|
4af5b016cc
|
Whitespace cleanup
|
2012-10-14 21:04:08 +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
|
92b37119e3
|
remove textbox after pressing "enter" even if the name is the same
|
2012-10-02 18:38:17 +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
|
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
|
1b411df83e
|
use post to delete files, get has a limit and fails with many files
|
2012-09-20 08:28:35 +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
|
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 |
|
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
|
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 |
|
Michael Gapczynski
|
a26ea6d65c
|
Implement support for replacing files during upload with the actions: replace, suggest name, and cancel
|
2012-09-05 00:12:25 -04:00 |
|
Bart Visscher
|
f188f6cc2f
|
Fix some jslint warnings
|
2012-09-04 21:27:37 +02:00 |
|
Bart Visscher
|
cbaf858dea
|
Merge remote-tracking branch 'gitorious/master' into routing
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
|
2012-08-29 20:16:39 +02:00 |
Juan Carlos Cornejo
|
0944b4455b
|
Moves the lastAction=null outside the if so it can include the undo requests from replace
|
2012-08-22 17:08:10 -04:00 |
|
Juan Carlos Cornejo
|
24a207a8fa
|
Fixes a bug where if one tries to delete a file, then clicks undo, and then tries to delete the file again, no questions or undo options were presented.
Essentially, just set FileLists.lastAction = null when one clicks undo.
|
2012-08-22 16:56:00 -04:00 |
Arthur Schiwon
|
ef3eebfd3e
|
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534.
|
2012-08-20 17:24:10 +02:00 |
|
Bart Visscher
|
ddfb9de147
|
Fix linkTo calls for new routing
|
2012-08-15 18:16:06 +02:00 |
|
Michael Gapczynski
|
dfae77dec1
|
Add notifications and undo support for replacing files when renaming
|
2012-07-30 12:22:11 -04:00 |
|
Michael Gapczynski
|
e18639551d
|
Tweak appearance of undo delete notification
|
2012-07-29 18:02:08 -04:00 |
|
Lukas Reschke
|
c3fea30811
|
Sanitizing file names
|
2012-07-11 19:14:04 +02:00 |
|
Arthur Schiwon
|
3db28d7616
|
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
|
2012-05-31 19:46:51 +02:00 |
|
Robin Appelman
|
84bd83b1dc
|
fix file deletion
|
2012-04-29 16:09:41 +02:00 |
Georg Ehrke
|
2b10371bde
|
fix merge conflicts
|
2012-04-26 18:08:49 +02:00 |
|
Georg Ehrke
|
45de7ad221
|
move files to app folder
|
2012-04-18 17:27:34 +02:00 |