summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #24457 from nextcloud/backport/24451/stable19Morris Jobke2020-11-301-2/+2
|\ \ | | | | | | [stable19] external storages: save group ids not display names in configuration
| * | save group ids not display names in configurationArthur Schiwon2020-11-301-2/+2
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #24452 from nextcloud/backport/24449/stable19Morris Jobke2020-11-302-4/+6
|\ \ \ | |/ / |/| | [stable19] Store scss variables under a different prefix for each theming config version
| * | Store scss variables under a different prefix for each theming config versionJulius Härtl2020-11-302-4/+6
|/ / | | | | | | | | | | | | | | | | The main issue with using the general theming- prefix is that with APCu caching the cache is not shared between processes, so when trying to reset the cache through the CLI, e.g. when updating the theming config the old cache is never invalidated. Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #24447 from nextcloud/backport/23652/stable19Morris Jobke2020-11-301-6/+1
|\ \ | | | | | | [stable19] Fix public calendars shared to circles
| * | A valid user session is required for circles.Daniel Kesselberg2020-11-301-1/+3
| | | | | | | | | | | | | | | | | | The circles app depends on a valid userId. A public shared calender might be viewed by guests without a user session. For such requests the principal is null. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Update phpdoc for circleToPrincipalDaniel Kesselberg2020-11-301-8/+1
| | | | | | | | | | | | | | | | | | as the QueryException is already catched inside circleToPrincipal. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #24444 from nextcloud/backport/24357/stable19Morris Jobke2020-11-301-1/+1
|\ \ \ | |/ / |/| | [stable19] Make sure we add new line between vcf groups exports
| * | Make sure we add new line between vcf groups exportsJohn Molakvoæ (skjnldsv)2020-11-301-1/+1
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2020-11-304-0/+10
| |
* | [tx-robot] updated from transifexNextcloud bot2020-11-292-0/+10
| |
* | [tx-robot] updated from transifexNextcloud bot2020-11-2816-22/+24
| |
* | Merge pull request #24392 from nextcloud/backport/24375/stable19blizzz2020-11-263-121/+124
|\ \ | | | | | | [stable19] formatting remote sharer should take protocol, path into account
| * | Compile assetsnpmbuildbot-nextcloud[bot]2020-11-262-2/+2
| | | | | | | | | | | | Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
| * | formatting remote sharer should take protocol, path into accountArthur Schiwon2020-11-261-119/+122
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #24334 from nextcloud/backport/24315/stable19Joas Schilling2020-11-262-13/+2
|\ \ \ | |/ / |/| | [stable19] avoid empty null default with value that will be inserted anyways
| * | avoid empty null default with value that will be inserted anywaysArthur Schiwon2020-11-242-13/+2
| |/ | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2020-11-2610-2/+36
| |
* | Merge pull request #24354 from nextcloud/backport/24162/stable19Roeland Jago Douma2020-11-2511-29/+195
|\ \ | | | | | | [stable19] set the display name of federated sharees from addressbook
| * | send expected format of cloud idArthur Schiwon2020-11-251-1/+2
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | set the display name of federated sharees from addressbookArthur Schiwon2020-11-2511-29/+194
| |/ | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #24368 from nextcloud/backport/24363/stable19Roeland Jago Douma2020-11-251-1/+17
|\ \ | | | | | | [stable19] Catch storage not available in versions expire command
| * | Catch storage not available in versions expire commandChristoph Wurst2020-11-251-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External storage with session credentials is not accessible without a user session, hence background jobs and CLI commands can't work with them. The previously unhandled exception causes logged errors in the nextcloud log. This patch catches the specific exception and logs it as warnings. So for a production instance the error won't spam their logs for this non-recoverable and technically unsolvable error if the minimum log level is set to the default of 3 (error). Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #24370 from nextcloud/backport/21844/stable19Roeland Jago Douma2020-11-251-6/+9
|\ \ \ | |/ / |/| | [stable19] Avoid substr() error when strpos returns false
| * | Extra white space to follow other ifslui87kw2020-11-251-1/+1
| | | | | | | | | | | | Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
| * | Avoid substr() error when strpos returns falsebladewing2020-11-251-6/+9
|/ / | | | | | | | | | | | | | | "Exception: substr() expects parameter 3 to be int, bool given" can occur on Line 378 $mimePart = substr($icon, 0, strpos($icon, '-')); This happens, when '-' is not found and strpos returns false instead of an int. When this occurs, e.g., Activity hangs. Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
* | [tx-robot] updated from transifexNextcloud bot2020-11-2520-36/+56
| |
* | Merge pull request #24347 from nextcloud/backport/24341/stable19John Molakvoæ2020-11-242-2/+2
|\ \ | |/ |/| [stable19] Fix the config key on the sharing expire checkbox
| * Fix the config key on the sharing expire checkboxChristoph Wurst2020-11-242-2/+2
|/ | | | | | | We don't use `shareapi_internal_enforce_expire_date` anywhere. `shareapi_enforce_internal_expire_date` is the one we want. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* [tx-robot] updated from transifexNextcloud bot2020-11-2410-14/+18
|
* Merge pull request #24296 from nextcloud/backport/stable19/23023Morris Jobke2020-11-231-0/+8
|\ | | | | [stable19] Delete files that exceed trashbin size immediately
| * Delete files that exceed trashbin size immediatelyJulius Härtl2020-11-231-0/+8
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #24306 from nextcloud/fix/stable19-sabre-parse-xml-errorsMorris Jobke2020-11-231-0/+0
|\ \ | |/ |/| [stable19] Update sabre/xml to fix XML parsing errors
| * Update sabre/xml to fix XML parsing errorsChristoph Wurst2020-11-231-0/+0
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* [tx-robot] updated from transifexNextcloud bot2020-11-224-6/+6
|
* [tx-robot] updated from transifexNextcloud bot2020-11-216-12/+30
|
* Merge pull request #24262 from nextcloud/backport/24108/stable19Morris Jobke2020-11-201-1/+6
|\ | | | | [stable19] Use correct year for generated birthdays events
| * Use correct year for generated birthdays eventsSven Strickroth2020-11-201-1/+6
|/ | | | | | | | 'X-APPLE-OMIT-YEAR' is not always present, at least iOS 12.4 uses the hard coded date of 1604 (the start of the gregorian calendar) when the year is unknown. cf. https://forums.bitfire.at/topic/2050/bday-without-year-for-vcard-3-0-if-server-drops-property-x-apple-omit-year and https://gitlab.com/CardBook/CardBook/-/issues/586 Signed-off-by: Sven Strickroth <email@cs-ware.de>
* Merge pull request #24260 from nextcloud/backport/24257/stable19Morris Jobke2020-11-201-2/+2
|\ | | | | [stable19] Simple typo in comments
| * Simple typo in commentsCarlos Ferreira2020-11-201-2/+2
|/
* Merge pull request #24233 from nextcloud/backport/24211/stable19Roeland Jago Douma2020-11-201-4/+5
|\ | | | | [stable19] Fix setting images through occ for theming
| * Fix setting images through occ for themingJulius Härtl2020-11-191-4/+5
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2020-11-206-10/+10
|/
* Merge pull request #24182 from nextcloud/backport/24102/stable19Roeland Jago Douma2020-11-195-4/+27
|\ | | | | [stable19] Check quota of subdirectories when uploading to them
| * Check for target folder available quota when uploadingJulius Härtl2020-11-175-5/+22
| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Fetch quota with files propfindJulius Härtl2020-11-171-0/+6
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #24195 from nextcloud/backport/24098/stable19Roeland Jago Douma2020-11-191-3/+4
|\ \ | | | | | | [stable19] circleId too short in some request
| * | circleId too short in some requestMaxence Lange2020-11-181-3/+4
| | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-11-1916-30/+660
| | |
* | | Merge pull request #24171 from nextcloud/version/19.0.5/finalv19.0.5Roeland Jago Douma2020-11-181-2/+2
|\ \ \ | |/ / |/| | 19.0.5