Bart Visscher
|
6b061c236d
|
Merge branch 'master' into type-hinting
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
|
2014-03-31 21:38:54 +02:00 |
Robin Appelman
|
0d0aac6fff
|
Load the routes when matching or generating a route instead of when creating the router
|
2014-03-24 14:55:03 +01:00 |
|
Robin Appelman
|
8ab7d18a6a
|
Move the router classes to a namespace and expose it with a public interface
|
2014-03-10 14:04:58 +01:00 |
|
Bart Visscher
|
8951328a87
|
More PHPDoc updates
|
2014-02-28 21:03:43 +01:00 |
Thomas Müller
|
750ffa8231
|
Merge pull request #7156 from owncloud/backgroundjob-public
Add the background job list to the public server container
|
2014-02-14 23:11:10 +01:00 |
|
Robin Appelman
|
a6399f9cef
|
Add the background job list to the public server container
|
2014-02-11 14:00:24 +01:00 |
|
Robin Appelman
|
b537d90e58
|
use the 'new' server container for appconfig
|
2014-02-07 13:45:59 +01:00 |
|
Robin Appelman
|
5d456c7cc2
|
Merge branch 'master' into memcache-public
|
2014-01-09 13:54:58 +01:00 |
|
Thomas Müller
|
e35bca1c26
|
Fix ownCloud for php5.3.x
|
2014-01-08 16:07:01 +01:00 |
|
Robin Appelman
|
5a2a0426a6
|
Also update the OCP\IServerContainer
|
2014-01-08 15:51:40 +01:00 |
|
Robin Appelman
|
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 |
Jörn Friedrich Dreyer
|
f356894aa3
|
Merge pull request #6594 from owncloud/kill-index.php-from-url
Kill index.php from url
|
2014-01-07 22:28:58 -08:00 |
|
Robin Appelman
|
4d65a80892
|
Remove the static dependency on OC_Util from Memcache
|
2014-01-06 13:11:38 +01:00 |
|
Robin Appelman
|
1df1b55b66
|
expose memory cache in public api
|
2014-01-06 12:55:56 +01:00 |
|
Thomas Müller
|
ae5671d281
|
new config parameter 'front_controller_active' which will instruct the url generator to generate urls without index.php
|
2013-12-31 14:36:02 +01:00 |
|
Robin Appelman
|
a6c1b3ece3
|
fix the config option to remove the ability for users to set their displayname
|
2013-12-18 13:03:19 +01:00 |
|
Thomas Müller
|
92c8672c0f
|
fixing PHPDoc comments and syntax
|
2013-11-22 12:34:37 +01:00 |
kondou
|
bcd776b0c0
|
Fix a regression (Tags→TagManager)
|
2013-11-07 12:51:03 +01:00 |
|
kondou
|
4ac05e071a
|
Remove duplicate getAvatarManager()
|
2013-11-07 12:48:41 +01:00 |
|
kondou
|
507325dd50
|
Add public API for \OC\Avatar
|
2013-11-07 12:48:40 +01:00 |
|
Thomas Müller
|
e30e4ea1cc
|
php 5.3 compatibility regarding OC\DB\Connection fixed
|
2013-10-21 22:51:56 +02:00 |
|
Thomas Müller
|
221a650815
|
Merge branch 'master' into activities-api
Conflicts:
lib/private/server.php
|
2013-10-16 21:15:25 +02:00 |
|
Thomas Müller
|
926b3c9b7b
|
Merge branch 'master' into activities-api
|
2013-10-09 17:53:57 +02:00 |
|
Thomas Müller
|
780280e53f
|
fixing errors regarding wrong function calls / missing parameters
|
2013-10-07 00:35:05 +02:00 |
|
Bart Visscher
|
21cbef0d2c
|
passesCSRFCheck added to OCP\IRequest
|
2013-10-04 18:13:04 +02:00 |
|
Bart Visscher
|
61a9098b7d
|
Add Helper and URLGenerator interfaces to server container
|
2013-10-04 18:11:02 +02:00 |
|
Bart Visscher
|
9f777fba98
|
Add L10N interface to server container
|
2013-10-04 18:11:02 +02:00 |
Thomas Tanghus
|
0f13ffb773
|
Remove JSON request parsing from Server
|
2013-10-01 20:15:04 +02:00 |
|
Thomas Müller
|
9c9dc276b7
|
move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
lib/private/vcategories.php
|
2013-09-30 16:36:59 +02:00 |