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 |