summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #519 from GitHubUser4234/masterblizzz2016-07-2825-97/+1084
|\
| * Nextcloud license header for new filesroot2016-07-288-64/+83
| * Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-27133-178/+914
| |\
| * | comments amendedroot2016-07-273-3/+2
| * | final changesroot2016-07-278-30/+23
| * | Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2577-175/+346
| |\ \
| * \ \ Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2218-20/+20
| |\ \ \
| * | | | New LDAPProvider for user_ldaproot2016-07-2226-98/+1074
* | | | | Merge pull request #494 from nextcloud/systemtag-managementLukas Reschke2016-07-286-1/+287
|\ \ \ \ \
| * | | | | Add a simple Admin UI to manage systemtagsJoas Schilling2016-07-276-1/+287
* | | | | | [tx-robot] updated from transifexNextcloud bot2016-07-288-16/+16
* | | | | | Merge pull request #606 from nextcloud/ocs_middleware_support_subdirMorris Jobke2016-07-272-1/+31
|\ \ \ \ \ \
| * | | | | | Support subdir in the OCS v2 endpointRoeland Jago Douma2016-07-272-1/+31
* | | | | | | Merge pull request #571 from nextcloud/no-missing-previewMorris Jobke2016-07-2713-20/+133
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix js testRobin Appelman2016-07-271-5/+10
| * | | | | | only load sidebar previews when we know it's availableRobin Appelman2016-07-272-5/+16
| * | | | | | dont load filelist previews if we know we dont have oneRobin Appelman2016-07-273-4/+22
| * | | | | | add dav property to check if a file has a preview availableRobin Appelman2016-07-278-6/+85
* | | | | | | Merge pull request #596 from nextcloud/adjust-mysql-install-errorBjörn Schießle2016-07-271-1/+9
|\ \ \ \ \ \ \
| * | | | | | | Fix misleading MySQL DB creation error (#25485)Vincent Petry2016-07-271-1/+9
| |/ / / / / /
* | | | | | | Merge pull request #598 from nextcloud/fix-defaultapp-masterBjörn Schießle2016-07-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Redirect to default page after loginBjoern Schiessle2016-07-271-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #601 from nextcloud/fix-workflowengine-loadingJoas Schilling2016-07-271-0/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix loading icon for workflowengineMorris Jobke2016-07-271-0/+5
| |/ / / / /
* | | | | | Merge pull request #582 from nextcloud/checks-from-jsJoas Schilling2016-07-278-156/+58
|\ \ \ \ \ \
| * | | | | | Allow to reuse the templateJoas Schilling2016-07-271-1/+1
| * | | | | | Fix default value of operatorJoas Schilling2016-07-271-2/+2
| * | | | | | Fix morris commentsJoas Schilling2016-07-272-6/+3
| * | | | | | Remove php side of check registrationJoas Schilling2016-07-275-118/+9
| * | | | | | Generate the checks list in JSJoas Schilling2016-07-273-36/+50
| |/ / / / /
* | | | | | Merge pull request #597 from nextcloud/fix-di-of-workflow-managerJoas Schilling2016-07-271-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow DI of the workflow manager by the OCP interfaceJoas Schilling2016-07-271-0/+4
|/ / / / /
* | | | | Merge pull request #565 from nextcloud/workflowengineJoas Schilling2016-07-2720-6/+1557
|\ \ \ \ \
| * | | | | fix enabled apps testsMorris Jobke2016-07-271-0/+5
| * | | | | fix unit testsMorris Jobke2016-07-261-2/+2
| * | | | | Add app to provisioning outputJoas Schilling2016-07-261-0/+1
| * | | | | Move template to workflowengine appMorris Jobke2016-07-261-0/+79
| * | | | | create an operation based on the correct modelMorris Jobke2016-07-261-6/+1
| * | | | | Add workflowengineMorris Jobke2016-07-2617-4/+1475
* | | | | | Merge pull request #566 from nextcloud/setup-portMorris Jobke2016-07-271-10/+26
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | revert to old setup connection logicRobin Appelman2016-07-261-10/+26
| |/ / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2016-07-2774-56/+130
* | | | | Merge pull request #349 from nextcloud/ldab-groupOfUniqueNamesblizzz2016-07-261-1/+1
|\ \ \ \ \
| * | | | | add groupOfUniqueNames as valid group object classRobin Appelman2016-07-081-1/+1
* | | | | | Add app icons for Comments and Tags (#579)Jan-Christoph Borchardt2016-07-262-0/+8
* | | | | | Merge pull request #563 from nextcloud/log-internet-connection-exceptionMorris Jobke2016-07-262-2/+10
|\ \ \ \ \ \
| * | | | | | Log exception that is thrown by internet connection checkMorris Jobke2016-07-262-2/+10
* | | | | | | Merge pull request #567 from nextcloud/wb-admin-log-buttonsJoas Schilling2016-07-262-10/+13
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Orders Admin Log Buttonroot2016-07-262-10/+13
|/ / / / / /
* | | | | | Merge pull request #525 from nextcloud/fix-theme-logo-positionJoas Schilling2016-07-264-9/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |