summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14195 from owncloud/activity-manager-performance-improvem...Lukas Reschke2015-02-243-64/+106
|\
| * Order methods to by grouped by their taskJoas Schilling2015-02-133-74/+74
| * Check whether filter is valid, before doing stuff for itJoas Schilling2015-02-131-1/+12
| * Cache some values from the extensionsJoas Schilling2015-02-131-0/+31
* | Merge pull request #14282 from owncloud/disable-non-shipped-apps-masterThomas Müller2015-02-243-72/+79
|\ \
| * | 3rd-party apps are only disabled in case core is upgradedThomas Müller2015-02-241-0/+14
| * | shipped and 3rd-party apps of type authentication and session will remain ena...Thomas Müller2015-02-241-3/+11
| * | 3rd-party apps are disabled on upgrade - refs #14026Thomas Müller2015-02-243-72/+57
* | | Merge pull request #11555 from goodkiller/patch-1Joas Schilling2015-02-241-1/+2
|\ \ \
| * | | Update group.phpgoodkiller2014-10-141-1/+2
* | | | Merge pull request #13340 from owncloud/use-http-onlyLukas Reschke2015-02-241-10/+13
|\ \ \ \
| * | | | Use "HTTPOnly" for cookies when logging outLukas Reschke2015-01-141-10/+13
* | | | | Dont break code which relies on the cursor being open after insert/update/deleteBernhard Posselt2015-02-241-1/+0
| |_|/ / |/| | |
* | | | Merge pull request #14009 from owncloud/installing-installed-apps-is-stupidThomas Müller2015-02-243-99/+108
|\ \ \ \
| * | | | app store can be used with any editionThomas Müller2015-02-231-3/+1
| * | | | don't allow installation of already installed apps - fixes #14004Thomas Müller2015-02-233-99/+110
* | | | | Merge pull request #14442 from owncloud/fix-oracle-ci-masterLukas Reschke2015-02-241-1/+2
|\ \ \ \ \
| * | | | | Close the cursor after the affected count has been extracted.Thomas Müller2015-02-231-1/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2422-44/+90
| |/ / / / |/| | | |
* | | | | Merge pull request #14416 from owncloud/setup-commandThomas Müller2015-02-236-36/+53
|\ \ \ \ \
| * | | | | properly initialize OC::$WEBROOT and host nameThomas Müller2015-02-232-12/+17
| * | | | | implement command maintenance:installThomas Müller2015-02-231-0/+3
| * | | | | Fix namespace of OC_Setup -> \OC\SetupThomas Müller2015-02-234-24/+33
| |/ / / /
* | | | | Merge pull request #14119 from owncloud/dbal251Thomas Müller2015-02-231-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Skip primary index if the table has oneVictor Dubiniuk2015-02-161-0/+3
* | | | | Merge pull request #13829 from owncloud/appmanager-listVincent Petry2015-02-236-111/+183
|\ \ \ \ \
| * | | | | allow overwriting the appmanager in oc_util by subclassingRobin Appelman2015-02-181-1/+5
| * | | | | Use appmanager in OC_App::enable/disableRobin Appelman2015-02-171-3/+5
| * | | | | better name for getAppsEnabledForUserRobin Appelman2015-02-173-3/+3
| * | | | | also set user in UserSession when doing OC_User::setUserIdRobin Appelman2015-02-171-5/+36
| * | | | | better user group cachingRobin Appelman2015-02-171-10/+1
| * | | | | Update cache when enabling/disabling appsRobin Appelman2015-02-171-1/+4
| * | | | | Use the app manager from oc_appRobin Appelman2015-02-161-75/+67
| * | | | | Add getInstalledApps and getAppsForUser to the app managerRobin Appelman2015-02-162-17/+66
* | | | | | Merge pull request #14427 from owncloud/fix-some-php-docsBernhard Posselt2015-02-231-3/+4
|\ \ \ \ \ \
| * | | | | | Fix some PHPDocsLukas Reschke2015-02-231-3/+4
* | | | | | | Merge pull request #14403 from owncloud/update-license-headersThomas Müller2015-02-23449-4412/+8309
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Updating license headersJenkins for ownCloud2015-02-23449-4412/+8309
* | | | | | | Merge pull request #14422 from owncloud/use-off-and-offThomas Müller2015-02-231-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Use "off" and "off" instead of true booleansLukas Reschke2015-02-231-1/+4
| |/ / / / / /
* | | | | | | Merge pull request #14275 from chris-se/masterLukas Reschke2015-02-231-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | DAV authentication: also use Owncloud's internal user for short-circuitChristian Seiler2015-02-161-1/+1
| * | | | | | DAV authentication: use Owncloud's internal user instead of HTTP-supplied oneChristian Seiler2015-02-161-2/+5
* | | | | | | Merge pull request #14414 from owncloud/add-ini-helperThomas Müller2015-02-221-1/+27
|\ \ \ \ \ \ \
| * | | | | | | Add helper to check for `ini` values in `OC_Util::checkServer`Lukas Reschke2015-02-211-1/+27
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-222-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #13777 from owncloud/close-cursorLukas Reschke2015-02-202-21/+29
|\ \ \ \ \ \ \
| * | | | | | | ignore cursorclosingBernhard Posselt2015-01-292-21/+29
* | | | | | | | Merge pull request #13767 from owncloud/issue/13764-mimetype-raceconditionThomas Müller2015-02-201-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Use insertIfNotExists() and reload mimetypes after inserting oneJoas Schilling2015-02-021-3/+7