summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | [tx-robot] updated from transifexNextcloud bot2020-04-2212-16/+44
|/
* [tx-robot] updated from transifexNextcloud bot2020-04-2124-62/+132
|
* Merge pull request #20545 from nextcloud/version/18.0.4/RC2v18.0.4RC2Roeland Jago Douma2020-04-201-2/+2
|\ | | | | 18.0.4 RC2
| * 18.0.4 RC2Roeland Jago Douma2020-04-181-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20512 from nextcloud/backport/20246/stable18Roeland Jago Douma2020-04-2011-34/+45
|\ \ | | | | | | [stable18] Provide the proper language to the mailer
| * | Provide the proper language to the mailerRoeland Jago Douma2020-04-1811-34/+45
| | | | | | | | | | | | | | | | | | | | | Else we can't properly translate the footer in the recipients e-mail language. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20530 from ↵Roeland Jago Douma2020-04-205-10/+8
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport/stable18/fix/allow_edit_admin_user [18] Allow to edit admin user
| * | | Allow to edit admin userDaniel Kesselberg2020-04-185-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GretaD <gretadoci@gmail.com> Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> (cherry picked from commit d17c58eeec763c4faa62317f5f1b8ea2e09379fb)
* | | | [tx-robot] updated from transifexNextcloud bot2020-04-2024-16/+150
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2020-04-198-12/+16
|/ / /
* | | Merge pull request #20548 from nextcloud/backport/20470/stable18John Molakvoæ2020-04-183-90/+390
|\ \ \ | | | | | | | | [stable18] Fix jsunit tests
| * | | Fix jsunit testsDaniel Kesselberg2020-04-183-90/+390
|/ / / | | | | | | | | | | | | | | | JSUnit tests are failing for some reason. It seems to be related to a new karma-coverage version published a few hours ago. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #20531 from nextcloud/backport/20529/stable18Roeland Jago Douma2020-04-182-22/+89
|\ \ \ | |_|/ |/| | [stable18] Update list of multiple properties
| * | Update list of multiple propertiesJohn Molakvoæ (skjnldsv)2020-04-172-22/+89
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-04-1814-2/+752
| | |
* | | Merge pull request #20405 from nextcloud/backport/20363/stable18Roeland Jago Douma2020-04-1725-106/+373
|\ \ \ | |/ / |/| | [stable18] update icewind/smb to 3.2.3
| * | update icewind/smb to 3.2.3Robin Appelman2020-04-1025-106/+373
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2020-04-1710-20/+44
| | |
* | | Merge pull request #20516 from nextcloud/backport/20505/stable18John Molakvoæ2020-04-163-9/+12
|\ \ \ | |_|/ |/| | [stable18] do not advertise nulled userId for for systemwide credentials
| * | fix credentialsManager documentation and ensure userId to be used as stringArthur Schiwon2020-04-162-9/+9
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | add DB tests for credentials managerArthur Schiwon2020-04-161-0/+3
|/ / | | | | | | | | | | | | these are actually expected to FAIL, because NULL as a userid is not allowed in the schema, but documented to be used on the source Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2020-04-1638-26/+204
| |
* | Merge pull request #20456 from nextcloud/version/18.0.4/RC1v18.0.4RC1Roeland Jago Douma2020-04-151-2/+2
|\ \ | | | | | | 18.0.4 RC1
| * | 18.0.4 RC1Roeland Jago Douma2020-04-131-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20483 from nextcloud/backport/19936/stable18Roeland Jago Douma2020-04-151-2/+6
|\ \ \ | | | | | | | | [stable18] Handle unset owner in sharing
| * | | Handle unset owner in sharingJoas Schilling2020-04-141-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #20493 from nextcloud/backport/20361/stable18Roeland Jago Douma2020-04-151-3/+6
|\ \ \ \ | | | | | | | | | | [stable18] Close the streams in `writeStream` even when there is an exception
| * | | | Close the streams in `writeStream` even when there is an exceptionRobin Appelman2020-04-151-3/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #20495 from nextcloud/backport/20401/stable18John Molakvoæ2020-04-152-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | [stable18] Fix absolute redirect
| * | | | Fix absolute redirectJohn Molakvoæ (skjnldsv)2020-04-152-4/+4
|/ / / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #20485 from nextcloud/backport/20474/stable18Morris Jobke2020-04-151-17/+18
|\ \ \ \ | | | | | | | | | | [stable18] Update root.crl due to revocation of spgverein.crt
| * | | | Update root.crl due to revocation of spgverein.crtMorris Jobke2020-04-141-17/+18
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2020-04-1530-14/+98
| | | |
* | | | Merge pull request #20471 from nextcloud/backport/20469/stable18Roeland Jago Douma2020-04-143-4/+6
|\ \ \ \ | |/ / / |/| | | [stable18] Properly display share error messages
| * | | Properly display share error messagesJohn Molakvoæ (skjnldsv)2020-04-143-4/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #20163 from nextcloud/backport/19782/stable18Morris Jobke2020-04-141-9/+18
|\ \ \ \ | | | | | | | | | | [stable18] Use global used space in quota wrappen when external storage is included
| * | | | Use global used space in quota wrappen when external storage is includedRobin Appelman2020-03-251-9/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #20102 from nextcloud/backport/18679/stable18Morris Jobke2020-04-142-9/+11
|\ \ \ \ \ | | | | | | | | | | | | [stable18] fix OCA\DAV\CalDAV\CalDavBackend search $options
| * | | | | Add check that DateTime parameters are of correct typeThomas Citharel2020-03-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | | Add extra test case to exclude by timerangeThomas Citharel2020-03-221-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | | Added test testSearchdartcafe2020-03-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dartcafe <github@dartcafe.de>
| * | | | | fix OCA\DAV\CalDAV\CalDavBackend search $optionsdartcafe2020-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dartcafe <github@dartcafe.de>
* | | | | | Merge pull request #20282 from nextcloud/backport/19180/stable18Roeland Jago Douma2020-04-142-4/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [stable18] Check for empty authorization headers for office requests
| * | | | | Check for empty authorization headers for office requests and allow ↵Julius Härtl2020-04-032-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anonymous option on the whole tree Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #20334 from nextcloud/backport/20284/stable18Roeland Jago Douma2020-04-143-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable18] Properly catch NoUserException during upload cleanup
| * | | | | | Properly hint exceptions thrown by getUserFolderJulius Härtl2020-04-062-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Catch NoUserException when running the upload cleanup as cronjobJulius Härtl2020-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-04-146-4/+16
| | | | | | |
* | | | | | | Merge pull request #20420 from nextcloud/backport/19952/translate-web-standardsRoeland Jago Douma2020-04-133-12/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | [18] Use a normal string to translate.
| * | | | | | Compile assetsnpmbuildbot[bot]2020-04-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>