4cf328e3b9
Don't return links for shared files if disabled
2013-10-18 10:34:30 +02:00
f9bbfad3e5
Fix sharing error message - id -> file name
...
fixe #2827
2013-10-17 16:45:11 +02:00
30f4d91d01
Public API documentation fixes
...
refs #4883
* http/response.php
* config.php
* response.php
* files.php
* idbconnection.php
* app.php
* user.php
* template.php
* share.php
* db.php
* icache.php & il10n.php
2013-10-17 00:49:15 +02:00
221a650815
Merge branch 'master' into activities-api
...
Conflicts:
lib/private/server.php
2013-10-16 21:15:25 +02:00
fdeef5e874
Merge branch 'master' into fixing-appframework-master
...
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
c3f7d22adc
Merge pull request #5067 from owncloud/urlParams_fix
...
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
852a50aa89
remove test code
2013-10-16 15:38:56 +02:00
8c2b0b1394
Merge branch 'master' into activities-api
2013-10-16 15:36:35 +02:00
dc58195c7f
Merge pull request #5207 from owncloud/fixing-4011-part2-master
...
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
d75d80ba13
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 10:07:57 +02:00
8e97752bf7
adding OC6 public API for activities
2013-10-09 18:06:21 +02:00
926b3c9b7b
Merge branch 'master' into activities-api
2013-10-09 17:53:57 +02:00
7fe493fdb8
make sure that we only find file/folder shares
2013-10-09 17:25:58 +02:00
053b55721d
Merge branch 'master' into fixing-appframework-master
2013-10-08 12:13:24 +02:00
b48dffa9a3
Merge pull request #5072 from owncloud/apache-auth-master
...
OC6 Apache Authentication
2013-10-07 06:29:56 -07:00
730c80ff9c
adding additional exceptions for special cases where creating a file might not be allowed
2013-10-07 15:11:47 +02:00
c3286402a8
removing log(), getTemplate(), getLocalFilePath(), getUrlContent(), getFileInfo()
2013-10-07 11:41:28 +02:00
39be4dca67
removing all link/url related calls from API class
2013-10-07 11:38:23 +02:00
3ea2dfa5f9
remove getTrans() from API class
2013-10-07 11:36:38 +02:00
aefea2a408
remove unused classes
2013-10-07 11:25:06 +02:00
e071bfc144
fixing SecurityMiddleware to use OC6 API
2013-10-07 00:33:54 +02:00
1f14ba6aed
move controller to OCP
2013-10-06 23:16:40 +02:00
381b76ebd0
Merge pull request #5144 from owncloud/public_middleware
...
Make abstract Middleware class public
2013-10-06 14:12:35 -07:00
47b2007228
Remove misleading IMiddleware interface
2013-10-05 19:13:12 +02:00
c85621a897
Make abstract Middleware class public
...
It doesn't make sense for subclasses to have to implement
all methods.
2013-10-05 16:59:06 +02:00
21cbef0d2c
passesCSRFCheck added to OCP\IRequest
2013-10-04 18:13:04 +02:00
61a9098b7d
Add Helper and URLGenerator interfaces to server container
2013-10-04 18:11:02 +02:00
9f777fba98
Add L10N interface to server container
2013-10-04 18:11:02 +02:00
bae121b16d
Merge pull request #5068 from owncloud/improved_request
...
Improved request
2013-10-04 09:05:20 -07:00
48a4c67d48
Merge pull request #5087 from owncloud/templatefunction-relativedate
...
Added dateOnly argument to relative_modified_date
2013-10-04 05:53:13 -07:00
f3594904c2
Removed $fromTime argument from public template API
2013-10-04 14:45:12 +02:00
006799616d
Fixed missing default values
...
Added default value for $fromTime to prevent missing argument errors and
keep backward compatible.
2013-10-03 14:21:41 +02:00
b0bb64c3ee
Added unit tests for relative_modified_date, changed method signature
...
Changed method signature of relative_modified_date template method to
make it possible to add a fromTime to compare with, mostly to make it
possible to test it.
Added unit test for date and time cases.
2013-10-03 13:55:05 +02:00
31e1c15db7
Added dateOnly argument to relative_modified_date
...
Improved the template function relative_modified_date by adding an
optional dateOnly argument which will output "today" or "yesterday" or
"x days ago".
2013-10-02 15:52:44 +02:00
4d4eda0f06
fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBackend
2013-10-02 15:03:52 +02:00
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
0d7c36c9f1
adding PHPDoc comment
2013-10-02 01:13:02 +02:00
0537960dcc
adding getCurrentUserId() to ApacheBackend
2013-10-01 22:56:47 +02:00
a2cabd4c2a
Remove getContent() from IRequest
2013-10-01 20:15:04 +02:00
973bcccd7c
Implement PUT an PATCH support
2013-10-01 20:13:13 +02:00
36d1156cf8
Add interface docs to IRequest.
2013-10-01 20:13:13 +02:00
8603f956ab
Get urlParams registered before Request is instantiated
2013-10-01 19:03:34 +02:00
d8ada370d7
Squashed commit of the following:
...
commit ae1f68ac54cf2878d265b2bbce13bd600d2d0719
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu Aug 22 11:45:27 2013 +0200
fixing undefined variable
commit 982f327ca10eea0a2222eae3e74210648591fd8a
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 12:00:14 2013 +0200
adding login.php as alternative for index.php/login
commit da0d7e1d096fb80789524b01f0f96fe08d147943
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 11:36:12 2013 +0200
adding a route for web login
commit 8e2a01160485cf7e9a2eb8bf46f06fae73956e8e
Author: Karl Beecher <karl@endocode.com>
Date: Tue Aug 6 17:00:28 2013 +0200
Login attempt returns true instead of exiting immediately
commit fd89d55de9e71e986e03a0de9aad9407b632e22f
Author: Karl Beecher <karl@endocode.com>
Date: Mon Aug 5 15:31:30 2013 +0200
Further abstraction.
This change introduces the ApacheBackend interface for backends that
depend on Apache authentication and session management. There are no
longer references to specific backends in OC_User.
commit 469cfd98aea5a37985722cf5f9e00ece0ce38178
Author: Karl Beecher <karl@endocode.com>
Date: Thu Aug 1 15:46:36 2013 +0200
Make login attempt function protected.
commit d803515f19ff086e2028fcaa51afae579685e596
Author: Karl Beecher <karl@endocode.com>
Date: Wed Jul 31 16:00:22 2013 +0200
Amends the login link
When using a Shibboleth login, clicking logout displays a message to the
user instead of ending the session.
commit aa8c1fcea05c8268f26a10b21c4e0bc547c3414f
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 13:15:59 2013 +0200
Abstract Shibboleth authentication into an Apache authentication method
commit 69082f2ebcab267f6e8eceb1a252f84c52236546
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 11:22:26 2013 +0200
Convert spaces -> tabs
commit 5a80861d86855eec5906fd5e235ac4ff12efb0f2
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:40:48 2013 +0200
Separate the authentication methods
SABRE authentication and base authentication have slightly different
workings right now. They should be refactored into a common method
later, but time pressure requires us to reinvent the wheel slightly.
commit dc20a9f8764b103b7d8c5b713f2bcdae18708b65
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:07:07 2013 +0200
Authenicate calls to WebDAV against Shibboleth.
When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is
normally called without trying the Shibboleth authentication... thus the
session is not established.
The method now tries Shib authentication, setting up a session if the
user has already authenticated.
commit 091e4861b2246c4084c9b30e232289fde4ba1abf
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 14:04:54 2013 +0200
Sets up the Shibboleth login attempt.
commit bae710ec0579ef99b23022cc12f6876c5fe6b0d5
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 12:36:44 2013 +0200
Add a method for attempting shibboleth login.
If the PHP_AUTH_USER and EPPN environment variables are set, attempt a
Shibboleth (passwordless) login.
commit 667d0710a7854e58fb109201d9cee6ec064e793a
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:38:04 2013 +0200
Revert "Adds the apps2 folder with user_shibboleth backend."
This reverts commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef.
commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:28:06 2013 +0200
Adds the apps2 folder with user_shibboleth backend.
Conflicts:
core/templates/layout.user.php
lib/base.php
2013-10-01 14:29:01 +02:00
029abc9c43
mail is already themable via the template, no need to provide additional string in OC_Defaults
2013-09-30 10:03:12 +02:00
48b5c1d5f9
initial implementation of activity manager
2013-09-29 20:31:12 +02:00
2e1e283592
Merge branch 'appframework-master' into activities-api
...
Conflicts:
lib/public/iservercontainer.php
2013-09-29 20:10:07 +02:00
687ba053b7
Merge branch 'master' into appframework-master
2013-09-27 14:25:47 +02:00
735608f513
Merge pull request #4207 from owncloud/search_shared_files
...
add initial search in shared files
2013-09-27 05:18:12 -07:00
469b309b21
Merge pull request #4892 from owncloud/vcategories_public
...
OC_VCategories => OC\Tags. Public interface and getter in server container
2013-09-25 14:24:37 -07:00
acd3c11e47
use OC_DB::executeAudited
2013-09-25 12:18:29 +02:00
5a9e473a79
use OC_DB::executeAudited
2013-09-25 12:15:46 +02:00
3cd0caa643
set default value for expire parameter
2013-09-25 12:15:30 +02:00
883d1c0df3
use template for txt and html mails to send notification mails
2013-09-25 11:51:28 +02:00
b168d5aa3b
class API decommissioning part 1
2013-09-25 11:05:24 +02:00
b2ef978d10
AppFramework:
...
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container
2013-09-25 10:30:48 +02:00
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
ca47fc5f18
fix PHPDoc
2013-09-24 19:37:24 +02:00
0637dad0b3
some small fixes
2013-09-24 18:52:20 +02:00
aaed871cee
Add factory class for the server container.
2013-09-24 17:10:01 +02:00
d101ff42f1
User: move checkPassword from User to Manager to not break API
2013-09-24 13:46:30 +02:00
cd2421c7ee
adding PHPDoc comments to getBackend
...
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
8c469394e6
Remove duplicate method definitions
2013-09-24 00:12:23 +02:00
698394c994
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-24 00:09:21 +02:00
4d3e7fa78a
Add getUserFolder/getAppFolder to Server.
2013-09-23 23:57:39 +02:00
1bbeb12e2e
Updated method names and added a few more tests.
2013-09-23 23:39:36 +02:00
45f73feb69
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-23 23:39:36 +02:00
437858852c
Merge pull request #4856 from owncloud/fix-link-expiration
...
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
* owncloud/fix-link-expiration:
Perform expiration date checking before returning share data for token.
Tests whether expired/valid link share is still accessible.
2013-09-23 15:12:38 +02:00
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
0c6dcdba6b
Add missing implements and fix parameters in IConfig
2013-09-20 22:45:22 +02:00
f83f323269
fixing typos + adding missing filed $activeEntry
2013-09-20 21:45:27 +02:00
e31f6c01e8
fixing PHPDoc
2013-09-20 21:43:17 +02:00
9116303cfc
fixing typos
2013-09-20 21:40:54 +02:00
e92abfd4d8
Add Config container class to server container
2013-09-20 20:21:24 +02:00
e3013c5801
Add Navigation class to server container
2013-09-20 20:20:01 +02:00
1b59003d6d
adding basic interfaces for the activities api
2013-09-20 16:37:52 +02:00
aa8a85f77d
Add DBConnection to server container
2013-09-20 14:33:45 +02:00
ac73ce1b2a
Add UserSession to server container
2013-09-20 14:32:43 +02:00
944e9b8c69
make sure that both $permissions and $oldPermissions have the same type
2013-09-20 12:40:21 +02:00
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
d5126dd6b4
Merge branch 'appframework-master' into server_folder_methods
2013-09-19 12:32:32 +02:00
1274d6116d
updating php docs
2013-09-18 22:22:51 +02:00
dd62ccdb4e
Merge branch 'appframework-master' into public_cache
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-18 13:20:07 +02:00
6ba23912a7
Add getUserFolder/getAppFolder to Server.
2013-09-18 12:34:10 +02:00
d3f88ceeb4
Add some docs to the sessions interface.
2013-09-18 12:01:01 +02:00
1a60aa2b6a
only remember password if the user changes the permissions, otherwise the user disabled the password protection
2013-09-18 11:49:02 +02:00
5bddb5377a
Purge session from Request - and fix some styles
2013-09-17 18:38:18 +02:00
5c19b995db
Add interface for Session and add getter in server container.
2013-09-17 18:31:14 +02:00
fe86182dac
OC_Cache namespace changes and add UserCache to server container.
...
Refs #4863
2013-09-17 17:46:33 +02:00
b9e943f5d5
fix naming
2013-09-17 09:42:14 +02:00
4cd0ee47a8
Merge branch 'master' into appframework-master
2013-09-17 09:39:45 +02:00
822daa8f8a
class files have to be lowercase
2013-09-17 00:27:22 +02:00
981a41e2cd
adding interface for middleware
2013-09-17 00:26:55 +02:00
a92d4c2c09
Perform expiration date checking before returning share data for token.
2013-09-16 21:24:17 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
eab84d3d96
Add OCP\DB::getErrorMessage() to public namespace.
2013-09-16 02:17:39 +02:00
af0069bf03
adding getRootFolder() to server container and hooking up the new files api
2013-09-15 22:24:57 +02:00
4480b0b164
Merge branch 'master' into appframework-master
2013-09-13 23:31:59 +02:00
4da8fc6907
Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master
2013-09-13 20:57:18 +02:00
5b3388c7c4
Merge branch 'master' into appframework-master
2013-09-13 20:56:49 +02:00
58ed78aa9e
cleanup public storage interface a bit
2013-09-12 21:58:32 +02:00
c9d2663159
Merge branch 'master' into fileapi-foreward
2013-09-12 21:43:35 +02:00
2e5ce091f0
add storage backend interface to public namespace
2013-09-10 20:13:47 +02:00
9ad7891b4e
improve phpdoc for the public files interface
2013-09-10 20:10:25 +02:00
e271a55783
move filesystem expceptions to global namespace
2013-09-10 19:44:23 +02:00
315344eb9c
move public files api to a clearer namespace
2013-09-10 19:34:38 +02:00
2e1b534957
update phpdoc for public fileapi
2013-09-06 20:55:47 +02:00
0131a32025
extract interfaces from fileapi for public namespace
2013-09-06 20:38:59 +02:00
b8241aa79d
remove some more debug output
2013-09-06 16:07:54 +02:00
edb78c917c
remove some error_logs
2013-09-06 16:07:45 +02:00
d33fabd02d
remove error logs
2013-09-06 16:07:25 +02:00
627b6164c4
if the files doesn't exist yet we start with the parent to search for shares
2013-09-06 16:07:07 +02:00
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
7618cf3005
adding public interface for preview
2013-09-04 23:45:11 +02:00
835f477d8f
Merge branch 'master' into appframework-master
2013-09-04 23:15:17 +02:00
931e90634e
fix db queries
2013-09-02 17:03:35 +02:00
983da0d78f
fix db queries
2013-09-02 17:01:10 +02:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
c54994d2e9
fixing this obvious typo directly
2013-09-01 08:23:11 +02:00
206f83941b
move new interfaces into lib/public and OCP
2013-08-31 21:34:29 +02:00
97bdf008b1
PHPDoc added to existing interfaces
2013-08-31 20:57:16 +02:00
ec9b7d1e84
fixing file header
2013-08-31 01:41:24 +02:00
4bbefdf608
add expiration date if it is already set
2013-08-30 17:20:10 +02:00
10cf1b3a4e
return mailSend status in getItems()
2013-08-30 15:39:43 +02:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
14b67d6c5f
fixing typo
2013-08-29 16:25:25 +02:00
21fd352c1a
as a quick example the public contacts API has been ported over as a service hosted within the server container
2013-08-26 23:48:18 +02:00
a995e81686
Merge branch 'master' into appframework-master
2013-08-26 21:31:15 +02:00
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
38f9df4293
introducing OCP\AppFramework\App
2013-08-21 01:02:15 +02:00
911bd3c16f
moving response classes over to OCP
2013-08-21 01:00:26 +02:00
e39083c36f
typo
2013-08-21 00:58:33 +02:00
ba029ef4b2
initial setup of the server container
2013-08-21 00:58:15 +02:00
f115b94927
Introducing IRequest
2013-08-20 17:53:58 +02:00
6e1946ab00
Introducing IContainer into public api
2013-08-20 17:22:33 +02:00
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
9253627327
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 13:04:55 +02:00
17c36b5074
fixes #4026
2013-07-30 10:26:42 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
1e4ec2ac27
add class='preview-icon' to rows in file app that make use of previews
2013-07-29 15:47:17 +02:00
1b50154c95
functions in OCP should be static
2013-07-25 15:25:17 +02:00
cb4cf3e2f7
need to use \OC_Image to escape OCP namespace
2013-07-22 17:25:55 +02:00
d509a0c403
return result from getL10N
2013-07-22 15:52:02 +02:00
9bf12da750
Merge pull request #3880 from owncloud/code-checker
...
Add classes replaced by the public api to the code checker
2013-07-21 11:19:20 -07:00
05c83a163a
add proper deprecated tag
2013-07-21 10:30:00 +02:00
48267b6e6c
add back public API function, but mark as deprecated
2013-07-20 01:15:12 +02:00
cbe1c22b5f
Correct casing of OC_User and pass through the params to getUsers
2013-07-19 17:32:31 +02:00
a22940d3cd
Add OC_L10N to public api
2013-07-19 11:40:11 +02:00
9379cbf602
Add OC_Image to public api
2013-07-19 11:23:47 +02:00
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
3abe68176f
Merge pull request #3270 from owncloud/convert-oc_config
...
Convert OC_Config to object so it can be used for DI
2013-07-11 18:21:08 -07:00
53830f2f75
implement use of previews in sharing app
2013-07-11 11:58:52 +02:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
5a3fce12a4
Implement encodePath
2013-07-09 17:46:11 +03:00
4feff3456b
Only emit permissions hook for files and and include path
2013-07-08 17:28:18 -04:00
52553c64ed
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-08 17:59:50 +02:00
5c2a0325ba
Add update permissions hook to sharing
2013-07-08 11:40:10 -04:00
98da4bf704
removing unused getSharedItem()
2013-07-06 00:04:01 +02:00
dad91c156f
Merge branch 'master' into fixing-3942-master
...
Conflicts:
apps/files/ajax/upload.php
2013-07-06 00:02:11 +02:00
e159cbf527
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
2013-07-05 17:39:41 +02:00
352c1415be
proper fix for getting the shared item if no user is logged in
2013-07-05 13:45:21 +02:00
ad9458e85d
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-04 18:23:47 +02:00
6cfa016c39
add public api
2013-07-04 10:11:55 +02:00
bb07dde988
Merge branch 'master' into convert-oc_config
2013-07-01 23:43:00 +02:00
f3c4a37a78
Merge pull request #3832 from owncloud/oracle_sql_fixes
...
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-28 10:22:59 -07:00
6ad7a0336f
Oracle doesn't know & as bitwise AND
...
Conflicts:
lib/public/share.php
2013-06-28 15:48:49 +02:00
c6bbccc776
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
lib/setup.php
2013-06-27 17:54:17 +02:00
5d51118cb2
fix type of numeric columns
2013-06-26 20:03:24 +02:00
bf49edde6b
check item id is set
2013-06-26 19:57:28 +02:00
39c387eed4
implement server side use of previews
2013-06-26 18:04:22 +02:00
b32d6d8487
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-24 22:52:01 +02:00
1a933a9173
Merge branch 'master' into oc_preview
2013-06-17 12:31:02 +02:00
961a001af3
add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
2013-06-14 12:18:20 +02:00
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
85ecec8b01
Merge branch 'master' into oc_preview
2013-06-06 11:13:55 +02:00
1c61732193
Merge branch 'master' into convert-oc_config
2013-06-03 18:06:13 -04:00
96b1e54d4a
Merge pull request #3444 from owncloud/share-fix
...
Fix undefined index for share mount point retrieval
2013-06-03 11:35:06 -07:00
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
1337f48d64
fixes for pgsql
2013-05-29 20:41:07 +02:00
f1b884aa5d
changed deprecated class
2013-05-29 20:15:04 +02:00
353d19d183
fixes if cache returns false
2013-05-29 20:11:13 +02:00
c8d1cd224d
fix $parent/$source typo
2013-05-29 19:58:05 +02:00
ae0f37e9e2
fix indention
2013-05-29 15:37:27 +02:00
8587f565d2
remove unnecessary variable
2013-05-29 15:14:15 +02:00
63a2bec6e5
use public API for error handling; improved while condition
2013-05-29 14:40:47 +02:00
893a1ed6f5
for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists
2013-05-29 14:19:18 +02:00
672811c103
if one public link share was found, we don't have to check it for the other folders
2013-05-29 13:12:30 +02:00
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
af57996d1e
Merge branch 'master' into oc_preview
2013-05-25 12:16:25 +02:00
7a0c592f93
Fix undefined index for share mount point retrieval
2013-05-21 20:21:19 -04:00
0305ee50c5
Merge branch 'master' into oc_preview
2013-05-17 11:41:30 +02:00
d7dc710c8b
revert changes
2013-05-17 01:22:30 +02:00
95297c2469
add pre-shared hooks
2013-05-16 17:44:28 +02:00
0916769f67
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
2013-05-15 17:00:01 +02:00
751487ded7
merge changes for files_encryption
2013-05-15 10:20:19 +02:00
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
e620286b25
Fix returns of values in OCP\Config
2013-05-07 20:07:28 +02:00
b7585050b5
Move legacy backgroundjob classes to a place where they can be autoloaded
2013-05-03 16:42:48 +02:00
73d7cae6df
One more mount point fix
2013-05-02 18:22:43 -04:00
809b5f81f6
Further seperation of mount management logic
2013-04-26 00:01:36 +02:00
b31dc10c3c
Add support for the old public backgroundjob api
2013-04-24 14:40:49 +02:00
117412272e
Update documentation for \OCP\BackgroundJob
2013-04-24 14:24:28 +02:00
4aa80d02be
Merge branch 'master' into files_encryption
2013-04-23 14:13:40 +02:00
ec3e97f28f
Merge branch 'master' into oc_preview
2013-04-22 16:19:16 +02:00
b5cb5dab51
fix encryption to owncloud user for public link shares
2013-04-22 14:30:10 +02:00
b24a673714
the owner uid is not interesting. We want to get all users who have access to the given item source, no matter from whom it was shared
2013-04-22 14:12:18 +02:00
7948341a86
Rework background job system
2013-04-20 23:27:46 +02:00
fe58e4b1a6
we need to add the owner of the file as parameter in case someone else like the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again
2013-04-18 17:48:16 +02:00
d51a94161e
Initialize collectionTypes variable as false
2013-04-08 17:46:52 -04:00
e704bcd96e
Correct undefined variable in post_shared hook, fixes #2592
2013-04-07 20:05:54 -04:00
ff6f52d5ec
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
568c256aff
Fix #2499
...
The mail domain can now be configured in config.php and get´s used in function getDefaultEmailAddress.
e.g. 'mail_domain' => 'example.com'
2013-03-22 10:07:06 +01:00
3cb016d478
add a searchbymime to the public api. Please all remember that access to internal oc classes will be disabled for all app for ownCloud 6. So please port yur stuff to the public api :-)
2013-03-19 14:27:02 +01:00
1e20067c00
Merge pull request #2183 from owncloud/fix-shared-statuses-again
...
Fix #2080 and fix #2141
2013-03-11 02:43:16 -07:00
2d00d13a5d
use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated
2013-03-08 15:13:00 +01:00
6e5e8c6b46
Fix #2080 and fix #2141
2013-03-07 22:30:12 -05:00
4826564344
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-03-07 17:14:34 -05:00
a5cab28bea
Fix fetching source path of shared files
2013-03-07 11:12:59 -05:00
4dcbaa1d7b
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/appinfo/app.php
2013-03-05 21:54:32 -05:00
ee0c38bb51
Fix group post_shared hook
2013-03-04 19:43:56 -05:00
6019cdd5bd
adding test case for getDefaultEmailAddress() + fixing #1844 again
2013-03-04 21:10:18 +01:00
6c304fa5c0
validate the generated email address and fall back to localhost.localdomain in case it is not valid
...
fixes #1844
2013-03-01 22:24:19 +01:00
b5989c933f
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-02-28 10:39:23 -05:00
9a2ca0ae64
Check resharing setting
2013-02-26 13:31:15 -05:00
8983465210
Correct parent folders' ETags for all users with access to a shared file
2013-02-26 01:21:48 -05:00
9ee5069f2a
Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
...
don't use the number of written bytes as indicator if streamCopy() was successful
2013-02-25 02:04:12 -08:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
d8137fdf66
return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied
2013-02-22 16:43:11 +01:00
40efeb9187
isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not
2013-02-22 16:02:27 +01:00
ffae6f4b84
Style-fix: Breakup long lines
2013-02-14 08:38:37 +01:00
2d6d0a4ad4
Whitespace indent fixes
2013-02-14 08:36:26 +01:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
5005195db0
create keypair for ownCloud with empty passphrase, will be used for public link shares
2013-02-13 17:57:45 +01:00
9356f9a6bf
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
2013-02-13 17:23:27 +01:00
4952dfe956
add post_unshare hook, also add public link shares to the list of user with access to a file
2013-02-13 14:56:39 +01:00
a692264fa4
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
2013-02-12 17:00:33 +01:00
d1bbb30385
also find users with access to the file if a folder above the actual file was already shared
2013-02-12 16:48:04 +01:00
8eef919a75
take group shares into account if we retrieve the list a all recipients
2013-02-12 12:08:34 +01:00
92f06243be
Implementing sharing support
...
New file-specific methods in lib/public/share
Changes to how keyfiles are stored
2013-02-11 10:21:23 +00:00
b3e59ca1e3
Work on post_share hook for files_encryption
...
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot
2013-02-09 18:39:32 +00:00
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
1158447499
missing comma in sql statement
2013-02-08 13:49:26 +01:00
223f538bb8
Merge pull request #1500 from chriskoch/patch-1
...
Update lib/public/util.php
2013-02-06 13:00:10 -08:00
a4d3cc798f
Correct lib/public/contacts.php tests
2013-02-06 17:37:47 +01:00
a4f909cefd
Update lib/public/util.php
...
The call of \OC_MAIL::send() overrides all optional parameters. This is not necessary. But if you want to have html mail templates (what I'm thinking about) it is a real problem
2013-02-06 17:22:07 +01:00
9e08f85c5e
port already approved bugfix to master, https://github.com/owncloud/core/pull/1479
2013-02-06 14:19:32 +01:00
74157902d7
Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit
...
disable error handler while running phpunit
2013-02-05 14:35:11 -08:00
10ea45c916
fix failing test cases due to wrong typing
2013-02-05 20:19:54 +01:00
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
3b8c071df4
Merge pull request #1234 from owncloud/fix-issue-192
...
Fix sharing issue with collection and children mismatches
2013-02-04 11:52:20 -08:00
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
022a7b13b8
prepare user table to show and edit display names
2013-01-28 13:12:44 +01:00
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
b4291f1e8e
allow to get the display name from an abitrary user
2013-01-25 13:00:17 +01:00
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
d16574f070
new branch which introduces display names
...
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
14d0903a28
Merge branch 'master' of github.com:owncloud/core
2013-01-23 12:52:53 +00:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
316eef3ded
Fix sharing issue with collection and children mismatches
2013-01-19 01:50:02 -05:00
cd8d8360b0
Disable fancy folder sharing for now
2013-01-18 23:57:13 -05:00
5df6f9d14d
Fix merge
2013-01-18 23:56:47 -05:00
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
4668f8c86e
Merge pull request #1178 from owncloud/return_true_because_of_ponies
...
Remove uneeded return
2013-01-15 14:01:48 -08:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
cc00c54f6a
Remove uneeded returns
2013-01-14 20:18:08 +01:00
de0ed634f2
Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption
2013-01-14 17:05:47 +00:00
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
e8b195bf10
Almost fix Shared scanner...
2013-01-07 20:52:51 -05:00
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
a21da9f9fd
fixing returns
2013-01-06 23:59:02 +01:00
1093cdd823
fixing returns
2013-01-06 23:57:27 +01:00
19edb29cc3
add missing return
2013-01-06 23:54:18 +01:00
cdd28fcc46
fixing undefined variable $where
2013-01-06 23:48:04 +01:00
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
0b13b41189
Merge pull request #1053 from owncloud/ocs_api
...
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
54f6f1e6b7
phpdoc fixes for public api
2013-01-02 16:38:20 +01:00
f4e4a06826
Forgot to select storage from filecache
2013-01-01 12:17:54 -05:00
6eb194b702
Merge branch 'master' into ocs_api
...
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
cfc3526b25
Fix data for shared root folder
2012-12-29 11:45:13 -05:00
1910057900
Fix shared statuses inside folders
2012-12-26 16:20:10 -05:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
986f5d9f3e
fixing variable name
2012-12-21 00:04:58 +01:00
39d874cd90
the maximum upload size is now part of the response of the upload and delete operation.
...
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +01:00
d2828bab07
fixes default email sender address
2012-12-19 01:09:14 +01:00
3c98f36121
Merge branch 'master' into ocs_api
2012-12-16 22:29:00 +00:00
bf05ff351f
Initial support for file sharing with filesystem branch
2012-12-15 19:44:59 -05:00
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
68562dafb4
More whitespace fixes
2012-12-15 00:43:46 +01:00
5fe6129698
Merge master into ocs_api, fix conflicts.
2012-12-14 15:15:05 +00:00
680ff3a51b
Merge pull request #584 from wardragon/ldap_access_userExists_fix
...
Really fix OCP\Share::shareItem with LDAP users
2012-12-12 16:59:43 -08:00
8ed0ce7801
[contacts_api] IAddressBook moved to OCP as it's used by apps to provide access to their contact data
2012-12-11 17:42:09 +01:00
4cc895aa0a
[contacts_api] move addressbook to it's own file
2012-12-08 16:42:54 +01:00
15afbfd198
Add an $excludingBackend optional parameter
...
to the userExists method both in OCP\User and in OC_User.
2012-12-07 17:19:26 +01:00
889e55fdac
[contacts_api] update documentation
2012-12-06 23:51:35 +01:00
35e55214e2
[Contacts API] example for searching added
2012-12-02 11:54:30 +01:00
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
f99497a05a
test for search and unregister added
2012-11-28 23:10:30 +01:00
2d597c2238
first unit tests implemented
2012-11-28 23:10:00 +01:00
5b1dea56e5
change name to IAddressBook
2012-11-28 23:08:15 +01:00
fba8c776e1
plugin mechanism implemented
2012-11-28 23:07:09 +01:00
eaa625c9bc
Merge pull request #401 from owncloud/share_hooks
...
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
d91c841f73
Merge pull request #383 from owncloud/contacts_api
...
Proposal for a public contacts api
2012-11-19 05:42:01 -08:00
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
530f3f8be9
Create functions to install standard hooks
...
Also use these in tests that needs them
Fix #151
2012-11-13 23:45:17 +01:00
33a4dfa087
function isEnabled() added
2012-11-13 20:59:47 +01:00
5b44714f4c
first version of the new previewer lib. It currently only created previews/thumbnails for images. It get´s more interesting when we add PDFs, movies, mp3, text files and more...
2012-11-13 15:11:02 +01:00
268a48479d
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 23:36:59 +01:00
c3825112a0
public contacts api as discussed here https://github.com/owncloud/apps/issues/113
2012-11-12 23:25:32 +01:00
e0fdb8272b
Merge pull request #371 from butonic/sql_and_error_log_fixes
...
add missing sql backticks, check sharing for error and add log
2012-11-12 03:37:43 -08:00
ba91f9a237
add missing sql backticks, check sharing for error and add log
2012-11-12 12:04:46 +01:00
82e010c51c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 00:37:40 +01:00
56239df2e7
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
2012-11-11 23:10:23 +01:00
7f0c69eb0e
Added CRUDS permissions to the OCP namespace. Implements issue #345
2012-11-11 23:09:54 +01:00
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
a4b2ea586d
Style: Remove all the dangling white spaces
2012-11-04 22:16:04 +01:00
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
bc4382c5c5
Checkstyle: fix the last NoSpaceAfterEquals
2012-11-04 18:31:44 +01:00
e6a7bba095
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-04 12:31:06 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
07111ff672
Allow apps to pass defaults and requirements for their API calls
2012-10-28 11:04:23 +00:00
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
5bfff6c56e
use absolute paths when resolving mount points
2012-10-27 12:17:35 +02:00
d0bbd9416b
Add BackgroundJob::setExecutionType() to public API
2012-10-27 10:15:39 +02:00
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
a48734bcb5
fixed user/group sharing hooks
2012-10-26 23:15:37 +02:00
6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00
4b616764e8
Merge branch 'master' into filesystem
2012-10-26 22:32:44 +02:00
b7bf28d1c7
Hook emission on sharing stuff
2012-10-26 20:53:32 +02:00
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
8cd268fc82
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-17 00:16:37 +02:00
c00f5d164f
Fix unshareAll()
2012-10-16 16:27:23 -04:00
012ea1ed83
Add unshareAll() function to Share API
2012-10-16 15:38:52 -04:00
9c9f5ef2d6
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-15 21:41:38 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
7a30f46543
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-10 23:00:46 +02:00
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
003241e847
fix for bug #1942 : Allow user to share with every group if "allow users to share with anyone" is set
2012-10-09 10:36:24 +02:00
8357754ff1
added "uid_owner" to select statement
2012-10-08 13:22:08 +02:00
5f462ec6f7
Fix - "Correct checking item source for share from same owner when generating item target"
2012-10-06 18:13:11 -04:00
2c1c7eadaf
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-02 23:24:54 +02:00
68c8faf39c
Correct checking item source for share from same owner when generating item target
2012-10-02 16:37:39 -04:00
431d92e7b2
we are sharing the same file again if item_source of the already shared file and the newly shared file is the same. Therefore we can use the same target name
2012-10-02 21:37:10 +02:00
db954f5aba
remove unnecessary code and add missing items to select statement
2012-10-02 18:59:20 +02:00
3e3038cafc
merge all possible conflicts into on array
2012-10-02 13:10:46 +02:00
c6c0fcc7c8
We can't rely on the assumption that if the matching target is from the same owner that the share type will be different.
...
Files in different folders can have the same name. Therefore also a unique name has to be generated if the matching
target it from the same user. Also for folders and files with the same name a unique target name has to be generated
If matching target is from the same owner, use the same target. The share type will be different so this isn't the sa
2012-10-02 11:41:26 +02:00
241862756e
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-09-30 06:51:40 +02:00
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
b4e40b1c21
Fix unsetting share expiration date
2012-09-26 00:09:35 -04:00
f967bfc956
Properly format the share expiration time for the database, fixes bug oc-1779
2012-09-25 23:54:46 -04:00
4131b205d4
fix some more phpdoc
2012-09-23 02:40:03 +02:00
ffe04182a8
Added methods OC_DB::insertIfNotExist() and OCP\DB::insertIfNotExist().
2012-09-17 16:01:25 +02:00
8b409dfe2a
API: Default to user authentication level
2012-09-13 14:15:04 +00:00
227ada3257
Fix merge conflicts
2012-09-13 10:23:41 +00:00
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
37f0b85d3f
Fix problem with non share collection item types being treated as collections
2012-09-11 00:37:31 -04:00
6c17a4cb77
Don't display actions for children in shared collections, show the parent collection the child is shared in
2012-09-09 14:44:08 -04:00
13d513c17c
Fix shared collection item searching
2012-09-09 11:50:12 -04:00
3e7951e1e6
Normalize the file path for shared children as a precaution
2012-09-08 23:42:24 -04:00
fe7f095b08
Insert id for unique user group share rows
2012-09-08 23:09:58 -04:00
b163bd514f
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
2012-09-08 23:09:57 -04:00
f23f719d99
Fix unsharing from self for group shares and add test for it
2012-09-08 20:15:47 -04:00
2b42893fa9
style fixes for public util api
2012-09-08 16:18:47 +02:00
89f3afe2fe
style fixes for public user api
2012-09-08 16:17:01 +02:00
439ede2a1d
style fixes for public response api
2012-09-08 16:15:42 +02:00
a16565a7fa
style fixes for public json api
2012-09-08 16:14:06 +02:00
89e5b85fa7
style fixes for public files api
2012-09-08 16:02:11 +02:00
6b2b8b10ee
style fixes for public db api
2012-09-08 16:00:32 +02:00
221257d2fb
style fixes for public config api
2012-09-08 15:58:28 +02:00
eca24f74f7
style fixes for public app api
2012-09-08 15:54:30 +02:00
c692dfc1ab
style fixes for public app api
2012-09-08 15:52:29 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
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
1a46192433
Add args parameter to linkTo(Absolute) function, to append the args automaticly
2012-09-03 21:51:32 +02:00
4c065deb55
Listen to post_deleteGroup hook in Share API
2012-09-02 20:01:09 -04:00
dc569ea300
Fix some warnings from Jenkins in the Share API
2012-09-02 19:30:01 -04:00
db37a454b3
Add parameter documentation
2012-09-02 18:29:55 -04:00
f0f2d93908
Restructure generateTarget for the post_addToGroup hook
2012-09-02 18:23:19 -04:00
a77c16371f
Make item targets be based off of the parent item target for reshares
2012-09-02 18:23:19 -04:00
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
2c1f732880
use null instead of -1 on all getUser()
2012-09-01 20:50:03 +02:00
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
52f2e7112e
Whitespace fixes in lib
2012-08-29 20:28:45 +02:00
26501a0bc8
Delete old link if user sets a password
2012-08-29 14:06:55 -04:00
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
0ad16e84c5
Fix share collection query
2012-08-27 20:37:38 -04:00
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
18517f6adb
Fix share getItems() limit
2012-08-26 21:34:37 -04:00
9822cd30c0
fix sharing bug introduced with oracle support
2012-08-26 14:57:33 +02:00
fa3497f6ed
add backticks to SQL, use limit parameter instead of LIMIT SQL
2012-08-25 01:52:27 +02:00
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
c90c358f0d
Only load js and css once.
2012-08-23 05:02:30 +02:00
3debb67458
Move share CSS to core, add script and style from inside Share API
2012-08-22 11:57:58 -04:00
9699ff03bd
Revert using item name, no longer allowing the same item source exist for a user
2012-08-22 11:57:58 -04:00
09e851a9c4
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
2012-08-20 21:22:22 -04:00
5eca531f99
Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.
2012-08-19 22:14:38 -04:00
f987e22d85
Large refactoring to allow for the same item to be shared to a group and again with a user in the group with different permissions
2012-08-19 16:30:38 -04:00
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
9cb3113f42
Fix problems exposed by tests
2012-08-15 11:59:08 -04:00
ddfa760a5e
Change to correct function call getItemSharedWithBySource()
2012-08-14 17:06:41 -04:00
b440dfc67e
Remove setTarget() function, changing target names only leads to confusion
2012-08-14 17:05:38 -04:00
9661a63a72
Ensure permissions can't be escalated during a reshare
2012-08-14 16:54:38 -04:00
028c79fc9d
Use if instead of switch for detecting share type and throw exceptions when setting permissions
2012-08-14 16:30:13 -04:00
937d1b29d8
Retrieve all file dependent items when looking for file item type
2012-08-14 11:02:29 -04:00
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
64ef1e2181
Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...
2012-08-12 14:49:41 -04:00
4d3d4522f9
Backgroundjobs: Fix wrong var names
2012-08-12 12:14:27 +02:00
874f31b8d7
Make getting all users and groups the default
2012-08-11 16:25:27 -04:00
8d1eb674ec
Add search, limit, and offset parameters to getUsers() and getGroups()
2012-08-11 16:25:27 -04:00
ceda0ae052
Backgroundjobs: rename ScheduledTask to QueuedTask
2012-08-09 19:04:04 +02:00
78cd1153f0
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
b830b3e24b
Start adding permission checks for addressbooks
2012-08-08 21:43:02 -04:00
2c5744f16c
Add back getItemSharedWithBySource(), some situtations require this ability
2012-08-08 20:56:55 -04:00
088b3ea0bc
Add public interface to background jobs
2012-08-09 00:01:06 +02:00
b287b11ff2
adjust the query generation in getItems, to use placeholders
2012-08-07 21:49:31 +02:00
99ce7ba1df
Move serverHost and serverProtocol functions to OC_Request
2012-08-07 20:43:00 +02:00
b6bbbb4c47
Remove undefined return variable
2012-08-07 14:38:02 -04:00
a96a75c263
Select the correct column when searching for similar targets
2012-08-06 16:48:20 -04:00
5e95e2a131
Set filePath variable
2012-08-06 16:46:44 -04:00
1b21cde2b3
Throw more exceptions
2012-08-06 16:37:51 -04:00
14d13a740f
Load icons for addressbooks, fix statuses for types other than files
2012-08-06 15:24:08 -04:00
e954de6030
Make the file source path relative earlier
2012-08-06 14:15:37 -04:00
e280e3ecc9
Throw more exceptions
2012-08-06 14:09:58 -04:00
1db1d40414
Add additional check for post_deleteUser so we don't delete any non-user shares with the same name
2012-08-06 13:58:26 -04:00
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
09bb3bfaf8
Preparing for proper collection implementation
2012-08-03 15:05:45 -04:00
6c7baacf89
Throw exception for items already shared in a collection
2012-08-01 20:08:18 -04:00
92d683587a
Fix contact email share type redirection
2012-08-01 17:52:59 -04:00
4933128850
Throw exceptions in share API for UI to display
2012-08-01 17:52:29 -04:00
2201074e1f
Basic setup for sharing with contacts
2012-08-01 17:17:28 -04:00
e13f381189
add limit support to OC_DB & OCP/DB
2012-08-01 14:59:08 +02:00
b6aa5d2875
Include contacts in share with search
2012-07-31 21:05:00 -04:00
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
b05639e745
Fix error with namespacing
2012-07-31 10:10:15 +00:00
cc6911e1f7
Make method static
2012-07-31 09:28:12 +00: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
3a0e3708a5
Add public class for registering api calls
2012-07-30 14:26:15 +00: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
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
6b320a2604
provide recursiveArraySearch as Helper function and make available through API
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
0af454a23b
Trying to get documentation to "Do The Right Thing" (TM)
2012-07-20 23:11:06 +02: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
c9be9ab251
remove unused variables
2012-07-20 18:56:18 +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
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
ccb5e99395
Generate random token for private links (more entropy than past private links)
2012-07-11 12:18:59 -04: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
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +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
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
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
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
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
cb19fdd55b
Show users and groups shared with in dropdown
2012-06-27 01:05:37 +02:00
d95d738723
Fix FORMAT_STATUSES
2012-06-27 01:05:36 +02:00
9fdfcc29fe
Fix group sharing
2012-06-27 01:05:36 +02:00
d332e1e9c1
Documentation fix
2012-06-27 01:05:36 +02:00
c41cb192c9
Fix which line needs '' wrapped around the array values
2012-06-27 01:05:36 +02:00
243faf6334
Fix searching for parent item types, search for file source instead of item source for the file item type in case the item was converted
2012-06-27 01:05:36 +02:00
32f9901bcd
Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend()
2012-06-27 01:05:36 +02:00
28b7793d5b
Fixes and change database table from sharing to share
2012-06-27 01:05:36 +02:00
f21fdf14f9
Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead
2012-06-27 01:05:36 +02:00
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
8198114615
Some more changes to getItems() and fixes in shared storage
2012-06-27 01:05:36 +02:00
5f1aa1b92e
Fix additional getItems calls due to parameter change
2012-06-27 01:05:36 +02:00
71350bc618
I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api.
2012-06-27 01:05:36 +02:00
10986f00dc
Use share type and share with in db instead of separate columns for user and group
2012-06-27 01:05:36 +02:00
bd8769a7c5
Fixes for registering and fetching backends
2012-06-27 01:05:36 +02:00
c7e0449a75
Finish parent folder implementation, change recursive delete process
2012-06-27 01:05:36 +02:00
0cc7ae904d
Initial work on a share API
2012-06-27 01:05:36 +02:00
d9607df26f
backport of sanitizeHTML() function
2012-06-20 16:43:31 +02:00
6644511124
remove unnecessary comment
2012-06-20 16:29:19 +02:00
d2936bd90c
introducing a sanitize HTML function for the internal and the public API. This
...
allows to easily convert strings to HTML before displaying them on the web page
to reduce the risk of xss vulnerabilities.
2012-06-19 17:20:19 +02:00
625cd822c3
Backport CSRF prevention.
2012-06-14 13:52:22 +02:00
8fd9cbcc54
White-space fix.
2012-06-14 13:23:12 +02:00
89464721c7
Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.
2012-06-13 17:33:19 +02:00
344299a074
add two csrf check calls. Review and lot´s of porting needed.
2012-06-09 15:05:14 +02:00
64fe06710a
add deprecated warning
2012-06-04 12:49:33 +02:00
1e6802e567
add deprecated warning
2012-06-04 12:45:45 +02:00
0d2d613f59
added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer
2012-06-01 11:06:49 +02:00
24d14783d7
added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer
2012-06-01 10:38:44 +02:00
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
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
7e49a33d64
getStorage belongs to files not to apps.
2012-05-19 10:44:08 +02:00
08f7d4c552
document the public classes a bit more
2012-05-19 10:36:57 +02:00
b055ebc1fc
added documentation to OCP namespace
2012-05-10 14:19:17 +01:00
798e6aa40b
Merge commit 'refs/merge-requests/100' of git://gitorious.org/owncloud/owncloud into merge-requests/100
2012-05-09 17:50:14 -04:00
bc60b8d87a
fix bug in public api
2012-05-09 18:33:40 +02:00
bba434ca37
fixed typo in lib/public/util.php:106 (varname to )
2012-05-09 15:17:40 +02:00
10d291d6b3
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-07 22:56:34 +02:00
40b823bc8b
some more docu fixes
2012-05-07 22:55:44 +02:00
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
cde60dba0f
Fix typo.
2012-05-07 04:46:09 +02:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
5d55c709dd
some more documentation cleanups. much more is needed.
...
And greeting from the Atlanta airport. ;-)
2012-05-06 22:02:16 +02:00
2edf59c026
first part of documentation update. lot´s more to come
2012-05-06 21:46:39 +02:00
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
eab4a05d78
implement missing getusers call
2012-05-04 11:13:07 +02:00
97a8af7f25
ported oc_db
2012-05-03 13:06:08 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
351740601a
port oc_response
2012-05-03 10:46:27 +02:00
10bbbc8cd2
new checkAppEnabled call
2012-05-02 18:54:31 +02:00
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
8e99475886
first part of the config stuff
2012-05-02 13:28:56 +02:00
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +02:00
31e32e3c10
ported checkLoggedIn and checkAdmin
2012-05-01 22:59:38 +02:00
e2fb094693
some more porting
2012-05-01 21:07:08 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
0195d5b439
some more work on the public API
2012-05-01 09:39:12 +02:00
f5c9fe9ece
first step to an public api of ownCloud for the apps. In the future they shouldn´t call internall classes, functions or session variables because this will change and break in upcoming versions. Apps should only call this public interface that we will kepp stable over different releases. The namespace is OCP for ownCloud public. This is just the first step. more coming soon
2012-04-23 15:50:30 +02:00
Michael Gapczynski
Morris Jobke
Thomas Müller
Thomas Tanghus
Bjoern Schiessle
Bernhard Posselt
Bart Visscher
Vincent Petry
Arthur Schiwon
Andreas Fischer
Jörn Friedrich Dreyer
Robin Appelman
kondou
Frank Karlitschek
Georg Ehrke
Björn Schießle
Jan-Christoph Borchardt
icewind1991
Victor Dubiniuk
Georg Ehrke
Florin Peter
Sam Tuke
itheiss
Bernhard Posselt
Christian Koch
Stefan Herbrechtsmeier
Lukas Reschke
Tom Needham
Randolph Carter
Tom Needham
Lorenzo M. Catucci
Felix Moeller
Jakob Sack
Florian Hülsmann
Georg Ehrke
jfd
Michael Gapczynski
Sam Tuke
Philipp Roggan
Frank Karlitschek