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
9e4c3b8342
Remove break, it broke the statuses :)
2012-07-31 14:21:46 -04:00
795e78809f
add oracle to install & setup
2012-07-31 19:34:30 +02:00
ede464f058
escape all identifiers with backticks
2012-07-31 18:53:05 +02:00
aa60771736
4.0.6
2012-07-31 10:13:10 +02:00
2f1a990cad
Add search, limit, and offset parameters to getUsers() and getGroups()
2012-07-30 20:20:46 -04:00
8a92cd21d6
Remove OC_App::register call in OCP\App::register
2012-07-30 21:26:14 +02:00
b9bd54bd98
Add additional error handling for emailing private links
2012-07-30 10:07:20 -04:00
6b83470c96
Fix incorrect copy/paste for file_put_contents()
2012-07-30 10:07:19 -04:00
93c75f46e5
Forgot data parameter for file_put_contents() streams pre proxies
2012-07-30 10:07:19 -04:00
ea18d70c60
Run pre and post proxies for file_put_contents() streams
...
Conflicts:
lib/filesystemview.php
2012-07-30 10:07:19 -04:00
f328f53ec1
Fix filesystem hash, no longer using basicOperation()
...
Conflicts:
lib/filesystemview.php
2012-07-30 10:07:19 -04:00
099b16350f
Delete old session files, suggested by Torben Nehmer, see bug oc-736
2012-07-30 10:07:19 -04:00
89027545a0
Check if user is already logged in for DAV auth, instead of logging in and creating new sessions for every request
2012-07-30 10:07:18 -04:00
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
5262cde6a6
Add additional error handling for emailing private links
2012-07-29 18:02:09 -04:00
0836366d87
Methods to disable and enable users
2012-07-29 16:07:51 +00:00
18f6552a08
[tx-robot] updated from transifex
2012-07-29 02:06:29 +02:00
fa4052d6f1
[tx-robot] updated from transifex
2012-07-28 02:05:38 +02:00
896d27de36
Chunked upload: Support reusing local chunks
2012-07-27 19:35:33 +02:00
1ea33ff36b
Chunked upload: Refactor OC_FileChunking to object
2012-07-27 19:35:28 +02:00
2d85ef0e04
Chunked upload: Refactor to static class
2012-07-27 19:32:44 +02:00
4c822df28d
Fix incorrect copy/paste for file_put_contents()
2012-07-27 09:37:47 -04:00
a7a5433108
Merge branch 'master' into chunked_upload
...
Conflicts:
lib/connector/sabre/directory.php
2012-07-27 11:40:51 +02:00
ea2e76eecc
Forgot data parameter for file_put_contents() streams pre proxies
2012-07-26 23:10:21 -04:00
d006a551f4
Run pre and post proxies for file_put_contents() streams
2012-07-26 22:53:55 -04:00
16928f4d59
fix spelling fail
2012-07-26 18:50:59 +02:00
d26f87e738
Smarter remove of etag properties for path
2012-07-26 17:56:32 +02:00
3725cd079b
Fix oc-1362: post_rename has no path param but newpath and oldpath
2012-07-26 17:41:57 +02:00
e1d14ab461
Merge branch 'master' into subadmin
2012-07-26 16:47:05 +02:00
e4679770c4
declare OCP\App::register as deprecated
2012-07-26 15:16:07 +02:00
4e62e121a6
mark OCP\App::register as deprecated
2012-07-26 15:12:57 +02:00
586fe8f940
Change is_writable() call to isUpdatable()
2012-07-25 17:39:28 -04:00
783d67be62
Create uniqid ETag for directories
2012-07-25 23:09:03 +02:00
381e493a8c
Rename functions
...
getETagPropertyForFile -> getETagPropertyForPath
removeETagPropertyForFile -> removeETagPropertyForPath
2012-07-25 23:09:03 +02:00
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
f25ccaff59
Fix filesystem hash, no longer using basicOperation()
2012-07-25 16:55:01 -04:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
eefe6882f9
method not used externally, thus not needed in interface
2012-07-25 12:56:09 +02:00
6b320a2604
provide recursiveArraySearch as Helper function and make available through API
2012-07-25 12:56:08 +02:00
57c375ea24
Support for OCA namespace
2012-07-25 12:56:08 +02:00
81c0ca4ffb
remove only internally used function from interface
2012-07-25 12:56:08 +02:00
0196e6eada
Offer User and Group interfaces in public API
2012-07-25 12:56:08 +02:00
e499bc37c8
define an interface for the Group Backend
2012-07-25 12:56:08 +02:00
fdcbc23ed6
define an interface for the User Backend
2012-07-25 12:56:07 +02:00
ede2b8a55f
Missed a is_readable() call in local filestorage
2012-07-24 21:17:43 -04:00
f7b89f0475
Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
2012-07-24 20:10:28 -04:00
d28be8de64
add the calls for the new keyserver. Still not connectect to the encryption system
2012-07-24 15:18:52 +02:00
856d9c0b54
some indention fixes
2012-07-24 00:39:59 +02:00
e49666d36b
add option to clear user backends
2012-07-23 22:31:48 +02:00
21631be2ff
make it generic and implement a dummy call for quota set
2012-07-23 19:43:28 +02:00
e7e1f234dd
first part of the new new OCS CLOUD module. So far only quota is implemented.
...
The specification is developed here:
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD
will be moved to
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services
as soon as everything is done.
2012-07-23 18:34:21 +02:00
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
bd63fddbf4
fix broken properties in the database
2012-07-23 10:34:01 +02:00
c0e37c7d69
quick fix for broken properties
2012-07-23 10:25:35 +02:00
9e70f64d44
Fix oc-1163: gzdecode function not always defined
...
This function is only found in newer php versions
2012-07-22 17:27:30 +02:00
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
59ab8b14c7
cache fileid's in oc_cache
2012-07-22 03:24:34 +02:00
6843beeae9
add option to only get fast cache
2012-07-22 03:21:20 +02:00
51566e87c7
add prefix option to OC_Cache::clear
2012-07-22 02:31:48 +02:00
2b74778958
add method to OC_Cache to check whether a fast cache (apc/xdebug/etc) is available
2012-07-22 02:23:24 +02:00
2a73678fef
use file extension for determining mimetypes on default
...
should be more reliable for files that "look like" other types based on their magic numbers such as odf and docx files
also a lot faster then the old way
2012-07-22 01:53:20 +02:00
0eade1b0d5
Code style. One down...
2012-07-21 22:00:27 +02:00
f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
11725efd7e
add some hooks for subadmins
2012-07-21 16:43:39 +02:00
5508a95065
Merge branch 'master' into subadmin
2012-07-21 13:14:52 +02:00
5381cc7418
Fix missing parameter decleration, thanks Jenkins :-)
2012-07-21 01:18:51 +02:00
8a19e134df
fix ununsed variables
2012-07-21 00:20:27 +02:00
aa118a4c64
remove obsolete oc_filesystem::mountall
2012-07-21 00:20:26 +02:00
0b338a7a41
Add missing public to function definition
2012-07-21 00:13:30 +02:00
14af503374
Fix parameter order in OC_Filestorage_Common->hash
2012-07-21 00:13:30 +02:00
cdd9ffc8a5
Add ETag support to the Sabre file connector.
...
This is based on the md5 of the file, can be changed later
2012-07-21 00:13:30 +02:00
53bdb049cb
adapted to new SabreDav version
2012-07-20 23:31:08 +02:00
0af454a23b
Trying to get documentation to "Do The Right Thing" (TM)
2012-07-20 23:11:06 +02:00
29d16f61fa
Fix strict standards warnings
2012-07-20 19:27:51 +00:00
de8ed98541
Added some more documentation to OCP\JSON.
2012-07-20 21:20:51 +02:00
10337c059c
Added some documentation for OCP\JSON::callCheck()
2012-07-20 20:15:39 +02:00
d393638cc8
forgot to make one function abstract
2012-07-20 19:03:33 +02:00
c9be9ab251
remove unused variables
2012-07-20 18:56:18 +02:00
7152b8b4ee
remove unused and depricated getFolderSize
2012-07-20 18:32:40 +02:00
39086ef63e
dont try to create mountpoints automatically
2012-07-20 17:58:06 +02:00
48306a3c4f
fix unused variables
2012-07-20 17:58:05 +02:00
0e111e1a17
fix increasing folder sizes in filecache for custom roots
2012-07-20 17:58:05 +02:00
57ed83f266
fix eventsource fallback when more then one eventsource is active
2012-07-20 17:58:05 +02:00
fdb167a046
Merge branch 'master' into subadmin
2012-07-20 17:20:14 +02:00
445f52ef8b
dont check for filecache updates when getting quota info over webdav
2012-07-20 16:35:51 +02:00
ea79ff191c
Merge branch 'master' into subadmin
2012-07-20 15:22:12 +02:00
98e769d269
dont use the mtimes stored in zip archives since they dont update correctly
2012-07-20 00:52:10 +02:00
abb9f52dd7
add isGroupAccessible in OC_SubAdmin
2012-07-19 19:17:01 +02:00
e52ab59b40
Revert "use readfile() instead iof fopen() for file download over webdav."
...
This reverts commit 9af74a9c80
2012-07-19 18:13:10 +02:00
05bc541276
add some doc for lib/subadmin.php
2012-07-19 16:43:46 +02:00
33b8de91ea
allow a more flexible way of using user backends
2012-07-19 16:31:55 +02:00
6e139f16e4
add isUserAccessible method to OC_SubAdmin class
2012-07-19 16:30:58 +02:00
10bf36a6ae
4.0.5
2012-07-19 09:10:18 +02:00
a5bebb86a5
add checkSubAdminUser method to OC_JSON class
2012-07-18 17:11:09 +02:00
f0c82686fd
Merge branch 'master' into subadmin
2012-07-18 00:04:17 +02:00
f047fdbfaa
revert to using fopen for webdav instead of readfile
2012-07-16 19:58:05 +02:00
ccb1c57745
add warning in log if OC_L10N::tA was called
2012-07-16 19:35:40 +02:00
72ebc2a32a
Delete old session files, suggested by Torben Nehmer, see bug oc-736
2012-07-15 15:22:31 -04:00
b1a7826d56
Check if user is already logged in for DAV auth, instead of logging in and creating new sessions for every request
2012-07-15 15:17:27 -04:00
d49b789348
Merge branch 'master' into calendar_import
2012-07-15 16:56:38 +02:00
4700222ea9
Merge branch 'master' into subadmin
2012-07-15 16:33:17 +02:00
e707e94857
subadmins can now add users
2012-07-15 16:31:28 +02:00
1ff2dd8f63
Listen to post_deleteUser, post_addToGroup, and post_removeFromGroup hooks
2012-07-14 14:06:57 -04:00
cc6c940b9a
Implement post_removeFromGroup()
2012-07-14 11:55:22 -04:00
82dea705d4
Add option to delete() to check the owner of the first search of reshares
2012-07-14 11:53:02 -04:00
0e9ab5cf2a
Fix post_deleteUser(), column name changed and item_source is no longer needed
2012-07-14 11:02:16 -04:00
459bcd8d5e
Update documentation
2012-07-14 10:55:34 -04:00
bbbfc2c565
Fix delete(), it was going in an infinite loop
2012-07-14 10:52:31 -04:00
8de69fcb18
Update documentation
2012-07-14 10:19:18 -04:00
51a4518396
Add support for CRUDS permissions
2012-07-14 09:35:39 -04:00
b45d3ced79
fix remote and public.php
2012-07-13 22:44:35 +02:00
967c6d7d3c
allow command line based installation/setup
2012-07-13 13:25:43 +02:00
80ed5412f1
if the '/Shared' was the modified directory, than scan it.
2012-07-13 11:57:14 +02:00
f638340d1f
Add check for folder item type as well
2012-07-12 14:29:51 -04:00
63b6f20e05
Move already shared with check out of user and group cases, and add check for already shared with inside a collection
2012-07-12 12:11:04 -04:00
ecae3ea430
Rename parents to collectionTypes, getCollectionItemTypes() shouldn't include the original item type
2012-07-12 12:10:50 -04:00
bdcfa4bb63
Add check if file is found in file cache
2012-07-11 20:43:48 -04:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
632fc6ec61
Fix log write() parameters in wrong order
2012-07-11 19:38:57 -04:00
ac5abc5603
Handling exceptions
2012-07-11 19:38:57 -04:00
e887fd7ba8
Catch exceptions from PHPMailer
2012-07-11 19:38:57 -04:00
71491612e3
Move line counter so we only count lines towards the offset that are equal or above the log level
2012-07-11 19:38:56 -04:00
bc3462f022
Improvements and bug fix for log reading, fixes bug oc-982
2012-07-11 19:38:56 -04:00
281bf62af9
Fix log write() parameters in wrong order
2012-07-11 15:56:18 -04:00
8afcddf44f
Handling exceptions
2012-07-11 21:52:51 +02:00
66da0a2151
Catch exceptions from PHPMailer
2012-07-11 15:36:27 -04:00
ccb5e99395
Generate random token for private links (more entropy than past private links)
2012-07-11 12:18:59 -04:00
9af74a9c80
use readfile() instead iof fopen() for file download over webdav.
...
fopen() didn't work for large files on some servers while readfile()
seems to work for all files on all configurations.
2012-07-11 12:04:20 +02:00
0cb9f5e159
fix merge conflicts
2012-07-11 10:50:18 +02:00
5575493900
Merge branch 'master' into calendar_import
2012-07-11 10:47:30 +02:00
a7416b1cd8
Add back returning only the item if the limit is 1 and now check that the format is set to none
2012-07-10 21:30:16 -04:00
c21ff29a53
Fix getItems() calls
2012-07-10 21:29:34 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
e7a0c4f0bb
use readfile() instead iof fopen() for file download over webdav.
...
fopen() didn't work for large files on some servers while readfile()
seems to work for all files on all configurations.
2012-07-10 19:22:06 +02:00
570ea787f1
fixed typo
2012-07-10 16:58:37 +02:00
3e53bf4a86
Fix for oc-972, oc-1144 and oc-1191
2012-07-10 16:58:37 +02:00
b470869114
when checking for updates in the filecache, explicitly state that we are querying a folder
2012-07-10 14:42:15 +02:00
d0b625352c
some work on subadmins
2012-07-09 21:51:19 +02:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
82a57f0ce3
revert performance improvements in userExists() because it breaks new user creation
2012-07-09 10:31:50 +02:00
7d41d3aba8
webdav ssl cleanup
2012-07-09 09:40:33 +02:00
6116dc6b65
Added default parameter $reset to allow for incremental rescan.
2012-07-09 00:14:42 +02:00
e8010209bb
Custom chunking support
2012-07-08 22:11:36 +02:00
b46d3019ca
Uninitialized variable
2012-07-07 15:52:49 +02:00
ec7bb86b28
Fixes a problem with the user creation ("User already existed" even if the user don't exists.) Thanks to Phil Reinhardt for pointing this out.
2012-07-07 15:00:02 +02:00
f955e5e9b2
Move line counter so we only count lines towards the offset that are equal or above the log level
2012-07-06 17:29:45 -04:00
466d7c0d99
Improvements and bug fix for log reading, fixes bug oc-982
2012-07-06 15:51:01 -04:00
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
ba8dee0520
introduce subclassed client.php and revert changes to 3rdparty
2012-07-06 12:26:54 +02:00
9a10efd80f
Merge branch 'master' into calendar_import
2012-07-06 11:01:12 +02:00
5bf050b13b
moved performance improvement from isLoggedIn() to userExists() to avoid webdav problems
2012-07-05 15:55:46 +02:00
c067930856
Merge branch 'master' into subadmin
2012-07-05 11:32:59 +02:00
aa95cf2c98
Merge branch 'master' into calendar_import
2012-07-05 11:30:37 +02:00
280c59e914
More helpfull debug msg for redirectToDefaultPage
2012-07-04 17:51:07 +02:00
621b83df72
Remove referer check, this is unreliable. The header doesnt need te exist, or can be wrong
2012-07-04 17:51:07 +02:00
657eef354a
Merge branch 'master' into calendar_import
2012-07-04 13:03:30 +02:00
3b09aa8578
Correct Postgresql connection with space in password. Work around php bug
2012-07-04 10:13:00 +00:00
f98bd1ad66
Merge branch 'master' into calendar_import
2012-07-03 22:35:46 +02:00
96dea9507a
Return false for single item checks and an empty array for multiple item checks
2012-07-03 14:03:04 -04:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
aec6eea235
use filesystem abstraction layer to copy file versions
2012-07-03 18:25:49 +02:00
4185bd6292
Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app
2012-07-03 11:11:01 -04:00
641e77327e
Merge branch 'master' into calendar_import
2012-07-03 16:48:30 +02:00
4bc9e4e012
wrong var name fixed
2012-07-03 16:43:57 +02:00
cfcfdd674e
Merge branch 'master' into calendar_import
2012-07-03 13:43:52 +02:00
8a1c279183
Escape pg connection string on setup
2012-07-03 09:20:42 +02:00
77b582e4e6
Change getItems() return to a 3-dimensional array to handle multiple shares of the same item
2012-07-02 15:29:34 -04:00
52822652bc
provide multibyte aware helper functions mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling with UTF 8
2012-07-02 20:31:19 +02:00
dd56416a39
Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead
2012-07-02 14:23:13 -04:00
90331a3fa1
Remove forced download
2012-07-02 12:20:43 +02:00
0465129eba
Remove the forced download§
2012-07-02 12:19:48 +02:00
47bad20132
Restoring stable4...
2012-07-02 10:47:45 +02:00
e29681e233
Applying the fix
2012-07-02 10:29:04 +02:00
5223724809
Wrong file - Sorry!
2012-07-02 10:28:11 +02:00
f8cebed348
Don't display error messages
2012-07-02 10:24:22 +02:00
e4960c3bb4
fix a small PHP fail
2012-07-02 10:23:32 +02:00
4235ce0b63
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-07-02 10:22:33 +02:00
134d5d93c8
Don't display error messages
2012-07-02 10:21:38 +02:00
8b5cae3c6c
fix a small PHP fail
2012-07-01 21:50:53 +02:00
fa7d4c2b39
Disable mimesniffing
2012-07-01 13:53:06 +02:00
4e63981da9
Disable mimesniffing
2012-07-01 13:45:20 +02:00
3e8a34f906
Don't select all columns for FORMAT_STATUSES
2012-06-30 21:15:10 -04:00
c073216d8d
Don't overwrite the item variable when checking if the item is already shared
2012-06-30 20:57:31 -04:00
b2cb7d54d1
Fixed app path
2012-06-30 22:56:47 +00:00
cfc78d44bb
Return correct json response, fix syntax
2012-06-30 22:56:47 +00:00
75c111a33b
Have getItems() return an empty array instead of false, so apps only need to do an array_merge()
2012-06-30 18:00:01 -04:00
7a649fc65a
Switch back to registering just the class and not the object, better for performance
2012-06-30 17:25:21 -04:00
4890bbb30d
Merge branch 'master' into calendar_import
2012-06-30 22:08:36 +02:00
4ed55315e7
fixed linkTo()
2012-06-30 16:53:41 +02:00
246894243a
Merge branch 'master' into calendar_import
2012-06-29 21:46:09 +02:00
94add1c000
typo fixed
2012-06-29 16:49:22 +02:00
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
1ccbbfad53
Spelling fix
2012-06-28 22:11:04 +02:00
bf09edcbf1
Remember the app root information.
2012-06-28 22:11:04 +02:00
19bb4e83c9
Remove redundant code from OC_Helper::linkTo
2012-06-28 22:11:04 +02:00
b2cbf1199d
Pg setup enhancement
...
do not create a db if already existing .. and reset the user password instead of creating if the user already exists
2012-06-28 19:38:03 +00:00
45e964c7aa
Return login errors for PostgreSQL setup
2012-06-27 20:25:46 -04:00
81953e7bb5
Return login errors for PostgreSQL setup
2012-06-27 20:24:06 -04:00
7284e57c91
Migration: fix app paths
2012-06-27 20:43:33 +00:00
Michael Gapczynski
Jörn Friedrich Dreyer
jfd
Frank Karlitschek
Jakob Sack
Jenkins for ownCloud
Tom Needham
Bart Visscher
Georg Ehrke
Arthur Schiwon
Robin Appelman
Bjoern Schiessle
Thomas Tanghus
Lukas Reschke
Johannes Willnecker
Brice Maron
Florian Hülsmann