summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump webpack from 4.11.1 to 4.12.0 in /apps/updatenotificationdependabot[bot]2018-06-082-133/+132
* Merge pull request #9786 from nextcloud/feature/noid/external_sftp_password_a...Morris Jobke2018-06-084-7/+85
|\
| * Add SFTP auth mechanism to use a password and public key for SFTPRoeland Jago Douma2018-06-074-7/+85
* | [tx-robot] updated from transifexNextcloud bot2018-06-08276-11600/+11754
* | Merge pull request #9787 from nextcloud/notify-credentials-envMorris Jobke2018-06-071-0/+8
|\ \
| * | allow setting notify credentials in environmentRobin Appelman2018-06-071-0/+8
* | | Merge pull request #9772 from nextcloud/feature/8123/same_site_cookie_config_phpMorris Jobke2018-06-072-5/+24
|\ \ \
| * | | Add warningRoeland Jago Douma2018-06-061-0/+2
| * | | Configurable list for opt out from same site cookie protectionjaltek2018-06-062-5/+22
* | | | Merge pull request #9783 from nextcloud/3rdparty/noid/kill_cssminMorris Jobke2018-06-071-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | [3rdparty] Kill CssMinRoeland Jago Douma2018-06-071-0/+0
|/ / /
* | | Merge pull request #9616 from nextcloud/zero-quota-fixJohn Molakvoæ2018-06-0710-20/+29
|\ \ \
| * | | Make sure initial files can be properly createdRoeland Jago Douma2018-06-071-1/+2
| * | | Allow 0 quota by provisioning apiJohn Molakvoæ (skjnldsv)2018-06-079-19/+27
* | | | Merge pull request #9775 from nextcloud/3rdparty/noid/bump_patchwork_utf8John Molakvoæ2018-06-071-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump patchwork/utf8Roeland Jago Douma2018-06-071-0/+0
* | | | | Merge pull request #9780 from nextcloud/bug/noid/mock_timefactory_themingJohn Molakvoæ2018-06-072-10/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Mock the timefactory in the theming testsRoeland Jago Douma2018-06-072-10/+7
| | |/ / | |/| |
* | | | Merge pull request #9777 from nextcloud/dependabot/npm_and_yarn/settings/webp...Roeland Jago Douma2018-06-072-28/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Bump webpack-cli from 3.0.2 to 3.0.3 in /settingsdependabot[bot]2018-06-072-28/+28
|/ / /
* | | Merge pull request #9766 from nextcloud/vue-build-testsMorris Jobke2018-06-0720-8504/+3755
|\ \ \
| * | | Fix updatenotifications vars and groups requestJohn Molakvoæ (skjnldsv)2018-06-075-49/+53
| * | | Makefile updatenotification fixJohn Molakvoæ (skjnldsv)2018-06-071-1/+1
| * | | Bump updatenotificationJohn Molakvoæ (skjnldsv)2018-06-0719-5791/+3394
| * | | Bump settings configJohn Molakvoæ (skjnldsv)2018-06-076-2788/+391
| * | | Add vue apps build testsJohn Molakvoæ (skjnldsv)2018-06-072-0/+41
* | | | Merge pull request #9762 from nextcloud/feature/noid/setupcheck-designMorris Jobke2018-06-073-14/+55
|\ \ \ \ | |_|/ / |/| | |
| * | | Add warning state to setup checksJulius Härtl2018-06-063-2/+13
| * | | Add visual indicator for setup checksJulius Härtl2018-06-063-14/+44
* | | | Merge pull request #9747 from nextcloud/3rdparty/noid/bump_scssJohn Molakvoæ2018-06-071-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump scssphpRoeland Jago Douma2018-06-061-0/+0
| | |/ | |/|
* | | Merge pull request #9676 from nextcloud/dependabot/npm_and_yarn/apps/updateno...Roeland Jago Douma2018-06-072-4/+4
|\ \ \
| * | | Bump vue-template-compiler from 2.5.13 to 2.5.16 in /apps/updatenotificationdependabot[bot]2018-05-302-4/+4
* | | | [tx-robot] updated from transifexNextcloud bot2018-06-07170-14454/+15014
* | | | Merge pull request #9771 from nextcloud/bugfix/noid/app-settings-missing-fileJohn Molakvoæ2018-06-061-0/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | Add svg filter mixinJulius Härtl2018-06-061-0/+40
* | | | Merge pull request #9768 from nextcloud/fix/noid/continue-button-on-public-pageRoeland Jago Douma2018-06-061-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix style of password button on protected link sharesMorris Jobke2018-06-061-2/+2
* | | | Merge pull request #9678 from nextcloud/dependabot/npm_and_yarn/apps/updateno...Roeland Jago Douma2018-06-062-4/+4
|\ \ \ \
| * | | | Bump vue from 2.5.13 to 2.5.16 in /apps/updatenotificationdependabot[bot]2018-05-302-4/+4
| | |/ / | |/| |
* | | | Merge pull request #9744 from nextcloud/dependabot/npm_and_yarn/apps/updateno...John Molakvoæ2018-06-062-8/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump cross-env from 5.1.3 to 5.1.6 in /apps/updatenotificationdependabot[bot]2018-06-042-8/+8
* | | | Merge pull request #9565 from nextcloud/feature/noid/app-settingsMorris Jobke2018-06-0627-1994/+5143
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove old app settings testJulius Härtl2018-06-061-266/+0
| * | | Fix AppSettingsControllerTestJulius Härtl2018-06-061-4/+8
| * | | Keep AppConfig for nowJulius Härtl2018-06-061-0/+1
| * | | Remove space if no rating is availableJulius Härtl2018-06-061-3/+6
| * | | Remove unused importJulius Härtl2018-06-061-1/+0
| * | | Add bundled codeJulius Härtl2018-06-061-56/+3437
| * | | Add search/offset/limit parameters to group fetchingJulius Härtl2018-06-063-5/+5