summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19219 from ↵Roeland Jago Douma2020-02-051-0/+4
|\ | | | | | | | | nextcloud/bugfix/19135/wrong_dtend_invitation_mail Fix display of DTEND for multi-day all-day event
| * Fix display of DTEND for multi-day all-day eventGeorg Ehrke2020-01-301-0/+4
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #19180 from nextcloud/bugfix/office-anonymous-empty-authRoeland Jago Douma2020-02-052-4/+20
|\ \ | | | | | | Check for empty authorization headers for office requests
| * | Check for empty authorization headers for office requests and allow ↵Julius Härtl2020-02-042-4/+20
| | | | | | | | | | | | | | | | | | anonymous option on the whole tree Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #19300 from nextcloud/rakekniven-patch-1Roeland Jago Douma2020-02-058-8/+8
|\ \ \ | | | | | | | | l10n: Triple dot to ellipsis
| * | | Added space before ellipsisrakekniven2020-02-057-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: rakekniven <mark.ziegler@rakekniven.de> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | l10n: Triple dot to ellipsis rakekniven2020-02-051-1/+1
| | | | | | | | | | | | Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
| * | | l10n: Triple dot to ellipsisrakekniven2020-02-041-1/+1
| | | | | | | | | | | | Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
* | | | Merge pull request #19165 from Simounet/fix/data-apache-htaccess-typoJohn Molakvoæ2020-02-051-1/+1
|\ \ \ \ | | | | | | | | | | Fix data Apache2 .htaccess typo
| * | | | Fix data Apache2 .htaccess typoSimounet2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Simounet <contact@simounet.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-02-0532-14/+88
| |/ / / |/| | |
* | | | Merge pull request #19246 from sammo2828/decrypt-all-keep-mtimeRoeland Jago Douma2020-02-041-0/+1
|\ \ \ \ | |_|/ / |/| | | Keep the modification time during decryptFile
| * | | Keep the modification time during decryptFilesammo28282020-02-011-0/+1
| | | |
* | | | Merge pull request #19203 from nextcloud/enh/allow_selecting_hashing_algorithmRoeland Jago Douma2020-02-043-13/+100
|\ \ \ \ | | | | | | | | | | Allow respecting PASSWORD_DEFAULT
| * | | | Allow selecting the hashing algorithmRoeland Jago Douma2020-02-033-13/+100
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #19286 from nextcloud/actions/checkout/node/v2Roeland Jago Douma2020-02-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use checkout v2 for npm build action
| * | | | | Use checkout v2 for npm build actionRoeland Jago Douma2020-02-031-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Saves checking out the whole tree. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / / [tx-robot] updated from transifexNextcloud bot2020-02-04124-234/+350
|/ / / /
* | | | Merge pull request #19281 from ↵Roeland Jago Douma2020-02-031-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix/noid/get-unread-comments-with-indexes for the DB ot pick an index specify the object_type
| * | | | for the DB ot pick an index specify the object_typeArthur Schiwon2020-02-031-4/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #19233 from nextcloud/enh/transferownership_moveRoeland Jago Douma2020-02-032-7/+33
|\ \ \ \ \ | |/ / / / |/| | | | Add move (and firstlogin) option to transferownership service
| * | | | Allow specifying this is the first loginRoeland Jago Douma2020-02-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On firstlogin we allow non empty target folders. So that for guest transfers the user sees the same UI. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Catch \Error in Transfer::restoreSharesTobia De Koninck2020-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the command more fault tolerant. An \Error can happen when e.g. the owner of a share is null. If we don't catch this, the restore process will stop in an unknown state. Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
| * | | | Prevent transferring data to user which never loggedinTobia De Koninck2020-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
| * | | | Add option to transfer-ownership to move dataTobia De Koninck2020-02-032-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will move the home folder of own user to another user. Only allowed if that other user's home folder is empty. Can be used as workaround to rename users. Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
* | | | | Merge pull request #19275 from nextcloud/bugfix/18626/owner-transfer-multiselectRoeland Jago Douma2020-02-033-26/+30
|\ \ \ \ \ | | | | | | | | | | | | Bugfix/18626/owner transfer multiselect
| * | | | | Bump bundlesJulius Härtl2020-02-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Make sure that minSearchStringLength is taken into accountJulius Härtl2020-02-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Fix issue when selecting an entry, the multiselect input was not closedJulius Härtl2020-02-031-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #19273 from ↵Roeland Jago Douma2020-02-036-39/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/core-7.8.4 Bump @babel/core from 7.8.3 to 7.8.4
| * | | | | | Bump @babel/core from 7.8.3 to 7.8.4dependabot-preview[bot]2020-02-036-39/+39
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.8.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | Merge pull request #19276 from nextcloud/fix/19248Roeland Jago Douma2020-02-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use proper andwhere clause
| * | | | | | Use proper andwhere clauseRoeland Jago Douma2020-02-031-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #19248 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #19268 from nextcloud/fix/19261/use_settings_l10nRoeland Jago Douma2020-02-032-8/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use the l10n from settings
| * | | | | Update test to pass l10n instead of factoryDaniel Kesselberg2020-02-031-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Use the l10n from settingsRoeland Jago Douma2020-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #19261 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #19266 from nextcloud/enh/actions/npm_buildJohn Molakvoæ2020-02-032-24/+33
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Move npm build to github actions
| * | | | | Move npm build to github actionsRoeland Jago Douma2020-02-032-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #19250 from nextcloud/rakekniven-patch-1Roeland Jago Douma2020-02-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | l10n: Changed spelling of "user name" to "username"
| * | | | | | l10n: Changed spelling of "user name" to "username" rakekniven2020-02-011-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Using "username" like on > 200 strings over the whole Nextcloud project. Signed-off-by: rakekniven mark.ziegler@rakekniven.de
* | | | | | Merge pull request #19238 from MarcMichalsky/patch-1John Molakvoæ2020-02-031-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Center Buttons
| * | | | | | Update guest.cssMarc Michalsky2020-01-311-1/+1
| | | | | | |
| * | | | | | Center ButtonsMarc Michalsky2020-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | Since Version 18.0.0 the Registration button of the [registration app](https://github.com/pellaeon/registration) is not centered anymore.
* | | | | | | Merge pull request #19241 from nextcloud/bug/noid/job-catch-throwableRoeland Jago Douma2020-02-032-1/+22
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Make sure to catch php errors during job execution
| * | | | | | Make sure to catch php errors during job executionDaniel Kesselberg2020-01-312-1/+22
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #19243 from nextcloud/enh/settings/admin_settings_to_info_xmlRoeland Jago Douma2020-02-0314-79/+45
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Move Admin Settings also to info.xml
| * | | | | Move Admin Settings also to info.xmlRoeland Jago Douma2020-01-3114-79/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More cleanup of the Settings apps. Makes the manager cleaner and a proper manager. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-02-0330-82/+262
| | | | | |
* | | | | | Merge pull request #19256 from ↵Roeland Jago Douma2020-02-022-18/+119
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/karma-viewport-1.0.5 Bump karma-viewport from 1.0.4 to 1.0.5 in /build
| * | | | | | Bump karma-viewport from 1.0.4 to 1.0.5 in /builddependabot-preview[bot]2020-02-022-18/+119
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [karma-viewport](https://github.com/squidfunk/karma-viewport) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/squidfunk/karma-viewport/releases) - [Changelog](https://github.com/squidfunk/karma-viewport/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/karma-viewport/compare/1.0.4...1.0.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>