Michael Gapczynski
|
30b58f5677
|
Merge branch 'master' into share_api
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
|
2012-07-25 17:08:18 -04:00 |
|
Michael Gapczynski
|
4d17ed2f71
|
Make file actions permissions aware
|
2012-07-25 16:33:08 -04:00 |
|
Michael Gapczynski
|
b58e72cdb2
|
Alert user of errors when creating new files or folders
|
2012-07-23 22:35:34 -04:00 |
Robin Appelman
|
a49c07cf88
|
progressbar for New->From Url
|
2012-07-22 03:56:51 +02:00 |
Bjoern Schiessle
|
b95996c02c
|
- when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
- don't allow renaming if a file/directory with the name already exists
|
2012-06-29 15:23:04 +02:00 |
|
Bjoern Schiessle
|
f6e7c633a0
|
block slashes only for new files and new folders but not for file upload from url (bug #964)
|
2012-06-12 14:11:28 +02:00 |
|
Robin Appelman
|
e6c4e53486
|
prevent creating files with a / the name
|
2012-06-06 00:02:51 +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 |
Brice Maron
|
5fa14806c8
|
Add translation for error message
|
2012-05-24 19:16:00 +00:00 |
|
Brice Maron
|
2c9311cf48
|
Add error message when uploading folder or null files. ref oc-739
|
2012-05-24 18:47:34 +00:00 |
|
Brice Maron
|
f00a50c76a
|
Add pending line in file list before trying to upload. Correct indentation
|
2012-05-24 16:56:19 +00:00 |
Michael Gapczynski
|
568b6a7f56
|
Make only writable files draggable
|
2012-05-14 20:41:06 -04:00 |
|
Brice Maron
|
de6aa0f88c
|
Use a clean uri param constructor to get files
|
2012-05-09 21:35:59 +00:00 |
|
Brice Maron
|
fae1ce4ea7
|
Correct file move by dropping on folder
|
2012-05-08 22:07:14 +00: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 |