summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6219 from leo-b/fix_router_deprecationAndreas Fischer2013-12-191-2/+4
|\
| * Symfonys addCollection() with multiple arguments is deprecated, fix deprecati...Alexander Bergolth2013-12-041-2/+4
* | Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-jsonThomas Müller2013-12-191-1/+3
|\ \
| * | only walk an arrayThomas Müller2013-12-181-1/+3
* | | Merge pull request #6492 from owncloud/appconfig-cacheicewind19912013-12-191-54/+89
|\ \ \
| * | | dont re-read the config values for an app when a non existing key is fetchedRobin Appelman2013-12-181-5/+10
| * | | Fetch all appconfig values for an app at once and cache the resultsRobin Appelman2013-12-181-54/+84
* | | | Merge pull request #4378 from owncloud/fixing-3417-masterThomas Müller2013-12-192-10/+22
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'owncloud/master' into fixing-3417-masterAndreas Fischer2013-12-1844-91/+130
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge remote-tracking branch 'owncloud/master' into fixing-3417-masterAndreas Fischer2013-12-14399-5175/+17761
| |\ \ \ \
| * | | | | Do not mention php.ini, it may be defined in xcache.ini or so.Andreas Fischer2013-08-151-1/+1
| * | | | | Make it clear that log message is about the XCache opcode cache.Andreas Fischer2013-08-151-1/+1
| * | | | | xCache -> XCacheAndreas Fischer2013-08-151-1/+1
| * | | | | Add link to XCache API in class documentation.Andreas Fischer2013-08-151-0/+4
| * | | | | xcache_unset_by_prefix() returns feedback, return it.Andreas Fischer2013-08-151-1/+1
| * | | | | Clear xCache OpCode cache instead of variable cache in clearOpcodeCache().Andreas Fischer2013-08-151-1/+1
| * | | | | Allow usage of xCache variable cache if xcache_unset_by_prefix() is present.Andreas Fischer2013-08-151-2/+4
| * | | | | Do not define xcache_unset_by_prefix() if it does not exist.Andreas Fischer2013-08-151-8/+6
| * | | | | don't use xcache in case admin auth is enabled in php.ini - this can cause is...Thomas Müller2013-08-091-4/+9
| * | | | | don't call xcache_clear_cache on clearOpcodeCache() in case admin auth is ena...Thomas Müller2013-08-091-1/+5
* | | | | | Merge pull request #6503 from owncloud/finally-kill-mdb2-masterVincent Petry2013-12-191-6/+6
|\ \ \ \ \ \
| * | | | | | fix return statementThomas Müller2013-12-191-2/+2
| * | | | | | kill MDB2 in PHPDocThomas Müller2013-12-191-4/+4
* | | | | | | Merge pull request #6502 from owncloud/core-extramimetypesFrank Karlitschek2013-12-181-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Added missing mime typesVincent Petry2013-12-181-2/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6476 from ogasser/dbal_precision_scaleThomas Müller2013-12-181-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | DB: Support DECIMAL(precision,scale) syntax in XMLOliver Gasser2013-12-171-0/+8
* | | | | | Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixesThomas Müller2013-12-183-4/+19
|\ \ \ \ \ \
| * | | | | | Fixed download file from URL error messagesVincent Petry2013-12-123-4/+19
* | | | | | | Merge pull request #6461 from owncloud/check-xcache-varsizeThomas Müller2013-12-181-3/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Do not use xcache variable cache if cache size is 0.Andreas Fischer2013-12-171-3/+7
* | | | | | | Merge pull request #6256 from owncloud/session-preserver-thirdpartyThomas Müller2013-12-182-2/+13
|\ \ \ \ \ \ \
| * | | | | | | check if a $_SESSION entry exists before we try to remove itRobin Appelman2013-12-111-1/+3
| * | | | | | | preserve 3rd party values in in the Session destructorRobin Appelman2013-12-092-2/+11
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-172-0/+4
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #6436 from owncloud/allconfig-defaultsFrank Karlitschek2013-12-172-10/+29
|\ \ \ \ \ \ \
| * | | | | | | Also add default to the \OCP\IConfig interfaceRobin Appelman2013-12-162-5/+18
| * | | | | | | add default parameter for AllConfig->get*Value()Robin Appelman2013-12-161-6/+12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-1732-62/+40
* | | | | | | Merge pull request #6438 from owncloud/core-logexceptionfixThomas Müller2013-12-172-4/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Do not use L10n when logging exceptionsVincent Petry2013-12-162-4/+2
| |/ / / / /
* | | | | | Use DEBUG instead of ERROR when favourites not found. Fix #6419Thomas Tanghus2013-12-161-1/+1
* | | | | | Merge pull request #6315 from owncloud/ingroup-cacheicewind19912013-12-161-7/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | remove unneeded ; in commentRobin Appelman2013-12-121-1/+1
| * | | | | user Group->users as assosiative arrayRobin Appelman2013-12-111-5/+3
| * | | | | cache the result from inGroupRobin Appelman2013-12-111-7/+20
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-131-0/+1
* | | | | dont try to register background jobs if we haven't upgraded yetRobin Appelman2013-12-132-46/+51
* | | | | coding styleArthur Schiwon2013-12-131-0/+1
* | | | | coding styleArthur Schiwon2013-12-131-1/+1