summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| * | | Add wrapper for removed tooltip functionsJulius Härtl2019-03-072-0/+38
| * | | Fix domparser on phantomjsJulius Härtl2019-03-072-0/+47
| * | | Use tooltip dist fileJulius Härtl2019-03-071-1/+1
| * | | Fix tooltip styling for bootstrap 4.3Julius Härtl2019-03-071-3/+4
| * | | Fix tooltip includeJulius Härtl2019-03-071-1/+1
| * | | [Security] Bump bootstrap from 3.4.1 to 4.3.1dependabot[bot]2019-03-072-4/+4
* | | | Merge pull request #14548 from nextcloud/bugfix/noid/avoid-duplicate-containe...Morris Jobke2019-03-084-24/+26
|\ \ \ \
| * | | | "Fix" the unit testsJoas Schilling2019-03-062-20/+3
| * | | | Make the file strictJoas Schilling2019-03-051-4/+5
| * | | | Avoid duplicate App container creationJoas Schilling2019-03-052-1/+19
* | | | | Merge pull request #14590 from Worteks/masterMorris Jobke2019-03-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update index.phppaul2019-03-071-1/+1
* | | | | Merge pull request #14585 from nextcloud/ocm-mention-federationMorris Jobke2019-03-081-1/+1
|\ \ \ \ \
| * | | | | Mention Open Cloud Mesh in Federated User SettingsMarius Blüm2019-03-071-1/+1
| |/ / / /
* | | | | Merge pull request #14589 from nextcloud/feature/noid/add-preview-information...Morris Jobke2019-03-081-0/+12
|\ \ \ \ \
| * | | | | Add preview data as optional data for filesJoas Schilling2019-03-071-0/+12
| |/ / / /
* | | | | Merge pull request #14425 from cowai/fix-multiple-incomplete-foldersMorris Jobke2019-03-085-8/+70
|\ \ \ \ \
| * | | | | Avoid calculating folder size for parent that needs scan.Ari Selseng2019-03-065-8/+70
* | | | | | Merge pull request #14587 from nextcloud/remove-googleplus-social-sharing-bundleMorris Jobke2019-03-082-2/+0
|\ \ \ \ \ \
| * | | | | | Remove Google+ from Social Sharing Bundle (2)Marius Blüm2019-03-071-1/+0
| * | | | | | Remove "socialsharing_googleplus" from Social Sharing BundleMarius Blüm2019-03-071-1/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #14583 from nextcloud/remove-g+-federationMorris Jobke2019-03-083-8/+0
|\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 08:52:25 +0000