summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-02-071130-5790/+1666
|
* Merge pull request #18926 from nextcloud/fix/18689/int-array-accessJoas Schilling2020-02-062-1/+63
|\ | | | | Array access on int will fail on php7.4
| * Use strpos to check that @ is the first charDaniel Kesselberg2020-01-231-1/+1
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Add test to trigger "Trying to access array offset on value of type int"Daniel Kesselberg2020-01-231-0/+62
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #18778 from nextcloud/fix/fetch-request-token-offline-onlineRoeland Jago Douma2020-02-069-57/+129
|\ \ | | | | | | Fetch a new request token as soon as the browser becomes online
| * | Fetch a new request token as soon as the browser becomes onlineChristoph Wurst2020-02-069-57/+129
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #18518 from nextcloud/security-polixyJoas Schilling2020-02-063-0/+27
|\ \ \ | | | | | | | | Set up a security policy
| * | | Set up a security policyRuben Barkow2020-01-213-0/+27
| | | | | | | | | | | | | | | | Signed-off-by: Ruben Barkow-Kuder <github@r.z11.de>
* | | | Merge pull request #17075 from nextcloud/enh/samesitecookiesRoeland Jago Douma2020-02-062-3/+27
|\ \ \ \ | | | | | | | | | | Only send samesite cookies
| * | | | Only send samesite cookiesRoeland Jago Douma2020-02-062-3/+27
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This makes the last remaining two cookies lax. The session cookie itself. And the session password as well (on php 7.3 that is). Samesite cookies are the best cookies! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #19236 from tflores/issue_18866Roeland Jago Douma2020-02-061-0/+1
|\ \ \ \ | | | | | | | | | | Issue 18866
| * | | | Audit log unsharing from selfTiago Flores2020-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tiago Flores <tiago.flores@yahoo.com.br>
* | | | | Merge pull request #19320 from nextcloud/bugfix/external-179/fix-event-typeRoeland Jago Douma2020-02-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix event type
| * | | | | Fix event typeJoas Schilling2020-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #19303 from nextcloud/test/debug-installJoas Schilling2020-02-063-8/+38
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix occ maintenance:install database connect failure
| * | | | | Correctly append the port to the host so it's written to the config correctlyJoas Schilling2020-02-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Split the exception handling so install errors don't log as setup errorsJoas Schilling2020-02-051-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More gebuging Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Check the new connection on setup like with PostgreSQL and OracleJoas Schilling2020-02-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Only provide the auth method for MySQL 8.0+ to not break MariaDBJoas Schilling2020-02-051-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the auth method for MySQL 8.0+ Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #19312 from ↵Roeland Jago Douma2020-02-061-0/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | nextcloud/fix/18195/do-not-overwrite-user-glob-auth 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 #19306 from nextcloud/enh/js-escape-htmlJohn Molakvoæ2020-02-069-29/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use escape-html in collaboration.js
| * | | | | | Use escape-html libraryJulius Härtl2020-02-059-29/+31
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-02-06288-440/+872
| | | | | |
* | | | | | 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