summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24500 from owncloud/updater-server-configurableThomas Müller2016-05-093-65/+38
|\
| * Make update server URL configurableLukas Reschke2016-05-093-65/+38
* | Merge pull request #24491 from owncloud/new-animated-full-css-spinnerThomas Müller2016-05-098-12/+88
|\ \ | |/ |/|
| * New animated loaderskjnldsv2016-05-098-12/+88
* | Merge pull request #24419 from owncloud/allow-di-for-migration-stepsThomas Müller2016-05-091-7/+12
|\ \
| * | Allow migration steps to use automatic DIJoas Schilling2016-05-031-7/+12
* | | Merge pull request #24473 from owncloud/fix-oracle-ciMorris Jobke2016-05-091-2/+28
|\ \ \
| * | | Use docker for mysql as well - optionallyThomas Müller2016-05-061-1/+27
| * | | Wait a while even after successful conect ...Thomas Müller2016-05-061-1/+1
* | | | Merge pull request #24492 from owncloud/fix_unit_tests_24457Thomas Müller2016-05-091-14/+14
|\ \ \ \
| * | | | Fix unit tests broken after #24457Roeland Jago Douma2016-05-091-14/+14
|/ / / /
* | | | Merge pull request #24466 from owncloud/issue_13936_wording_ldapMorris Jobke2016-05-091-1/+1
|\ \ \ \
| * | | | wording in LDAP wizarddavicente2016-05-041-1/+1
* | | | | Merge pull request #24457 from JetUni/patch-1Thomas Müller2016-05-091-4/+4
|\ \ \ \ \
| * | | | | Set higher timeout limitJarrett2016-05-051-4/+4
* | | | | | Merge pull request #24490 from owncloud/capability_psr4Thomas Müller2016-05-091-0/+0
|\ \ \ \ \ \
| * | | | | | Move \OCP\Capabilities to PSR-4Roeland Jago Douma2016-05-091-0/+0
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0914-16/+98
|/ / / / / /
* | | | | | Merge pull request #24483 from owncloud/backgroundjob_psr4Thomas Müller2016-05-092-0/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Move \OCP\BackgroundJob to PSR-4Roeland Jago Douma2016-05-072-0/+0
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0818-2/+124
|/ / / / /
* | | | | Merge pull request #24475 from owncloud/appframework_psr4Morris Jobke2016-05-0730-0/+0
|\ \ \ \ \
| * | | | | Move \OCP\AppFramework to PSR-4Roeland Jago Douma2016-05-0630-0/+0
| | |_|/ / | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0726-8/+240
|/ / / /
* | | | Merge pull request #24468 from owncloud/app_psr4Lukas Reschke2016-05-062-0/+0
|\ \ \ \
| * | | | Move \OCP\App to PSR-4Roeland Jago Douma2016-05-062-0/+0
* | | | | Merge pull request #24400 from owncloud/cache_shareManagerVincent Petry2016-05-061-4/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Cache shareManagerRoeland Jago Douma2016-05-021-4/+5
* | | | | Merge pull request #24455 from owncloud/activity_psr4Thomas Müller2016-05-065-1/+1
|\ \ \ \ \
| * | | | | Update .mention-bot for lib/public/ActivityRoeland Jago Douma2016-05-061-1/+1
| * | | | | Move \OCP\Activity to PSR-4Roeland Jago Douma2016-05-054-0/+0
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0628-22/+184
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0564-30/+284
|/ / /
* | | Merge pull request #24435 from owncloud/fix-log-usageThomas Müller2016-05-042-4/+5
|\ \ \
| * | | Fix usages of OC\Log\OwncloudJoas Schilling2016-05-042-4/+5
* | | | Merge pull request #24432 from owncloud/issue-24270-never-save-app-language-i...Morris Jobke2016-05-042-1/+10
|\ \ \ \
| * | | | Do not save the language as request lang for apps when we didn't find anyJoas Schilling2016-05-042-1/+10
| | |_|/ | |/| |
* | | | Merge pull request #24410 from owncloud/fix_24182Björn Schießle2016-05-041-2/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | first call the post_login hooks, before we call getUserFolder.Björn Schießle2016-05-031-2/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-04204-3282/+3308
* | | | Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifi...Roeland Douma2016-05-0412-1/+3
|\ \ \ \
| * | | | Move comments, systemtags and updatenotifications to PSR-4Joas Schilling2016-05-0312-1/+3
| | |/ / | |/| |
* | | | Merge pull request #24411 from owncloud/share_psr4Roeland Douma2016-05-045-0/+0
|\ \ \ \
| * | | | Move \OC\Share to PSR-4Roeland Jago Douma2016-05-035-0/+0
* | | | | Merge pull request #24396 from owncloud/ctrlEnter-submit-commentblizzz2016-05-031-2/+7
|\ \ \ \ \
| * | | | | fixes indentationVincent Chan2016-05-031-1/+1
| * | | | | adds functionality to submit comments with cmd+EnterVincent Chan2016-05-031-4/+4
| * | | | | Submit comment on ctrl+EnterVincent Chan2016-05-021-0/+5
* | | | | | Merge pull request #23844 from owncloud/disable-userThomas Müller2016-05-0317-55/+620
|\ \ \ \ \ \
| * | | | | | Modified expected output according to rullzerSergio Bertolin2016-05-022-2/+4