summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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-4
| * 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-4
| * 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 shareManager
| * Cache shareManagerRoeland Jago Douma2016-05-021-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_psr4Thomas Müller2016-05-065-1/+1
|\ \ | | | | | | Move \OCP\Activity to PSR-4
| * | 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\Owncloud
| * | Fix usages of OC\Log\OwncloudJoas Schilling2016-05-042-4/+5
| | |
* | | Merge pull request #24432 from ↵Morris Jobke2016-05-042-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 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.
| * | | first call the post_login hooks, before we call getUserFolder.Björn Schießle2016-05-031-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 transifexJenkins for ownCloud2016-05-04204-3282/+3308
| | | |
* | | | Merge pull request #24406 from ↵Roeland Douma2016-05-0412-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/psr4-comments-systemtags-updatenotifications Move comments, systemtags and updatenotifications to PSR-4
| * | | | 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-4
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Adds functionality to submit comment on ctrl+Enter
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | closes #24302
* | | | | | Merge pull request #23844 from owncloud/disable-userThomas Müller2016-05-0317-55/+620
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add occ commands to enable and disable a user + a disabled user can n…
| * | | | | | Modified expected output according to rullzerSergio Bertolin2016-05-022-2/+4
| | | | | | |
| * | | | | | OCS API should catch LoginExceptionsRoeland Jago Douma2016-05-021-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 PRSergio Bertolín2016-05-024-3/+259
| | | | | | |
| * | | | | | Integration test for a disabled userThomas Müller2016-05-023-1/+33
| | | | | | |
| * | | | | | Add provisioning api to enable and disable usersThomas Müller2016-05-023-19/+128
| | | | | | |
| * | | | | | Add occ commands to enable and disable a user + a disabled user can no ↵Thomas Müller2016-05-028-34/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | longer login - fixes #23838
* | | | | | | Merge pull request #24389 from owncloud/login-by-emailLukas Reschke2016-05-037-5/+60
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Allow login by email address
| * | | | | | Allow login by email addressThomas Müller2016-05-022-5/+13
| | | | | | |
| * | | | | | Fixing local event delivery for calendar events based on the email addressThomas Müller2016-05-025-0/+47
| | | | | | |
* | | | | | | Merge pull request #24387 from owncloud/locking-mark-reload-freeThomas Müller2016-05-031-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | free up memory when releasing the last shared lock
| * | | | | | | free up memory when releasing the last shared lockRobin Appelman2016-05-021-0/+3
| | | | | | | |
* | | | | | | | Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xmlThomas Müller2016-05-038-12/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Declare cron jobs in info.xml
| * | | | | | | | Add background job declaration of dav app to info.xmlThomas Müller2016-05-034-7/+3
| | | | | | | | |
| * | | | | | | | Allow declaration of background jobs in info.xmlThomas Müller2016-05-034-5/+20
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #24408 from owncloud/improve-server-containerThomas Müller2016-05-032-3/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve server container
| * | | | | | | | Add methods to public interfaceJoas Schilling2016-05-031-0/+12
| | | | | | | | |
| * | | | | | | | Fix doc blockJoas Schilling2016-05-031-1/+1
| | | | | | | | |
| * | | | | | | | Use internal tag so IDEs highlight the usageJoas Schilling2016-05-031-2/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #24405 from owncloud/user_db_capped_cacheThomas Müller2016-05-031-1/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use a CappedCache in the user database backend
| * | | | | | | | Use a CappedCache in the user database backendRoeland Jago Douma2016-05-031-1/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running with a user database backend on large installations the cache can grow to significant sizes. This can be especially problematic when running big cron/repair jobs.
* | | | | | | | Merge pull request #24404 from owncloud/log_psr4Thomas Müller2016-05-0310-18/+29
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Move from OC_Log_XX to \OC\Log