summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-292-0/+6
* Merge pull request #12499 from owncloud/disableMSSQLLukas Reschke2014-11-281-1/+1
|\
| * Disable OCI as it is unsupported by most CE appsLukas Reschke2014-11-281-1/+1
| * Disable MSSQL for new CE installationsLukas Reschke2014-11-281-1/+1
* | Merge pull request #12488 from owncloud/activity_group_multiple_conditionsLukas Reschke2014-11-281-2/+14
|\ \ | |/ |/|
| * concatenate queries with 'or'Bjoern Schiessle2014-11-281-2/+14
* | Merge pull request #12486 from owncloud/activity_prioritiesLukas Reschke2014-11-281-0/+7
|\ \
| * | add activity priorities to core so that other apps can reuse itBjoern Schiessle2014-11-281-0/+7
| |/
* | Merge pull request #12483 from owncloud/issue/6101-preview-providersLukas Reschke2014-11-2821-424/+491
|\ \ | |/ |/|
| * Split bitmap providers into one per fileJoas Schilling2014-11-287-74/+119
| * Split office providers into one class per fileJoas Schilling2014-11-288-125/+166
| * Fix intendation and doc blocks of preview providersJoas Schilling2014-11-288-116/+143
| * Move registration of core preview providers to previewJoas Schilling2014-11-2710-132/+86
* | Merge pull request #12472 from owncloud/modifyCookiesMorris Jobke2014-11-286-16/+112
|\ \
| * | Pass \OC::$WEBROOT to the ctrLukas Reschke2014-11-272-5/+12
| * | Remove redundant codeLukas Reschke2014-11-271-3/+3
| * | Use server containerLukas Reschke2014-11-273-1/+17
| * | Add functions to modify cookies to response classLukas Reschke2014-11-273-9/+82
* | | Merge pull request #12443 from owncloud/issue/6101-all-classes-autoloadableMorris Jobke2014-11-288-98/+171
|\ \ \
| * | | Move NaturalSort_DefaultCollator to its own fileJoas Schilling2014-11-272-11/+19
| * | | Move iHomeStorage to own fileJoas Schilling2014-11-272-4/+24
| * | | Move share interfaces to own files so they can be autoloadedJoas Schilling2014-11-274-83/+128
* | | | Merge pull request #12479 from rclarkson/masterMorris Jobke2014-11-281-1/+1
|\ \ \ \
| * | | | Limit blacklist to php filesRichard Clarkson2014-11-271-1/+1
| | |_|/ | |/| |
* / | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-284-2/+4
|/ / /
* | | Merge pull request #12426 from owncloud/jail-mask-wrappersRobin Appelman2014-11-276-1/+1059
|\ \ \
| * | | Add storage and cache wrappers to apply a permissions mask to a storageRobin Appelman2014-11-272-12/+53
| * | | Add storage and cache wrappers to jail a storage to a subfolderRobin Appelman2014-11-275-1/+1018
* | | | Merge pull request #12470 from owncloud/jenkins-12447Lukas Reschke2014-11-278-33/+80
|\ \ \ \
| * | | | Move OC_USER_BACKEND_* constants to OC_User_Backend classJoas Schilling2014-11-274-22/+47
| * | | | Move OC_GROUP_BACKEND_* constants to OC_Group_Backend classJoas Schilling2014-11-274-11/+33
* | | | | Merge pull request #12462 from owncloud/issue/12460-localstorage-buildpathVincent Petry2014-11-272-63/+79
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove unused 2nd parameter of buildPath() and rename to getSourcePath()Joas Schilling2014-11-271-32/+33
| * | | | Introduce getSourcePath() in Storage\Local to reduce the difference to Mapped...Joas Schilling2014-11-271-31/+46
| | |/ / | |/| |
* | | | Merge pull request #12449 from owncloud/issue/12444-namespace-exceptionsJoas Schilling2014-11-2711-44/+59
|\ \ \ \
| * | | | Replace exception with standard exceptionJoas Schilling2014-11-271-4/+1
| * | | | Correctly namespace and autoload DatabaseExceptionJoas Schilling2014-11-274-27/+36
| * | | | Correctly namespace DatabaseSetupExceptionJoas Schilling2014-11-266-13/+22
| |/ / /
* | | | Merge pull request #12418 from owncloud/delete_previewsMorris Jobke2014-11-271-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | delete old previewsGeorg Ehrke2014-11-251-1/+1
* | | | Merge pull request #12464 from owncloud/cache-available-languagesVincent Petry2014-11-271-0/+6
|\ \ \ \
| * | | | Cache results of available languagesLukas Reschke2014-11-271-0/+6
| | |/ / | |/| |
* | | | Merge pull request #12451 from owncloud/issue/6101-remove-gettype-classVincent Petry2014-11-271-12/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move constants from GET_TYPE to OC\Files so they can be autoloadedJoas Schilling2014-11-261-12/+9
| |/ /
* / / remove deprecated \OC:$sessionThomas Müller2014-11-262-27/+2
|/ /
* | Merge pull request #12411 from owncloud/unknown-command-windowsLukas Reschke2014-11-261-2/+2
|\ \
| * | Replace some more "command -v" calls with the Helper methodJoas Schilling2014-11-251-2/+2
* | | Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-apiMorris Jobke2014-11-261-16/+22
|\ \ \
| * | | because OC_User::login will create a new session we shall only try to login i...Thomas Müller2014-11-261-16/+22
* | | | Merge pull request #12350 from mprokop/link_expirationMorris Jobke2014-11-261-3/+6
|\ \ \ \ | |/ / / |/| | |