summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Fix shipped.jsonRoeland Jago Douma2019-12-051-1/+1
| | | | | | We no longer ship gallery but ship photos Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-12-052-4/+6
|
* Merge pull request #18121 from nextcloud/feature/setup-install-recommended-appsRoeland Jago Douma2019-12-043-4/+18
|\ | | | | Add checkbox to install recommended apps during setup
| * Add checkbox to install recommended apps during setupChristoph Wurst2019-12-043-4/+18
| | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Replaced history icon by the Material one (#18206)John Molakvoæ2019-12-042-1/+1
|\ \ | |/ |/| Replaced history icon by the Material one
| * Replaced png history iconKilian Périsset2019-12-031-0/+0
| |
| * Replaced history icon by the Material oneKilian P2019-12-031-1/+1
| | | | | | | | Asked here : https://github.com/nextcloud/android/pull/4865 The purpose is to replace the "too small" restore icon on server and Android.
* | Merge pull request #17715 from nextcloud/fix/5456/respect_avatar_privacyJoas Schilling2019-12-041-16/+20
|\ \ | | | | | | Honor avatar visibility settings
| * | Update testsRoeland Jago Douma2019-11-131-21/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Merge remote-tracking branch 'origin/master' into ↵Roeland Jago Douma2019-11-13184-19348/+9644
| |\ \ | | | | | | | | | | | | fix/5456/respect_avatar_privacy
| * | | Honor avatar visibility settingsRoeland Jago Douma2019-10-281-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5456 Only when an avatar is set to public should we show it to the public. For now this has an open question as to how to solve federated avatars. But I assume a dedicated paramter or endpooint would make sense there. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-042-92/+116
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2019-12-032-56/+126
| | |
* | | Add a transfer ownership background jobRoeland Jago Douma2019-12-027-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This job can be initiated by a user to transfer a file/folder to a target user. The target user will have to accept the job. Once that is done the transfers is initiated in the background. Both parties get notified when the job is done. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Bump url-loader from 2.3.0 to 3.0.0dependabot-preview[bot]2019-12-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [url-loader](https://github.com/webpack-contrib/url-loader) from 2.3.0 to 3.0.0. - [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.3.0...v3.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Bump bootstrap from 4.3.1 to 4.4.1 (#18170)John Molakvoæ2019-12-022-17/+17
|\ \ \ | | | | | | | | Bump bootstrap from 4.3.1 to 4.4.1
| * | | Bump bootstrap from 4.3.1 to 4.4.1dependabot-preview[bot]2019-12-012-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.3.1 to 4.4.1. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v4.3.1...v4.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-026-132/+260
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2019-11-304-2/+6
| | |
* | | Merge pull request #18135 from nextcloud/fix/trim-login-nameRoeland Jago Douma2019-11-291-1/+1
|\ \ \ | | | | | | | | Trim the login name
| * | | Trim the login nameChristoph Wurst2019-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we keep on using it with leading or trailing whitespaces for app tokens and other logic. The reason this doesn't throw an error immediately with local users is that (My)SQL compares strings regardless of their padding by default. So we look up 'uid ' and get the row for the user 'uid'. Other back-ends will lead to a hard error, though, and the user is unable to log out as all request fail. Ref https://stackoverflow.com/a/10495807/2239067 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [tx-robot] updated from transifexNextcloud bot2019-11-292-4/+4
|/ / /
* | | Revert removed mimetypelistJulius Härtl2019-11-281-1/+96
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #17625 from nextcloud/enh/noid/direct-editingRoeland Jago Douma2019-11-282-1/+95
|\ \ \ | | | | | | | | Direct editing API to allow file editing using a one-time token
| * | | Code style fixes and cleanupJulius Härtl2019-11-271-36/+34
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Direct editing API to allow file editing using a one-time token forJulius Härtl2019-11-272-1/+97
| | | | | | | | | | | | | | | | | | | | | | | | mobile apps Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #18064 from nextcloud/feature/php74Roeland Jago Douma2019-11-281-96/+1
|\ \ \ \ | | | | | | | | | | Add php7.4 support
| * | | | Fix more testsRoeland Jago Douma2019-11-271-96/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / [tx-robot] updated from transifexNextcloud bot2019-11-282-34/+34
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2019-11-274-2/+6
| | |
* | | Merge pull request #18082 from nextcloud/design/style-updateRoeland Jago Douma2019-11-265-20033/+14
|\ \ \ | | | | | | | | Update style of log in page and header
| * | | Update style of log in page and headerJan-Christoph Borchardt2019-11-235-20033/+14
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #18013 from ↵Roeland Jago Douma2019-11-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-autocomplete-suggestions-with-numeric-users Fix autocomplete suggestions with numeric users
| * | | | Fix autocomplete suggestions with numeric user idsJoas Schilling2019-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | add var for theming images , advanced options (#16815)John Molakvoæ2019-11-262-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | add var for theming images , advanced options
| * | | | add var for theming images , advanced optionsGuillaume COMPAGNON2019-11-242-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Guillaume COMPAGNON <gcompagnon@outlook.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-11-268-14/+18
| | | | |
* | | | | Merge pull request #18088 from ↵Roeland Jago Douma2019-11-259-42/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/handlebars-4.5.3 Bump handlebars from 4.5.2 to 4.5.3
| * | | | | Bump handlebars from 4.5.2 to 4.5.3dependabot-preview[bot]2019-11-259-42/+42
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.2 to 4.5.3. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.2...v4.5.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | Improve tag icon (#18109)John Molakvoæ2019-11-253-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Improve tag icon
| * | | | | Improve tag iconJohn Molakvoæ (skjnldsv)2019-11-253-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #17896 from nextcloud/fix/noid/consider-create-group-resultblizzz2019-11-252-4/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | take group creation result into consideration
| * | | | | | fix and improve check of create group resultArthur Schiwon2019-11-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | fix documentation, get and createGroup may return nullArthur Schiwon2019-11-252-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * also have stricter checks in place Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | Merge pull request #18098 from nextcloud/fix/migration_import_orderRoeland Jago Douma2019-11-251-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix the import order of new migrations
| * | | | | | | Fix the import order of new migrationsRoeland Jago Douma2019-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #18079 from nextcloud/fixes/phpcsRoeland Jago Douma2019-11-2564-81/+89
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Some php-cs fixes
| * | | | | | | Some php-cs fixesRoeland Jago Douma2019-11-2264-81/+89
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Order the imports * No leading slash on imports * Empty line before namespace * One line per import * Empty after imports * Emmpty line at bottom of file Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #18027 from str0g/fix/14920/convert_type_booleanRoeland Jago Douma2019-11-251-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Incorrect integer value: '' for column 'password_invalid' while migra…
| * | | | | | | Incorrect integer value: '' for column 'password_invalid' while migrating ↵Łukasz Buśko2019-11-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from pg to mysql #14920 Signed-off-by: Łukasz Buśko <busko.lukasz@pm.me>