Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make update server URL configurable | Lukas Reschke | 2016-05-09 | 3 | -65/+38 |
| | | | | Currently testing the updates is a big problem and not really super easy possible. Since we now have a new updater server we should also make this configurable so that people can properly test updates. | ||||
* | Merge pull request #24419 from owncloud/allow-di-for-migration-steps | Thomas Müller | 2016-05-09 | 1 | -7/+12 |
|\ | | | | | Allow migration steps to use automatic DI | ||||
| * | Allow migration steps to use automatic DI | Joas Schilling | 2016-05-03 | 1 | -7/+12 |
| | | |||||
* | | Merge pull request #24473 from owncloud/fix-oracle-ci | Morris Jobke | 2016-05-09 | 1 | -2/+28 |
|\ \ | | | | | | | Wait a while even after successful conect ... | ||||
| * | | Use docker for mysql as well - optionally | Thomas Müller | 2016-05-06 | 1 | -1/+27 |
| | | | |||||
| * | | Wait a while even after successful conect ... | Thomas Müller | 2016-05-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #24492 from owncloud/fix_unit_tests_24457 | Thomas Müller | 2016-05-09 | 1 | -14/+14 |
|\ \ \ | | | | | | | | | Fix unit tests broken after #24457 | ||||
| * | | | Fix unit tests broken after #24457 | Roeland Jago Douma | 2016-05-09 | 1 | -14/+14 |
|/ / / | | | | | | | | | | Timeout was increased but tests were not updated. | ||||
* | | | Merge pull request #24466 from owncloud/issue_13936_wording_ldap | Morris Jobke | 2016-05-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | wording in LDAP wizard | ||||
| * | | | wording in LDAP wizard | davicente | 2016-05-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #24457 from JetUni/patch-1 | Thomas Müller | 2016-05-09 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Set higher timeout limit | ||||
| * | | | | Set higher timeout limit | Jarrett | 2016-05-05 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | Set the timeout limit to be 20 instead of 5 for machines that take longer to load the apps from apps.owncloud.org so that it doesn't show up blank. | ||||
* | | | | | Merge pull request #24490 from owncloud/capability_psr4 | Thomas Müller | 2016-05-09 | 1 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Move \OCP\Capabilities to PSR-4 | ||||
| * | | | | | Move \OCP\Capabilities to PSR-4 | Roeland Jago Douma | 2016-05-09 | 1 | -0/+0 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-09 | 14 | -16/+98 |
|/ / / / / | |||||
* | | | | | Merge pull request #24483 from owncloud/backgroundjob_psr4 | Thomas Müller | 2016-05-09 | 2 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Move \OCP\BackgroundJob to PSR-4 | ||||
| * | | | | | Move \OCP\BackgroundJob to PSR-4 | Roeland Jago Douma | 2016-05-07 | 2 | -0/+0 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-08 | 18 | -2/+124 |
|/ / / / / | |||||
* | | | | | Merge pull request #24475 from owncloud/appframework_psr4 | Morris Jobke | 2016-05-07 | 30 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Move \OCP\AppFramework to PSR-4 | ||||
| * | | | | | Move \OCP\AppFramework to PSR-4 | Roeland Jago Douma | 2016-05-06 | 30 | -0/+0 |
| | |_|/ / | |/| | | | |||||
* / | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-07 | 26 | -8/+240 |
|/ / / / | |||||
* | | | | Merge pull request #24468 from owncloud/app_psr4 | Lukas Reschke | 2016-05-06 | 2 | -0/+0 |
|\ \ \ \ | | | | | | | | | | | Move \OCP\App to PSR-4 | ||||
| * | | | | Move \OCP\App to PSR-4 | Roeland Jago Douma | 2016-05-06 | 2 | -0/+0 |
| | | | | | |||||
* | | | | | Merge pull request #24400 from owncloud/cache_shareManager | Vincent Petry | 2016-05-06 | 1 | -4/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | Cache shareManager | ||||
| * | | | | Cache shareManager | Roeland Jago Douma | 2016-05-02 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to call \OC::$server->getShareManager for each Node. We have it available so better pass it around. | ||||
* | | | | | Merge pull request #24455 from owncloud/activity_psr4 | Thomas Müller | 2016-05-06 | 5 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Move \OCP\Activity to PSR-4 | ||||
| * | | | | | Update .mention-bot for lib/public/Activity | Roeland Jago Douma | 2016-05-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Move \OCP\Activity to PSR-4 | Roeland Jago Douma | 2016-05-05 | 4 | -0/+0 |
| | |_|/ / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-06 | 28 | -22/+184 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-05 | 64 | -30/+284 |
|/ / / | |||||
* | | | Merge pull request #24435 from owncloud/fix-log-usage | Thomas Müller | 2016-05-04 | 2 | -4/+5 |
|\ \ \ | | | | | | | | | Fix usages of OC\Log\Owncloud | ||||
| * | | | Fix usages of OC\Log\Owncloud | Joas Schilling | 2016-05-04 | 2 | -4/+5 |
| | | | | |||||
* | | | | Merge pull request #24432 from ↵ | Morris Jobke | 2016-05-04 | 2 | -1/+10 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/issue-24270-never-save-app-language-into-request-lang Do not save the language as request lang for apps when we didn't find… | ||||
| * | | | | Do not save the language as request lang for apps when we didn't find any | Joas Schilling | 2016-05-04 | 2 | -1/+10 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #24410 from owncloud/fix_24182 | Björn Schießle | 2016-05-04 | 1 | -2/+5 |
|\ \ \ \ | |_|/ / |/| | | | first call the post_login hooks, before we call getUserFolder. | ||||
| * | | | first call the post_login hooks, before we call getUserFolder. | Björn Schießle | 2016-05-03 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The login process needs to be completed before we can safely create the users home folder. For example we need to give encryption a chance to initialize the users encryption keys in order to copy the skeleton files correctly | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-04 | 204 | -3282/+3308 |
| | | | | |||||
* | | | | Merge pull request #24406 from ↵ | Roeland Douma | 2016-05-04 | 12 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/psr4-comments-systemtags-updatenotifications Move comments, systemtags and updatenotifications to PSR-4 | ||||
| * | | | | Move comments, systemtags and updatenotifications to PSR-4 | Joas Schilling | 2016-05-03 | 12 | -1/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #24411 from owncloud/share_psr4 | Roeland Douma | 2016-05-04 | 5 | -0/+0 |
|\ \ \ \ | | | | | | | | | | | Move \OC\Share to PSR-4 | ||||
| * | | | | Move \OC\Share to PSR-4 | Roeland Jago Douma | 2016-05-03 | 5 | -0/+0 |
| | | | | | |||||
* | | | | | Merge pull request #24396 from owncloud/ctrlEnter-submit-comment | blizzz | 2016-05-03 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Adds functionality to submit comment on ctrl+Enter | ||||
| * | | | | | fixes indentation | Vincent Chan | 2016-05-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | adds functionality to submit comments with cmd+Enter | Vincent Chan | 2016-05-03 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Submit comment on ctrl+Enter | Vincent Chan | 2016-05-02 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | closes #24302 | ||||
* | | | | | | Merge pull request #23844 from owncloud/disable-user | Thomas Müller | 2016-05-03 | 17 | -55/+620 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add occ commands to enable and disable a user + a disabled user can n… | ||||
| * | | | | | | Modified expected output according to rullzer | Sergio Bertolin | 2016-05-02 | 2 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | OCS API should catch LoginExceptions | Roeland Jago Douma | 2016-05-02 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catching the login exception and returning false (login failed). Makes the OCS API properly return data instead of printing the exception page. | ||||
| * | | | | | | Added integration tests directly in the code PR | Sergio Bertolín | 2016-05-02 | 4 | -3/+259 |
| | | | | | | | |||||
| * | | | | | | Integration test for a disabled user | Thomas Müller | 2016-05-02 | 3 | -1/+33 |
| | | | | | | |