summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Disable failing app management testMorris Jobke2019-03-141-16/+16
* Disable failing comments app test - act 2Morris Jobke2019-03-141-6/+6
* Disable failing files app test - act 2Morris Jobke2019-03-141-10/+10
* Merge pull request #12119 from nextcloud/add_circle_to_caldav_and_filepanel-15Morris Jobke2019-03-147-11/+77
|\
| * Improve codeMorris Jobke2019-03-131-2/+2
| * Use dependency injection for app managerMorris Jobke2019-03-134-5/+25
| * Created infrastructure to show circles' shared filesVinicius Cubas Brand2019-03-134-7/+53
* | Merge pull request #14670 from nextcloud/bugfix/noid/theming-css-varsJulius Härtl2019-03-141-3/+3
|\ \
| * | Use SCSS variables since CSS vars are not loaded on public pagesJulius Härtl2019-03-131-3/+3
|/ /
* | Merge pull request #14663 from nextcloud/remove_userExternal_exampleRoeland Jago Douma2019-03-131-12/+0
|\ \
| * | 👌 IMPROVE: remove user_external example from config.sample.phpJonas Sulzer2019-03-131-12/+0
* | | Merge pull request #14640 from nextcloud/techdebt/noid/disable-failing-testsMorris Jobke2019-03-139-263/+272
|\ \ \
| * | | Wait up to 10 seconds for incoming changes from SMB notifierMorris Jobke2019-03-131-1/+8
| * | | Disable fragile user acceptance testsMorris Jobke2019-03-131-18/+18
| * | | Disable failing login testMorris Jobke2019-03-131-10/+10
| * | | Disable failing comments testMorris Jobke2019-03-131-8/+8
| * | | Disable failing files app testMorris Jobke2019-03-131-114/+114
| * | | Disable failing apps management testMorris Jobke2019-03-131-3/+3
| * | | Disable failing files tag testMorris Jobke2019-03-131-76/+76
| * | | Disable failing federated sharing testsMorris Jobke2019-03-131-31/+31
| * | | Do not run fragile TrashbinTestMorris Jobke2019-03-131-2/+4
| | |/ | |/|
* | | Merge pull request #14656 from nextcloud/trash-prevent-recursionMorris Jobke2019-03-131-1/+4
|\ \ \
| * | | prevent recursion when moving a file to the trashbinRobin Appelman2019-03-131-1/+4
| |/ /
* | | Merge pull request #14644 from nextcloud/fix/noid/remove-sensitive-smb-valuesRoeland Jago Douma2019-03-131-0/+6
|\ \ \ | |/ / |/| |
| * | Remove sensitive SMB arguments from exception logMorris Jobke2019-03-121-0/+6
* | | Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldavMorris Jobke2019-03-1314-8/+114
|\ \ \ | |/ / |/| |
| * | Fix PHPUnitMorris Jobke2019-03-121-0/+2
| * | Fix PHPUnitMorris Jobke2019-03-121-0/+2
| * | Use proper dependency injection for app managerMorris Jobke2019-03-058-7/+26
| * | Fix whitespaceMorris Jobke2019-03-051-1/+1
| * | Suppress phan exceptions because they are catched by a class_existsMorris Jobke2019-03-051-0/+3
| * | use class_exists on correct class to please phanGeorg Ehrke2019-03-041-2/+2
| * | properly catch exceptions of detailsCircleGeorg Ehrke2019-03-031-1/+9
| * | Get user's circles without touching sessionVinicius Cubas Brand2019-03-011-6/+1
| * | allow sharing addressbooks with circlesGeorg Ehrke2019-03-012-3/+4
| * | Share calendar to circleVinicius Cubas Brand2019-03-014-2/+78
* | | Merge pull request #14626 from nextcloud/bugfix/14621/make-sure-urlparams-are...Morris Jobke2019-03-123-91/+34
|\ \ \
| * | | Add a message about disabled global routesJoas Schilling2019-03-111-0/+8
| * | | Make sure urlParams are correctly injected in global routesJoas Schilling2019-03-112-91/+26
| | |/ | |/|
* | | Merge pull request #14586 from nextcloud/hint-user-docs-federationMorris Jobke2019-03-112-0/+7
|\ \ \
| * | | Fix display of i in personal settingsMorris Jobke2019-03-111-0/+4
| * | | Add hint to user documentation (Federation)Marius Blüm2019-03-111-0/+3
* | | | Merge pull request #14623 from nextcloud/fix/noid/login-page-wrong-passwordMorris Jobke2019-03-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix acceptance tests for wrong password message due to changed messageMorris Jobke2019-03-111-1/+1
| |/ /
* | | Merge pull request #14620 from nextcloud/fix/noid/copy-paste-typoMorris Jobke2019-03-111-4/+1
|\ \ \ | |/ / |/| |
| * | Fix unneeded doc link to unrelated resourceMorris Jobke2019-03-111-4/+1
|/ /
* | Merge pull request #14603 from nextcloud/fix/noid/add-setup-check-for-s3-temp...Morris Jobke2019-03-084-14/+182
|\ \
| * | Show a setup warning in case S3 object storage is used as primary storageMorris Jobke2019-03-084-14/+182
* | | Merge pull request #14352 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.3.1Roeland Jago Douma2019-03-089-52/+196
|\ \ \
| * | | Bump bundlesJulius Härtl2019-03-072-44/+102