0609f30d1c
Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
...
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
a27529709b
Merge pull request #6647 from owncloud/memcache-public
...
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
099b71c712
Merge branch 'master' into pr-exceed_upload_limit_msg
...
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
ab9ddda8f2
Merge pull request #6907 from owncloud/webdav-logexceptions
...
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
3c1ab66eda
Reuse the calculated free_space in buildFileStorageStatistics
2014-01-27 15:56:57 +01:00
11ef12a106
Added exception logger plugin for sabre connector
...
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.
This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.
This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
1ab7ca0a19
Fix some phpdoc errors and rename interface
2014-01-24 16:01:19 +01:00
fc5f20112e
Add isReadable, isUpdateable, isDeletable, isShareable
2014-01-24 15:54:40 +01:00
0f6c607171
added function documentation
2014-01-24 14:22:42 +01:00
506393090b
Add 'mail_from_address' configuration
...
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.
This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
2014-01-24 14:04:37 +01:00
02aa44d055
Merge branch 'master' into memcache-public
2014-01-22 13:19:49 +01:00
9bab05fd45
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 19:36:20 +01:00
a3ea5aa2ac
fixing comment + adding unit test for checkPasswordProtectedShare
2014-01-21 12:07:08 +01:00
23a4d0d44e
OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
2014-01-21 11:32:30 +01:00
6746ad0a73
in case no share is found for the given token we can return right away
2014-01-21 10:55:10 +01:00
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01:00
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
32e941a2bc
Merge pull request #6644 from ben-denham/unshare-all-fix
...
\OCP\Share::unshareAll() fix
2014-01-16 03:13:26 -08:00
82762bb462
remove ArrayAccess, JsonSerializable from the public part of FileInfo
2014-01-13 15:13:45 +01:00
39d2c18793
Extends phpdoc for \OCP\File\FileInfo
2014-01-13 14:42:14 +01:00
617acbd6f9
Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search
2014-01-13 14:28:49 +01:00
5d456c7cc2
Merge branch 'master' into memcache-public
2014-01-09 13:54:58 +01:00
d50c7391d8
Use $server->getMemCacheFactory() in ldap connection
2014-01-09 13:54:50 +01:00
5a2a0426a6
Also update the OCP\IServerContainer
2014-01-08 15:51:40 +01:00
be7837402d
get the memorycache factory from OCP\Server instead of a cache instance
...
this allows apps to specify a prefix to use
2014-01-08 15:18:12 +01:00
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
4d65a80892
Remove the static dependency on OC_Util from Memcache
2014-01-06 13:11:38 +01:00
baccc8f584
Unshare all will now delete all shares for the item, instead of only for a single owner.
2014-01-06 11:14:43 +13:00
aa17a896ac
fix return statement
2013-12-19 00:33:29 +01:00
5eae75eeca
kill MDB2 in PHPDoc
2013-12-19 00:32:46 +01:00
277ae28171
Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
...
Fixed download file from URL error messages
2013-12-18 06:03:50 -08:00
1d0af242b9
Merge pull request #6436 from owncloud/allconfig-defaults
...
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
2013-12-17 05:09:58 -08:00
2a1d6d3106
Do not use L10n when logging exceptions
...
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.
This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
2013-12-16 15:11:13 +01:00
e2efad6ae7
Also add default to the \OCP\IConfig interface
2013-12-16 14:33:03 +01:00
4c45c6f418
dont try to register background jobs if we haven't upgraded yet
2013-12-13 17:15:18 +01:00
6408125edc
rely only on php DateTime to parse the db datetime string
2013-12-13 16:38:05 +01:00
335b2f40a6
Fixed download file from URL error messages
...
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
OC_L10N_String values
2013-12-12 10:38:12 +01:00
409b510889
Moved content disposition code+workarounds to OCP\Response
...
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.
Refactored download code to use the new API.
Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
fc607e6bce
Separate PHP upload limit and free space
2013-12-08 22:59:46 +08:00
3f7aac1a79
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
2013-12-05 17:29:15 +01:00
832be7c908
Merge pull request #6052 from owncloud/datetime-doctrine
...
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
a03ba06dcd
Merge pull request #6077 from owncloud/fix-api-documentation
...
API doc for contacts manager, server container and share
2013-11-29 03:24:19 -08:00
a81909097c
Merge pull request #6027 from owncloud/public-api-restful-routing-oc6
...
fix appframework routing
2013-11-27 01:55:52 -08:00
b910524acb
add comment from @DeepDiver
2013-11-27 10:32:48 +01:00
7c88736292
API doc for contacts manager, server container and share
2013-11-27 00:35:36 +01:00
3bbaba1eca
Use the Doctrine to convert date string to DateTime object.
2013-11-26 12:21:31 +01:00
a330b2ef9b
Use DateTime object instead of fixed format date string.
...
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
2013-11-26 12:00:31 +01:00
9fb1da2811
Use bindValue() instead of passing parameters in execute().
2013-11-26 11:50:14 +01:00
844b4785f1
Merge pull request #6034 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-25 11:17:16 -08:00
1fdd2ac7ee
adding documentation for registerRoutes()
2013-11-25 17:15:08 +01:00
b3e7e54c8d
fix some capital letters
2013-11-25 16:42:28 +01:00
4e0fa85307
page level doc blocks and class descriptions
2013-11-25 16:39:01 +01:00
bc8cc9142e
AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixes
2013-11-25 16:28:24 +01:00
248eed16a6
fix defaults.php doc
2013-11-25 14:26:26 +01:00
b7ddc78626
fix db.php doc
2013-11-25 14:06:25 +01:00
993fea2f05
fix appframework routing
2013-11-25 11:36:33 +01:00
2f73db12bb
Merge pull request #5040 from owncloud/public_api_avatar_master
...
Add public API for \OC\Avatar
2013-11-22 03:42:28 -08:00
92c8672c0f
fixing PHPDoc comments and syntax
2013-11-22 12:34:37 +01:00
f94a6eb166
Add missing Avatar Interface
2013-11-22 00:43:23 +01:00
00071401d7
Round out Avatar Public API
2013-11-21 23:40:25 +01:00
abc428916c
Fix fatal error when trying to open a non existing public link
2013-11-12 15:38:00 +01:00
507325dd50
Add public API for \OC\Avatar
2013-11-07 12:48:40 +01:00
ef592981ea
unify license headers for public API files
2013-11-03 13:51:39 +01:00
d2a48d58ce
fix "No page-level DocBlock"
2013-11-03 13:38:25 +01:00
7c1f0da0fe
Always select item_source.
2013-11-03 12:34:40 +01:00
fa56aec4b8
Deduplicate expiration date check into a method.
2013-11-03 12:34:38 +01:00
779b87d46a
Use unshareItem() when unsharing expired shares.
2013-11-03 12:33:34 +01:00
ebf1694795
Use unshareItem() in unshareAll().
2013-11-03 12:33:34 +01:00
1d1f5b288e
Extract unshare() code into unshareItem().
2013-11-03 12:33:34 +01:00
329299e34c
OCP\Share::unshareAll(): Deduplicate hook parameters.
2013-11-03 12:33:31 +01:00
0dbe90cc9a
fix documentation stuff
2013-10-31 19:00:53 +01:00
1317b7c03d
pass the name of the item source from the browser to the server - no need to get the data via complicated db queries
2013-10-23 18:39:37 +02:00
1909288fcb
Merge branch 'master' into fix-sharing-code
2013-10-23 17:16:16 +02:00
8c69a5388e
Merge pull request #5478 from owncloud/core-logexceptionstacktrace
...
Expand exception stack trace in log in debug mode
2013-10-23 07:19:14 -07:00
c4dee281e6
Added $app parameter to logException
2013-10-23 13:58:42 +02:00
42c58220de
Moved logException to OCP\Util class
2013-10-23 10:48:27 +02:00
ad017285e1
Fix namespace for OCP\Appframework\Http
...
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
2013-10-23 05:57:34 +02:00
408e0022dd
Merge pull request #5249 from owncloud/activities-api
...
[OC6] Activities api
2013-10-21 13:21:17 -07:00
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
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
Jan-Christoph Borchardt
icewind1991
Pellaeon Lin
Robin Appelman
Thomas Müller
Vincent Petry
Jens-Christian Fischer
Björn Schießle
ben-denham
Frank Karlitschek
Jörn Friedrich Dreyer
Morris Jobke
Andreas Fischer
Owen Winkler
blizzz
kondou
Thomas Tanghus
Michael Gapczynski
Bernhard Posselt
Bart Visscher