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 |
jfd
|
ede464f058
|
escape all identifiers with backticks
|
2012-07-31 18:53:05 +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
|
519eb39422
|
Remove delete tipsy if file is deleted, fixes bug oc-958
|
2012-07-30 10:07:19 -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 |
Bart Visscher
|
896d27de36
|
Chunked upload: Support reusing local chunks
|
2012-07-27 19:35:33 +02: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
|
73734c98e0
|
- remove namespace from file property name (webdav)
- update script to fix broken properties in the database
|
2012-07-23 11:00:37 +02: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 |
Lukas Reschke
|
38271ded75
|
Added CSRF checks
|
2012-07-20 20:12:36 +02:00 |
|
Robin Appelman
|
b45d3ced79
|
fix remote and public.php
|
2012-07-13 22:44:35 +02:00 |
|
Lukas Reschke
|
d203fa2c50
|
Sanitizing file names
|
2012-07-11 19:15:11 +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
|
5c6a7172ca
|
Files: Double encode download links. Fix for oc-1016.
|
2012-06-15 15:58:10 +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
|
635a2f8ec9
|
Label the delete operation "unshare" for files in the "Shared" folder to reduce
confusion about the operation.
|
2012-06-12 16:32:00 +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
|
ef6b6ac230
|
block slashes only for new files and new folders but not for file upload from url (bug #964)
|
2012-06-12 14:16:09 +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
|
4501407283
|
committed patch (bug #967) to add missing translations for file actions
|
2012-06-12 11:41:13 +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
|
bb07c20bf4
|
fixed var name, $filename should be $foldername
|
2012-06-06 18:11:23 +02:00 |
|
Bjoern Schiessle
|
c960e42a17
|
fixed var name, $filename should be $foldername
|
2012-06-06 18:08:51 +02:00 |
|
Robin Appelman
|
f1b10fcc93
|
update translations
|
2012-06-06 00:29:44 +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
|
063c9accb6
|
prevent creating files with a / the name
|
2012-06-06 00:04:02 +02:00 |
|
Robin Appelman
|
e6c4e53486
|
prevent creating files with a / the name
|
2012-06-06 00:02:51 +02:00 |
Arthur Schiwon
|
769d94ab26
|
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
|
2012-06-05 14:14:26 +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
|
c8f670dfab
|
Don't allow user to delete, rename and re-share the "Shared" directory
|
2012-06-04 14:00:35 +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
|
8ed13e627e
|
don´t do warnings.
Not sure if this start_session call is really needed here.
|
2012-06-01 11:08:40 +02:00 |
|
Frank Karlitschek
|
baae4c741d
|
fix the breadcrumb
|
2012-05-31 21:44:05 +02:00 |
|
Frank Karlitschek
|
670022cc8a
|
fix the breadcrumb
|
2012-05-31 21:43:07 +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
|
2774ff1ad8
|
Add HEAD request management for files ajax/download.php
|
2012-05-25 11:19:38 +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 |
|
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
|
5a48ade933
|
Make sure sharing and versions dropdowns come down in the same location for all files
|
2012-05-19 11:24:23 -04:00 |
|
Arthur Schiwon
|
e606213fa0
|
make upload work with IE again
|
2012-05-18 17:07:00 +02:00 |
|
Frank Karlitschek
|
9e73524168
|
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
|
2012-05-18 16:06:57 +02:00 |
|
Michael Gapczynski
|
cbfbbe672c
|
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
apps/files/templates/index.php
|
2012-05-17 15:38:28 -04:00 |
|
Robin Appelman
|
ac8bfc218e
|
update translations
|
2012-05-17 00:36:21 +02:00 |
|
Arthur Schiwon
|
fbc2892083
|
try to remove deprecated files from /files on update
|
2012-05-16 15:59:36 +02:00 |
|
Michael Gapczynski
|
6673375eeb
|
No multiple file sharing in this next release, sharing UI isn't ready for it :(
|
2012-05-15 11:45:59 -04:00 |
Sam Tuke
|
2ad6b5048e
|
fixed 'delete' label so it doesn't break translations
|
2012-05-15 16:24:06 +01:00 |
|
Michael Gapczynski
|
568b6a7f56
|
Make only writable files draggable
|
2012-05-14 20:41:06 -04:00 |
|
Thomas Mueller
|
583dce5276
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
|
Robin Appelman
|
6779f28af4
|
cache app types during install or update
|
2012-05-14 22:49:31 +02:00 |
|
Michael Gapczynski
|
e03c5f39a8
|
Call is_writable explicitly on folders for readonly check
|
2012-05-14 16:31:00 -04:00 |
|
Robin Appelman
|
e7c106d91e
|
selective app loading for remote/public
|
2012-05-14 00:28:28 +02:00 |
|
Robin Appelman
|
ee0294bbb1
|
update translations
|
2012-05-13 20:00:34 +02:00 |
Bartek Przybylski
|
ab9927d5fc
|
oc-627, calling base function instead of loading too much useless functions
|
2012-05-12 13:25:04 +02:00 |
|
Robin Appelman
|
736739bbbd
|
load remote and public paths from info.xml during upgrade instead of setting them every time
|
2012-05-11 20:33:56 +02:00 |
Jan-Christoph Borchardt
|
d1e5a56bc6
|
fixing upload icon color
|
2012-05-10 21:40:22 +02:00 |
|
Jan-Christoph Borchardt
|
e3f452cf53
|
larger clickable area for new button
|
2012-05-10 14:08:08 +00:00 |
|
Jan-Christoph Borchardt
|
2ae37b32d4
|
fixing background for clicked new button
|
2012-05-10 13:44:30 +00:00 |
Jan-Christoph Borchardt
|
8fc565821f
|
reduced text shadow brightness
|
2012-05-10 13:37:48 +00:00 |
|
Jan-Christoph Borchardt
|
46b1f35107
|
highlight the files new and upload button all the time
|
2012-05-10 13:34:44 +00:00 |
Vitaly Kuznetsov
|
6f981738bb
|
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
|
2012-05-10 09:10:53 +00:00 |
|
Brice Maron
|
de6aa0f88c
|
Use a clean uri param constructor to get files
|
2012-05-09 21:35:59 +00:00 |
|
Robin Appelman
|
588b51d88a
|
update translations
|
2012-05-09 12:41:01 +02:00 |
|
Brice Maron
|
fae1ce4ea7
|
Correct file move by dropping on folder
|
2012-05-08 22:07:14 +00:00 |
|
Arthur Schiwon
|
e9c7ecf22d
|
applying coding guideline
|
2012-05-07 17:35:23 +02:00 |
|
Arthur Schiwon
|
0ff5ab65be
|
applying coding guideline
|
2012-05-07 17:35:23 +02:00 |
Georg Ehrke
|
936c8ba1cc
|
improve remote.php and create public.php
|
2012-05-07 15:39:17 +02:00 |
|
Georg Ehrke
|
1138df0f4b
|
fix webdav, bloody merge conflicts
|
2012-05-07 12:47:34 +02:00 |
|
Georg Ehrke
|
46fe2e3e2a
|
fix merge conflicts
|
2012-05-07 11:47:14 +02:00 |
|
Frank Karlitschek
|
1945cd6946
|
ported the oc_template class
|
2012-05-06 23:00:36 +02:00 |
|
Bart Visscher
|
f69f764e8b
|
Working remote.php with webdav and caldav
|
2012-05-06 00:12:51 +02:00 |
|
Georg Ehrke
|
c996600786
|
push changes
|
2012-05-05 22:54:14 +02:00 |
|
Georg Ehrke
|
6c2fc0cbe8
|
fix writing of webdav.php
|
2012-05-05 20:43:11 +02:00 |
|
Georg Ehrke
|
101406eba7
|
fix writing in remote folder
|
2012-05-05 18:29:26 +02:00 |
|
Robin Appelman
|
d875191777
|
only emit the filesystem hooks once when creating a new file
|
2012-05-05 16:49:48 +02:00 |
|
Thomas Tanghus
|
2296521a2e
|
Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116
|
2012-05-04 11:16:29 +02:00 |
|
Frank Karlitschek
|
97a8af7f25
|
ported oc_db
|
2012-05-03 13:06:08 +02:00 |
|
Frank Karlitschek
|
43caa3b3b9
|
ported oc_json
|
2012-05-03 12:23:29 +02:00 |
|
Frank Karlitschek
|
351740601a
|
port oc_response
|
2012-05-03 10:46:27 +02:00 |
|
Frank Karlitschek
|
eec7c3833c
|
fix install
|
2012-05-02 19:02:41 +02:00 |
|
Georg Ehrke
|
33c343ed11
|
add require_once('../lib/base.php'); to webdav.php
|
2012-05-02 16:47:25 +02:00 |
|
Georg Ehrke
|
da03d05700
|
create folder 'remote' for the remote services like caldav, carddav and webdav
|
2012-05-02 16:41:23 +02:00 |
|
Frank Karlitschek
|
8e99475886
|
first part of the config stuff
|
2012-05-02 13:28:56 +02:00 |
|
Frank Karlitschek
|
8c7f854671
|
move all the files stuff into a files class
|
2012-05-02 12:54:31 +02:00 |
|
Arthur Schiwon
|
6750998984
|
files is not internal any more, part II
|
2012-05-02 11:26:22 +02:00 |
|
Frank Karlitschek
|
2fe646dcec
|
ported the oc_app calls
|
2012-05-02 00:50:26 +02:00 |
|
Frank Karlitschek
|
93b63cf375
|
ported the rest of the OC_Helper calls
|
2012-05-02 00:20:45 +02:00 |
|
Frank Karlitschek
|
e48f511606
|
port linkto and serverHost
|
2012-05-01 23:19:39 +02:00 |
|
Frank Karlitschek
|
31e32e3c10
|
ported checkLoggedIn and checkAdmin
|
2012-05-01 22:59:38 +02:00 |
|
Frank Karlitschek
|
e2fb094693
|
some more porting
|
2012-05-01 21:07:08 +02:00 |
|
Frank Karlitschek
|
1a2bbd2ee4
|
ported addSyript and other small stuff
|
2012-05-01 20:03:41 +02:00 |
|
Frank Karlitschek
|
e8ec999090
|
port to use the new public api
|
2012-05-01 09:49:22 +02:00 |
|
Thomas Tanghus
|
9c520c70a8
|
Various file path fixes.
|
2012-04-30 01:48:01 +02:00 |
Frank Karlitschek
|
0d0129221b
|
add a info.xml to files
|
2012-04-29 21:17:22 +02:00 |
|
Robin Appelman
|
84bd83b1dc
|
fix file deletion
|
2012-04-29 16:09:41 +02:00 |
|
Jan-Christoph Borchardt
|
afeb9d9cbf
|
moving the file actions properly
|
2012-04-28 23:11:48 +02:00 |
|
Georg Ehrke
|
bef701c448
|
add version file to files app
|
2012-04-28 13:35:05 +02:00 |
|
Bartek Przybylski
|
72c0d6968e
|
fix duplicated entries on upload
|
2012-04-27 22:48:27 +02:00 |
|
Georg Ehrke
|
5fda0e4b3b
|
make *DAV work with movable apps
|
2012-04-26 21:56:29 +02:00 |
|
Georg Ehrke
|
78b2da583d
|
move files to the correct place
|
2012-04-26 21:24:41 +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
|
3f64eb25ab
|
some fixes fore movable apps
|
2012-04-26 14:52:55 +02:00 |
|
Frank Karlitschek
|
b462795be2
|
added a nice API to get the installes Apps with names, urls and icon from the outside.
This is useful for some nice upcoming desktop and mobile integration
|
2012-05-05 23:42:38 +02:00 |
|
Bart Visscher
|
f991948a71
|
Fix loading by apptype in webdav
|
2012-05-05 21:58:10 +02:00 |
|
Georg Ehrke
|
42a570788b
|
Merge branch 'master' into movable_apps
|
2012-04-23 19:56:07 +02:00 |
|
Georg Ehrke
|
3b9d283245
|
fix path in apps/files/templats/index.php
|
2012-04-23 16:25:07 +02:00 |
|
Georg Ehrke
|
c0df15367f
|
fix style.css of the files app
|
2012-04-23 16:18:15 +02:00 |
|
Georg Ehrke
|
08fe6bdb27
|
fix path in /apps/files/js/timezone.php
|
2012-04-23 16:17:35 +02:00 |
|
Georg Ehrke
|
4c2cf35050
|
fix merge conflicts
|
2012-04-22 13:19:12 +02:00 |
|
Georg Ehrke
|
711aa229b8
|
Merge branch 'master' into movable_apps
|
2012-04-20 22:41:39 +02:00 |
|
Georg Ehrke
|
c3d78cf77a
|
remove require once lib base in files scan.php
|
2012-04-20 22:34:13 +02:00 |
|
Georg Ehrke
|
b44bc9f4b2
|
remove require once lib base in some more files
|
2012-04-18 17:42:11 +02:00 |
|
Georg Ehrke
|
45de7ad221
|
move files to app folder
|
2012-04-18 17:27:34 +02:00 |