summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #14459 from owncloud/fix-oracleLukas Reschke2015-02-241-1/+0
|\ \
| * | Dont break code which relies on the cursor being open after insert/update/deleteBernhard Posselt2015-02-241-1/+0
|/ /
* | Merge pull request #10830 from Finkregh/patch-1Lukas Reschke2015-02-241-0/+11
|\ \
| * | add howto dump the ldap-backends' configurationOluf Lorenzen2014-09-031-0/+9
| * | add question about user-backendOluf Lorenzen2014-09-031-0/+2
* | | Merge pull request #10599 from owncloud/move_passwordchange_textLukas Reschke2015-02-244-9/+17
|\ \ \
| * | | add fix for checkmark icon for IE8Morris Jobke2015-02-121-0/+4
| * | | Make the password changed msg inline to fix #10242kondou2015-02-113-9/+13
* | | | Merge pull request #14009 from owncloud/installing-installed-apps-is-stupidThomas Müller2015-02-244-105/+137
|\ \ \ \
| * | | | 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-234-105/+139
* | | | | Merge pull request #14419 from owncloud/preview_apostrophe_fixJoas Schilling2015-02-241-2/+2
|\ \ \ \ \
| * | | | | fix issue with previews not being displayed if filename contains apostropheGeorg Ehrke2015-02-221-2/+2
* | | | | | 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-2430-56/+186
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #14433 from owncloud/fix-public-phpThomas Müller2015-02-231-3/+4
|\ \ \ \ \ \
| * | | | | | Use `getParam` instead of `server`Lukas Reschke2015-02-231-3/+4
* | | | | | | Merge pull request #14416 from owncloud/setup-commandThomas Müller2015-02-2311-76/+223
|\ \ \ \ \ \ \
| * | | | | | | properly initialize OC::$WEBROOT and host nameThomas Müller2015-02-232-12/+17
| * | | | | | | Fix error handlingThomas Müller2015-02-231-1/+6
| * | | | | | | implement command maintenance:installThomas Müller2015-02-234-34/+162
| * | | | | | | Fix namespace of OC_Setup -> \OC\SetupThomas Müller2015-02-236-30/+39
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #13439 from owncloud/app-filterThomas Müller2015-02-234-49/+194
|\ \ \ \ \ \ \
| * | | | | | | Added unit test for app filterVincent Petry2015-02-234-57/+175
| * | | | | | | Make the search box filter appsRobin Appelman2015-02-191-0/+27
* | | | | | | | Merge pull request #14119 from owncloud/dbal251Thomas Müller2015-02-232-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Skip primary index if the table has oneVictor Dubiniuk2015-02-161-0/+3
| * | | | | | | Submodule updateVictor Dubiniuk2015-02-161-0/+0
* | | | | | | | Merge pull request #14439 from owncloud/fix-ajax-files-externalLukas Reschke2015-02-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Ajax type casting for files_externalRobin McCorkell2015-02-231-1/+1
* | | | | | | | | Merge pull request #13829 from owncloud/appmanager-listVincent Petry2015-02-2311-173/+264
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | allow overwriting the appmanager in oc_util by subclassingRobin Appelman2015-02-182-27/+32
| * | | | | | | | Use appmanager in OC_App::enable/disableRobin Appelman2015-02-171-3/+5
| * | | | | | | | Dont fatal error test when encryption is enabledRobin Appelman2015-02-171-2/+2
| * | | | | | | | better name for getAppsEnabledForUserRobin Appelman2015-02-174-4/+4
| * | | | | | | | also set user in UserSession when doing OC_User::setUserIdRobin Appelman2015-02-171-5/+36
| * | | | | | | | Test improvementsRobin Appelman2015-02-172-37/+16
| * | | | | | | | 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-162-78/+77
| * | | | | | | | Add getInstalledApps and getAppsForUser to the app managerRobin Appelman2015-02-163-17/+98
* | | | | | | | | 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-23802-7443/+15510
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Updating license headersJenkins for ownCloud2015-02-23800-7443/+14939
| * | | | | | | | Adding .mailmap - helps to add unified authors to the license headerThomas Müller2015-02-221-0/+405
| * | | | | | | | php script which updates the license header in all php file in the repoThomas Müller2015-02-221-0/+166