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
|
dfae77dec1
|
Add notifications and undo support for replacing files when renaming
|
2012-07-30 12:22:11 -04:00 |
Jenkins for ownCloud
|
3430dcd367
|
[tx-robot] updated from transifex
|
2012-07-30 02:05:41 +02:00 |
|
Michael Gapczynski
|
e18639551d
|
Tweak appearance of undo delete notification
|
2012-07-29 18:02:08 -04:00 |
|
Jenkins for ownCloud
|
18f6552a08
|
[tx-robot] updated from transifex
|
2012-07-29 02:06:29 +02:00 |
|
Michael Gapczynski
|
e02d8d7f7e
|
Remove delete tipsy if file is deleted, fixes bug oc-958
|
2012-07-27 21:28:41 -04:00 |
|
Jenkins for ownCloud
|
0a9c33e151
|
[tx-robot] updated from transifex
|
2012-07-27 02:04:26 +02:00 |
|
Jenkins for ownCloud
|
ba0ea21074
|
[tx-robot] updated from transifex
|
2012-07-26 08:04:12 +02:00 |
|
Jenkins for ownCloud
|
42c22bee36
|
[tx-robot] updated from transifex
|
2012-07-26 08:03:10 +02:00 |
|
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
|
6f58eca534
|
Change read only check to isCreatable
|
2012-07-24 21:35:03 -04:00 |
|
Michael Gapczynski
|
b58e72cdb2
|
Alert user of errors when creating new files or folders
|
2012-07-23 22:35:34 -04:00 |
Bjoern Schiessle
|
bd63fddbf4
|
fix broken properties in the database
|
2012-07-23 10:34:01 +02:00 |
|
Bjoern Schiessle
|
708c771296
|
update routine to fix broken file properties in db
|
2012-07-23 10:25:26 +02:00 |
Robin Appelman
|
b1010160b3
|
CSRF protection for eventsource
|
2012-07-22 16:37:49 +02:00 |
|
Robin Appelman
|
a49c07cf88
|
progressbar for New->From Url
|
2012-07-22 03:56:51 +02:00 |
|
Robin Appelman
|
59ab8b14c7
|
cache fileid's in oc_cache
|
2012-07-22 03:24:34 +02:00 |
|
Robin Appelman
|
b45d3ced79
|
fix remote and public.php
|
2012-07-13 22:44:35 +02:00 |
Lukas Reschke
|
c3fea30811
|
Sanitizing file names
|
2012-07-11 19:14:04 +02:00 |
|
Michael Gapczynski
|
0b14b4e3e8
|
Call exit() to prevent further code execution if directory does not exist
|
2012-07-11 02:33:11 +02:00 |
Jörn Friedrich Dreyer
|
e59a1806cf
|
remove superfluous ?> at the end of .php files (left out apps/*/templates)
|
2012-07-09 16:51:16 +02:00 |
|
Lukas Reschke
|
0abcf0a421
|
CSRF checks
|
2012-07-07 15:58:11 +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
|
cd005e6c62
|
use new sanitizeHTML() function
|
2012-06-21 10:28:43 +02:00 |
|
Robin Appelman
|
bf2062b09d
|
write_close the session when scanning files or music
|
2012-06-16 01:35:39 +02:00 |
|
Robin Appelman
|
f06c08a637
|
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
|
2012-06-15 19:56:15 +02:00 |
Thomas Tanghus
|
8f6121ffa8
|
Files: Double encode download links. Fix for oc-1016.
|
2012-06-15 15:57:04 +02:00 |
Michael Gapczynski
|
b5889d6ffe
|
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
|
2012-06-13 15:17:46 -04: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
|
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 |
|
Bjoern Schiessle
|
b38ce8adfd
|
committed patch (bug #967) to add missing translations for file actions
|
2012-06-12 11:39:03 +02:00 |
|
Lukas Reschke
|
6defbc7f4d
|
Removed some unessecary sanitizations
|
2012-06-11 19:20:48 +02:00 |
|
Lukas Reschke
|
2b22c538c8
|
Make some apps compatible
|
2012-06-11 19:07:51 +02:00 |
|
Lukas Reschke
|
c009bc4b87
|
Revert
|
2012-06-11 13:27:32 +02:00 |
|
Lukas Reschke
|
6817a6b102
|
First try of implementing assignHTML
|
2012-06-11 12:45:07 +02:00 |
|
Bjoern Schiessle
|
c960e42a17
|
fixed var name, $filename should be $foldername
|
2012-06-06 18:08:51 +02:00 |
|
Robin Appelman
|
f7d221f5f0
|
update translations
|
2012-06-06 00:29:28 +02:00 |
|
Robin Appelman
|
a3c1f70be4
|
dont show config option for file upload size if we cant write the new value
|
2012-06-06 00:24:15 +02:00 |
|
Robin Appelman
|
e6c4e53486
|
prevent creating files with a / the name
|
2012-06-06 00:02:51 +02:00 |
Bart Visscher
|
4a5973662c
|
Merge branch 'unstable'
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
|
2012-06-04 23:02:05 +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 |
Frank Karlitschek
|
83c6714c72
|
don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something
|
2012-06-01 11:12:50 +02:00 |
|
Frank Karlitschek
|
baae4c741d
|
fix the breadcrumb
|
2012-05-31 21:44:05 +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 |
|
Bart Visscher
|
a33f580db1
|
Remove OC_App::register function
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
|
2012-05-31 13:01:30 +02:00 |
|
Frank Karlitschek
|
a945fa10a6
|
update copyright
|
2012-05-26 19:14:24 +02:00 |
Brice Maron
|
9c2a6fb551
|
Add HEAD request management for files ajax/download.php
|
2012-05-24 22:48:10 +00: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 |