aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19330 from nextcloud/backport/19320/stable18Roeland Jago Douma2020-02-071-1/+1
|\ | | | | [stable18] Fix event type
| * Fix event typeJoas Schilling2020-02-061-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #19334 from nextcloud/backport/19178/stable18Roeland Jago Douma2020-02-071-0/+3
|\ \ | |/ |/| [stable18] Make sure the default share provider does not execute for other things
| * Make sure the default share provider does not execute for other thingsJoas Schilling2020-02-061-0/+3
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #19315 from nextcloud/backport/19312/stable18blizzz2020-02-061-0/+5
|\ | | | | [stable18] do not overwrite global user auth credentials with empty values
| * do not overwrite global user auth credentials with empty valuesArthur Schiwon2020-02-061-0/+5
|/ | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #19267 from nextcloud/version/18.0.1/RC1v18.0.1RC1Roeland Jago Douma2020-02-061-2/+2
|\ | | | | 18.0.1 RC1
| * 18.0.1 RC1Roeland Jago Douma2020-02-051-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #19308 from nextcloud/backport/19219/stable18Roeland Jago Douma2020-02-051-0/+4
|\ \ | |/ |/| [stable18] Fix display of DTEND for multi-day all-day event
| * Fix display of DTEND for multi-day all-day eventGeorg Ehrke2020-02-051-0/+4
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #19089 from nextcloud/backport/18929/enh/sidebar/promiseRoeland Jago Douma2020-02-055-63/+59
|\ \ | |/ |/| [stable18] Allow to await the sidebar
| * Close handlingJohn Molakvoæ (skjnldsv)2020-02-055-21/+18
| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * Allow to await the sidebarJohn Molakvoæ (skjnldsv)2020-02-053-43/+42
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #19302 from nextcloud/backport/19165/stable18John Molakvoæ2020-02-051-1/+1
|\ \ | | | | | | [stable18] Fix data Apache2 .htaccess typo
| * | Fix data Apache2 .htaccess typoSimounet2020-02-051-1/+1
|/ / | | | | | | Signed-off-by: Simounet <contact@simounet.net>
* | Merge pull request #19297 from nextcloud/backport/19246/stable18Roeland Jago Douma2020-02-051-0/+1
|\ \ | | | | | | [stable18] Keep the modification time during decryptFile
| * | Keep the modification time during decryptFilesammo28282020-02-041-0/+1
| | |
* | | Merge pull request #19292 from nextcloud/backport/19203/stable18Roeland Jago Douma2020-02-053-13/+100
|\ \ \ | | | | | | | | [stable18] Allow respecting PASSWORD_DEFAULT
| * | | Allow selecting the hashing algorithmRoeland Jago Douma2020-02-043-13/+100
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #19271 from nextcloud/backport/19238/stable18John Molakvoæ2020-02-041-2/+2
|\ \ \ \ | |_|/ / |/| | | [stable18] Center Buttons
| * | | Update guest.cssMarc Michalsky2020-02-031-1/+1
| | | |
| * | | Center ButtonsMarc Michalsky2020-02-031-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 #19228 from nextcloud/backport/19215/stable18Roeland Jago Douma2020-02-043-23/+51
|\ \ \ \ | |_|/ / |/| | | [stable18] WebcalRefreshJob: Fix reading refresh rate
| * | | RefreshWebcalJob: Fix reading subscription from database leading to ignored ↵Georg Ehrke2020-01-312-22/+50
| | | | | | | | | | | | | | | | | | | | | | | | refreshRate Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | JobList: Typecast last_run to integerGeorg Ehrke2020-01-311-1/+1
| |/ / | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #19291 from nextcloud/backport/stable18/19275Roeland Jago Douma2020-02-043-26/+30
|\ \ \ | | | | | | | | [stable18] owner transfer multiselect fixes
| * | | Bump bundlesJulius Härtl2020-02-042-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Make sure that minSearchStringLength is taken into accountJulius Härtl2020-02-041-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-041-22/+22
|/ / / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #19283 from nextcloud/backport/19281/stable18Roeland Jago Douma2020-02-041-4/+6
|\ \ \ | |_|/ |/| | [stable18] 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 #19278 from nextcloud/backport/19276/stable18Roeland Jago Douma2020-02-031-1/+1
|\ \ \ | |/ / |/| | [stable18] 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 #19279 from nextcloud/backport/19233/stable18Roeland Jago Douma2020-02-032-7/+33
|\ \ | | | | | | [stable18] 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 #19269 from nextcloud/backport/19241/stable18Roeland Jago Douma2020-02-032-1/+22
|\ \ | | | | | | [stable18] Make sure to catch php errors during job execution
| * | Make sure to catch php errors during job executionDaniel Kesselberg2020-02-032-1/+22
| |/ | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #19277 from nextcloud/backport/19268/stable18Roeland Jago Douma2020-02-032-8/+3
|\ \ | |/ |/| [stable18] 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 #19212 from nextcloud/backport/19125/bugfix/noid/tab-idRoeland Jago Douma2020-01-3032-13467/+520
|\ | | | | [stable18] Give the sharing tab a unique id so it also opens properly on other languages
| * Fix legacy tabsJohn Molakvoæ (skjnldsv)2020-01-3029-13461/+511
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Bump @nextcloud/vueJohn Molakvoæ (skjnldsv)2020-01-302-4/+4
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Give the sharing tab a unique id so it also opens properly on other languagesJulius Härtl2020-01-301-2/+5
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #19206 from nextcloud/backport/19179/stable18Roeland Jago Douma2020-01-301-2/+3
|\ \ | | | | | | [stable18] Fix query selector for inverted icons
| * | Fix query selector for inverted iconsJoas Schilling2020-01-301-2/+3
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #19207 from nextcloud/backport/19176/stable18Roeland Jago Douma2020-01-302-2/+2
|\ \ | |/ |/| [stable18] Do not encode contacts menu mailto links