summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fix usage view tests"Daniel Kesselberg2019-07-021-1/+1
| | | | | | This reverts commit 7da7acd0 Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Revert parts hide quota bar if unlimitedDaniel Kesselberg2019-07-021-1/+1
| | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Merge pull request #16198 from nextcloud/fix/tests/usageMorris Jobke2019-07-021-1/+1
|\ | | | | Fix usage view tests
| * Fix usage view testsRoeland Jago Douma2019-07-021-1/+1
| | | | | | | | | | | | Follow up to #16049 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #16174 from ↵Morris Jobke2019-07-021-1/+1
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/fix-dyslexic-font-overwriting Only set the font if it was not set before
| * | Only set the font if it was not set beforeJoas Schilling2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | Otherwise Dyslexia setting can not set the font in the accessibility app Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #13186 from labor4/edit_carddav_typesMorris Jobke2019-07-021-1/+1
|\ \ \ | | | | | | | | add carddav-search (vCard2Array) option for X-ADDRESSBOOKSERVER-MEMBER
| * | | add carddav-search option for X-ADDRESSBOOKSERVER-MEMBERlabor42019-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding field X-ADDRESSBOOKSERVER-MEMBER which can be used to relate persons to groups (macos behaviour). - groups are cards with field X-ADDRESSBOOKSERVER-KIND == 'group' - and all members' UUID/URI in the X-ADDRESSBOOKSERVER-MEMBER array of that group-card. Signed-off-by: labor4 <schreibtisch@labor4.ch>
* | | | Merge pull request #16141 from nextcloud/fix/no-rating-no-scoreMorris Jobke2019-07-023-4/+6
|\ \ \ \ | |_|_|/ |/| | | Do not show app score if it has no ratings
| * | | Do not show app score if it has no ratingsChristoph Wurst2019-06-283-4/+6
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Do not fail hard on new user mail error (#16183)John Molakvoæ2019-07-021-2/+3
|\ \ \ \ | | | | | | | | | | Do not fail hard on new user mail error
| * | | | Do not fail hard on new user mail errorJohn Molakvoæ (skjnldsv)2019-07-021-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #15775 from ↵Georg Ehrke2019-07-0214-48/+805
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/refactor/decouple-remote-wipe-notifications Decouple remote wipe notifcation channels with events
| * | | | | Decouple remote wipe notifcation channels with eventsChristoph Wurst2019-06-2714-48/+805
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-07-02166-290/+332
| | | | | |
* | | | | | Merge pull request #16161 from ↵Roeland Jago Douma2019-07-018-13/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/toastify-js-1.6.1 Bump toastify-js from 1.5.0 to 1.6.1
| * | | | | | Bump toastify-js from 1.5.0 to 1.6.1dependabot-preview[bot]2019-07-018-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [toastify-js](https://github.com/apvarun/toastify-js) from 1.5.0 to 1.6.1. - [Release notes](https://github.com/apvarun/toastify-js/releases) - [Changelog](https://github.com/apvarun/toastify-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/apvarun/toastify-js/compare/1.5.0...1.6.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | Merge pull request #16159 from ↵Roeland Jago Douma2019-07-012-74/+124
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-cli-3.3.5 Bump webpack-cli from 3.3.4 to 3.3.5
| * | | | | | | Bump webpack-cli from 3.3.4 to 3.3.5dependabot-preview[bot]2019-06-302-74/+124
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.4 to 3.3.5. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.4...v3.3.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | Merge pull request #16162 from ↵Roeland Jago Douma2019-07-012-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/url-loader-2.0.1 Bump url-loader from 2.0.0 to 2.0.1
| * | | | | | | Bump url-loader from 2.0.0 to 2.0.1dependabot-preview[bot]2019-06-302-5/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [url-loader](https://github.com/webpack-contrib/url-loader) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/webpack-contrib/url-loader/releases) - [Changelog](https://github.com/webpack-contrib/url-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/url-loader/compare/v2.0.0...v2.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | Merge pull request #16175 from ↵Joas Schilling2019-07-011-6/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/followup/16088/allow-apps-to-overwrite-the-maximum-length-when-reading-from-database Allow apps to overwrite the maximum length when reading from database
| * | | | | | | Allow apps to overwrite the maximum length when reading from databaseJoas Schilling2019-07-011-6/+16
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #16168 from nextcloud/fix/16103Roeland Jago Douma2019-07-011-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove fs package
| * | | | | | | Remove fs packageJulius Härtl2019-07-011-1/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Merge pull request #16170 from nextcloud/dnd-upload-permissionsRobin Appelman2019-07-011-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | fix permissions for drag-n-drop uploads
| * | | | | | fix permissions for drag-n-drop uploadsRobin Appelman2019-07-011-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #16136 from nextcloud/design/theming-body-loginJohn Molakvoæ2019-07-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix dark text in body-login box on light theming colors
| * | | | | | Fix dark text in body-login box on light theming colorsJan-Christoph Borchardt2019-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | Hide quota bar if unlimited quota (#16049)John Molakvoæ2019-07-012-21/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Hide quota bar if unlimited quota
| * | | | | | Don't show absolute number in tooltipDaniel Kesselberg2019-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | Show used space in mb instead of %Daniel Kesselberg2019-06-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | Hide quota bar if unlimitedDaniel Kesselberg2019-06-231-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | Merge pull request #16167 from nextcloud/fix/oauth2/testsRoeland Jago Douma2019-07-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix the actual oauth2 tests
| * | | | | | | Fix the actual oauth2 testsRoeland Jago Douma2019-07-011-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Fix tense in email (#16163)John Molakvoæ2019-07-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix tense in email
| * | | | | | | Revert "Change send to sent in l10n files"Frederic Werner2019-06-3090-128/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7ed0d0909db71b01e3960e1ec7f7f8dce7b1c1a5. Signed-off-by: Frederic Werner <frederic-github@werner-net.work>
| * | | | | | | Change send to sent in l10n filesFrederic Werner2019-06-3090-128/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Frederic Werner <frederic-github@werner-net.work>
| * | | | | | | Change send to sentFrederic Werner2019-06-301-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Frederic Werner <frederic-github@werner-net.work>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2019-07-012-0/+2
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-304-4/+44
|/ / / / / /
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2920-4/+20
| | | | | |
* | | | | | Merge pull request #16148 from nextcloud/fix/text-official-labelRoeland Jago Douma2019-06-281-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Mark text as shipped so it's marked as official
| * | | | | | Mark text as shipped so it's marked as officialJan-Christoph Borchardt2019-06-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | Merge pull request #16145 from nextcloud/fix/files-rightclick-official-labelRoeland Jago Douma2019-06-281-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Mark files_rightclick as shipped so it's marked as official
| * | | | | | | Mark files_rightclick as shipped so it's marked as officialChristoph Wurst2019-06-281-0/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #16147 from nextcloud/pol/16076/oauth_downJoas Schilling2019-06-281-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Move OAuth down in admin security settings
| * | | | | | Move OAuth down in admin security settingsRoeland Jago Douma2019-06-281-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For #16076 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #16070 from nextcloud/fix/setup-check-no-internet-no-errorRoeland Jago Douma2019-06-284-28/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Do not show a internet connectivity warning if internet access is dis…
| * | | | | Do not show a internet connectivity warning if internet access is disabledChristoph Wurst2019-06-274-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>