summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14067 from nextcloud/smb-2.0.6-13Morris Jobke2019-02-079-36/+33
|\ | | | | [13] update icewind/smb to 2.0.6
| * update icewind/smb to 2.0.6Robin Appelman2019-02-069-36/+33
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #14063 from nextcloud/version/noid/13.0.11v13.0.11Morris Jobke2019-02-061-2/+2
|\ \ | | | | | | 13.0.11
| * | 13.0.11Morris Jobke2019-02-061-2/+2
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / [tx-robot] updated from transifexNextcloud bot2019-02-0640-12/+180
|/
* [tx-robot] updated from transifexNextcloud bot2019-02-06446-2150/+2814
|
* Merge pull request #13914 from nextcloud/version/noid/13.0.11RC1v13.0.11RC1Morris Jobke2019-01-311-2/+2
|\ | | | | 13.0.11 RC 1
| * 13.0.11 RC 1Morris Jobke2019-01-311-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #13917 from nextcloud/backport/13869/stable13Morris Jobke2019-01-303-3/+23
|\ | | | | [stable13] Clean pending 2FA authentication on password reset
| * Clean pending 2FA authentication on password resetRoeland Jago Douma2019-01-303-3/+23
| | | | | | | | | | | | | | | | | | | | | | When a password is reste we should make sure that all users are properly logged in. Pending states should be cleared. For example a session where the 2FA code is not entered yet should be cleared. The token is now removed so the session will be killed the next time this is checked (within 5 minutes). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #13889 from nextcloud/backport/13883/stable13Morris Jobke2019-01-301-1/+3
|\ \ | |/ |/| [stable13] Fix dropping a folder on a folder row
| * Fix dropping a folder on a folder rowDaniel Calviño Sánchez2019-01-291-1/+3
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the uploaded files have a relative path (that is, when a folder is uploaded) it is first ensured that all the parent folders exist, which is done by trying to create them. When a folder is created in the currently opened folder the file list is updated and a row for the new folder is added. However, this was done too when the folder already existed, which caused the previous row to be removed and a new one added to replace it. For security reasons, some special headers need to be set in requests; this is done automatically for jQuery by handling the "ajaxSend" event in the document. In the case of DAV requests, if the headers are not set the server rejects the request with "CSRF check not passed". When a file or folder is dropped on a folder row the jQuery upload events are chained from the initial drop event, which has the row as its target. In order to upload the file jQuery performs a request, which triggers the "ajaxSend" event in the row; this event then bubbles up to the document, which is then handled by adding the special headers to the request. However, when a folder was dropped on a folder row that folder row was removed when ensuring that the folder exists. The jQuery upload events were still triggered on the row, but as it had been removed it had no parent nodes, and thus the events did not bubble up. Due to this the "ajaxSend" event never reached the document when triggered on the removed row, the headers were not set, and the upload failed. All this is simply fixed by not removing the folder row when trying to create it if it existed already. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2019-01-2620-32/+42
|
* Merge pull request #13707 from ↵Morris Jobke2019-01-251-0/+3
|\ | | | | | | | | nextcloud/backport/13473/dont-log-parameters-on-user-creation-in-case-of-error [stable13] Don't log parameters on user creation in case of error/exception
| * Don't log parameters on user creation in case of error/exceptionJoas Schilling2019-01-211-0/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2019-01-256-6/+10
| |
* | [tx-robot] updated from transifexNextcloud bot2019-01-24146-138/+162
| |
* | Merge pull request #13746 from nextcloud/backport/13739/stable13Morris Jobke2019-01-232-1/+38
|\ \ | | | | | | [stable13] cleanup shared lock if changing to exclusive lock failed
| * | cleanup shared lock if changing to exclusive lock failedRobin Appelman2019-01-222-1/+38
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2019-01-238-4/+8
|/ /
* / [tx-robot] updated from transifexNextcloud bot2019-01-2216-32/+34
|/
* [tx-robot] updated from transifexNextcloud bot2019-01-2114-6/+28
|
* [tx-robot] updated from transifexNextcloud bot2019-01-208-6/+8
|
* [tx-robot] updated from transifexNextcloud bot2019-01-1926-32/+110
|
* [tx-robot] updated from transifexNextcloud bot2019-01-1830-8/+30
|
* Merge pull request #13638 from nextcloud/backport/13634/stable13Morris Jobke2019-01-171-1/+1
|\ | | | | [stable13] update URL for federation
| * update URL for federationJos Poortvliet2019-01-161-1/+1
| |
* | [tx-robot] updated from transifexNextcloud bot2019-01-17212-8616/+8712
|/
* Merge pull request #13600 from nextcloud/3rdpart/stable13/pear/archive_tar-1.4.5Morris Jobke2019-01-161-0/+0
|\ | | | | [stable13] [3rdparty] Bump pear/archive_tar to 1.4.5
| * [3rdparty] Bump pear/archive_tar to 1.4.5Roeland Jago Douma2019-01-151-0/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-01-16158-174/+350
|/
* [tx-robot] updated from transifexNextcloud bot2019-01-1598-700/+606
|
* Merge pull request #13584 from nextcloud/backport/13573/stable13Morris Jobke2019-01-141-1/+1
|\ | | | | [stable13] Principals can be principal/user/<name> or principal/<name> from lega…
| * Principals can be principal/user/<name> or principal/<name> from legacy installsJoas Schilling2019-01-141-1/+1
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2019-01-1474-778/+1012
|
* [tx-robot] updated from transifexNextcloud bot2019-01-1320-30/+216
|
* [tx-robot] updated from transifexNextcloud bot2019-01-1240-34/+214
|
* Merge pull request #13517 from nextcloud/version/noid/13.0.10v13.0.10Morris Jobke2019-01-111-2/+2
|\ | | | | 13.0.10
| * 13.0.10Morris Jobke2019-01-111-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #13508 from nextcloud/backport/13503/stable13Roeland Jago Douma2019-01-111-0/+8
|\ | | | | [stable13] RemoveClassifiedEventActivity: check if calendar still exists
| * Check for no longer existing calendarsRoeland Jago Douma2019-01-111-0/+8
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-01-1148-50/+228
|
* Merge pull request #13477 from nextcloud/version/noid/13.0.9v13.0.9Morris Jobke2019-01-101-2/+2
|\ | | | | 13.0.9
| * 13.0.9Morris Jobke2019-01-101-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #13471 from nextcloud/backport/13467/stable13Morris Jobke2019-01-101-0/+2
|\ | | | | [stable13] Show the repair steps and repair info output in the web for better feedback
| * Show the repair steps and repair info output in the web for better feedbackMorris Jobke2019-01-101-0/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2019-01-1042-482/+6
|
* Merge pull request #13454 from nextcloud/version/noid/13.0.9RC2v13.0.9RC2Roeland Jago Douma2019-01-091-2/+2
|\ | | | | 13.0.9 RC 2
| * 13.0.9 RC 2Morris Jobke2019-01-091-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #13443 from nextcloud/backport/13430-13Morris Jobke2019-01-097-5/+148
|\ | | | | [stable13] Respect classification of calendar events in activity stream
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 22:11:14 +0000