summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Infowarning about 32bitArthur Schiwon2014-01-081-0/+1
* add tests for user countingArthur Schiwon2014-01-081-0/+9
* if backends have the same class name, sum their users up instead of overwritingArthur Schiwon2014-01-081-1/+5
* Introduce user count action to user managementArthur Schiwon2014-01-073-7/+42
* Merge pull request #6031 from s0taka/masterMorris Jobke2014-01-051-1/+1
|\
| * No decimal points for Kilobyte and Byte #5371.Simon Könnecke2013-11-251-1/+1
* | Merge pull request #6610 from owncloud/apcu-clearicewind19912014-01-031-1/+1
|\ \
| * | Fix APCIterator syntax in \OC\Memcache\APCU::clearRobin Appelman2014-01-021-1/+1
* | | Merge pull request #6605 from owncloud/free_space_disabledThomas Müller2014-01-021-1/+1
|\ \ \ | |/ / |/| |
| * | Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free spa...Robin Appelman2014-01-021-1/+1
* | | Merge pull request #6513 from owncloud/user-no-change-displaynameicewind19912014-01-023-14/+50
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into user-no-change-displaynameRobin Appelman2013-12-199-76/+159
| |\ \
| * | | Replace static usage of OC_Config and OC_Preferences with the injected \OC\Co...Robin Appelman2013-12-181-5/+13
| * | | fix the config option to remove the ability for users to set their displaynameRobin Appelman2013-12-183-9/+37
* | | | Merge pull request #6601 from AdamWill/pimple-includeThomas Müller2014-01-011-1/+1
|\ \ \ \
| * | | | don't specify path to 3rdparty directory when registering Pimple autoloaderAdam Williamson2014-01-011-1/+1
* | | | | Add support mimetypelolozere2014-01-011-0/+3
* | | | | Revert "Added support for extra backends (see pull request #5043)"Niklas Sombert2014-01-011-2/+0
* | | | | Added support for extra backends (see pull request #5043)Niklas Sombert2014-01-011-0/+2
|/ / / /
* | | | Merge pull request #6520 from owncloud/tests-testcleanuplistenerThomas Müller2013-12-242-1/+13
|\ \ \ \
| * | | | Added test cleanup listener to detect untidy testsVincent Petry2013-12-192-1/+13
* | | | | Merge pull request #6449 from owncloud/core-appsorderfixThomas Müller2013-12-242-5/+7
|\ \ \ \ \
| * | | | | Fixed apps loading orderVincent Petry2013-12-202-5/+7
* | | | | | Remove OC_DB_StatementWrapper::numRows().Andreas Fischer2013-12-211-19/+0
|/ / / / /
* | | | | Merge pull request #6262 from nickvergessen/issue/4375Frank Karlitschek2013-12-201-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | correctly mark app management activeJoas Schilling2013-12-091-0/+1
* | | | | 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-189-24/+65
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'owncloud/master' into fixing-3417-masterAndreas Fischer2013-12-142-12/+25
* | | | | | | 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-182-4/+11
|\ \ \ \ \ \
| * | | | | | Fixed download file from URL error messagesVincent Petry2013-12-122-4/+11
* | | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6436 from owncloud/allconfig-defaultsFrank Karlitschek2013-12-171-7/+17
|\ \ \ \ \ \
| * | | | | | Also add default to the \OCP\IConfig interfaceRobin Appelman2013-12-161-2/+6
| * | | | | | add default parameter for AllConfig->get*Value()Robin Appelman2013-12-161-6/+12
| | |_|/ / / | |/| | | |