aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor cleanup: php-cs-fixer, tests, interface consistencyBrad Rubenstein2020-09-028-26/+38
* Make icon set for CalDav event presentation, use in iMIP email.brad20142020-08-208-7/+14
* iMIP email improvements (take 2)brad20142020-08-202-57/+151
* Merge pull request #22340 from nextcloud/dashboard/design-polishingJan C. Borchardt2020-08-204-16/+25
|\
| * Dashboard: Fix status bubbles open but unfocused backgroundJan C. Borchardt2020-08-203-4/+6
| * Dashboard: Suppress scrollbars inside widgetsJan C. Borchardt2020-08-201-1/+2
| * Dashboard: Fix text on background choicesJan C. Borchardt2020-08-201-1/+0
| * Adjust design of 'Get more widgets' buttonJan C. Borchardt2020-08-201-0/+7
| * Dashboard: Move panels to more semantically correct h2Jan C. Borchardt2020-08-201-10/+10
* | Merge pull request #22345 from nextcloud/fix/noid/psalm-warningsMorris Jobke2020-08-201-1/+1
|\ \
| * | Fix psalm warningsMorris Jobke2020-08-201-1/+1
|/ /
* | Merge pull request #20891 from cuppett/cuppett/issue#19790Roeland Jago Douma2020-08-201-6/+38
|\ \
| * | Resolves #19790, Provides Support for IAM CredentialsStephen Cuppett2020-08-201-6/+38
* | | Merge pull request #22331 from nextcloud/bugfix/noid/dont-use-deprecated-inig...Roeland Jago Douma2020-08-2017-60/+74
|\ \ \
| * | | Remove unneeded importMorris Jobke2020-08-201-1/+0
| * | | Fix unit testsMorris Jobke2020-08-202-19/+21
| * | | Use the DI container also for the Install command registrationMorris Jobke2020-08-201-1/+1
| * | | Don't use deprecated getIniWrapper() anymoreJoas Schilling2020-08-2014-39/+52
* | | | Merge pull request #22342 from nextcloud/fix/noid/psalm-warningsMorris Jobke2020-08-201-1/+2
|\ \ \ \
| * | | | Fix psalm warningsMorris Jobke2020-08-201-1/+2
|/ / / /
* | | | Merge pull request #22335 from nextcloud/fix/16017/remove_nc_encryptionMorris Jobke2020-08-201-2/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove encryption option for nextcloud external storageRoeland Jago Douma2020-08-201-2/+10
* | | | Merge pull request #21529 from nextcloud/enh/encryption/improve_key_formatMorris Jobke2020-08-2010-30/+584
|\ \ \ \
| * | | | New SSE key formatRoeland Jago Douma2020-08-2010-30/+584
* | | | | Merge pull request #22284 from nextcloud/feature/noid/status_dashboardJohn Molakvoæ2020-08-2020-3/+676
|\ \ \ \ \
| * | | | | Add Status DashboardGeorg Ehrke2020-08-2020-3/+676
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22327 from nextcloud/dashboard/design-detailsJan C. Borchardt2020-08-203-2/+14
|\ \ \ \ \
| * | | | | build dashboard jsJulien Veyssier2020-08-202-2/+2
| * | | | | Dashboard: Ellipsize widget headings to one lineJan C. Borchardt2020-08-201-0/+5
| * | | | | Dashboard: No need to extend height of widgets if only one column is shownJan C. Borchardt2020-08-201-0/+7
| |/ / / /
* | | | | Merge pull request #22322 from nextcloud/bugfix/noid/only-copy-share-link-whe...John Molakvoæ2020-08-203-3/+7
|\ \ \ \ \
| * | | | | Only copy the link when updating a share or no password was forcedJoas Schilling2020-08-203-3/+7
* | | | | | Merge pull request #20724 from nextcloud/remove-children-non-recursiveMorris Jobke2020-08-203-15/+43
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Accept psalm warning for nowMorris Jobke2020-08-201-0/+5
| * | | | | Make Cache::removeChildren non recursiveRobin Appelman2020-08-202-15/+38
| | |/ / / | |/| | |
* | | | | Merge pull request #21797 from rawtaz/patch-1Morris Jobke2020-08-201-1/+1
|\ \ \ \ \
| * | | | | Include circle shares when transferring ownershiprawtaz2020-07-151-1/+1
| * | | | | Include e-mail shares when transferring ownershiprawtaz2020-07-111-1/+1
* | | | | | Merge pull request #21734 from nextcloud/external-s3-no-touchMorris Jobke2020-08-201-17/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | disable touch to update mtime for external s3 storageRobin Appelman2020-07-071-17/+1
* | | | | | Merge pull request #22307 from nextcloud/bugfix/noid/dashboard-backgroundJohn Molakvoæ2020-08-2012-49/+29
|\ \ \ \ \ \
| * | | | | | remove background-color for user status and weather status in dashboard, buil...Julien Veyssier2020-08-208-76948/+9
| * | | | | | Small fixes to cleanup codeJulius Härtl2020-08-208-35/+76954
* | | | | | | Merge pull request #22332 from nextcloud/fix/noid/psalm-warningsMorris Jobke2020-08-201-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Extend psalm baseline to ignore errors for nowMorris Jobke2020-08-201-0/+8
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #13712 from nextcloud/bugfix/noid/do-not-load-all-routesMorris Jobke2020-08-205-27/+108
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Properly inject IRouter into URLGenerator to properly encapsulate testsMorris Jobke2020-08-194-21/+34
| * | | | | | Only load routes of the app which is requestedMorris Jobke2020-08-193-6/+74
* | | | | | | Merge pull request #22321 from nextcloud/status/iconsGeorg Ehrke2020-08-206-9/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | User status: Update icons for better visibilityJan C. Borchardt2020-08-206-9/+9