Bart Visscher
|
939b51e46f
|
Fix download url generation
|
2012-10-27 15:10:21 +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 |
scambra
|
107b641708
|
translate rename and history actions
|
2012-09-21 12:30:13 +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 |
|
Bart Visscher
|
9329af921d
|
Add missing ; to js code
|
2012-09-05 22:26:09 +02:00 |
|
Bart Visscher
|
f188f6cc2f
|
Fix some jslint warnings
|
2012-09-04 21:27:37 +02:00 |
Jörn Friedrich Dreyer
|
ca8120e9f4
|
unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share
|
2012-08-31 01:11:10 +02:00 |
|
Jörn Friedrich Dreyer
|
3ba27e624f
|
unify permissions (2/3): change apps to use OC::PERMISSION_X
|
2012-08-31 01:11:10 +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 |
|
Michael Gapczynski
|
0c4575db7a
|
Temporary fix to prevent rename action in root of Shared directory
|
2012-08-24 15:12:16 -04:00 |
|
Bart Visscher
|
ddfb9de147
|
Fix linkTo calls for new routing
|
2012-08-15 18:16:06 +02:00 |
|
Michael Gapczynski
|
94ce8f2168
|
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
|
2012-07-31 15:00:04 -04:00 |
|
Michael Gapczynski
|
e02d8d7f7e
|
Remove delete tipsy if file is deleted, fixes bug oc-958
|
2012-07-27 21:28:41 -04:00 |
|
Michael Gapczynski
|
4d17ed2f71
|
Make file actions permissions aware
|
2012-07-25 16:33:08 -04:00 |
Thomas Tanghus
|
8f6121ffa8
|
Files: Double encode download links. Fix for oc-1016.
|
2012-06-15 15:57:04 +02:00 |
Bjoern Schiessle
|
8626f04f5d
|
Label the delete operation "unshare" for files in the "Shared" folder to reduce
confusion about the operation.
|
2012-06-12 16:27:24 +02:00 |
|
Bjoern Schiessle
|
b38ce8adfd
|
committed patch (bug #967) to add missing translations for file actions
|
2012-06-12 11:39:03 +02:00 |
|
Bjoern Schiessle
|
2d80c148ba
|
Don't allow user to delete, rename and re-share the "Shared" directory
|
2012-06-04 10:42:09 +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 |
Georg Ehrke
|
2b10371bde
|
fix merge conflicts
|
2012-04-26 18:08:49 +02:00 |
|
Georg Ehrke
|
40f95ffdf3
|
fix security check for the path of the requested file
|
2012-04-26 17:55:00 +02:00 |
|
Georg Ehrke
|
0249a72cab
|
fix downloading of files in files app
|
2012-04-26 17:35:12 +02:00 |
|
Georg Ehrke
|
45de7ad221
|
move files to app folder
|
2012-04-18 17:27:34 +02:00 |