Commit Graph

42803 Commits

Author SHA1 Message Date
Morris Jobke cef2e190a1
Merge pull request #9586 from nextcloud/feature/9577/privacy-link
[stable13] add privacy link to theming and fix scrollbars
2018-05-24 17:57:25 +02:00
Julius Härtl d6bde6a281
Fix scope of nav css rule
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-24 16:43:38 +02:00
Arthur Schiwon cee2d1783d
bump theming version ¯\_(ツ)_/¯
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 16:26:58 +02:00
Arthur Schiwon ac22c28045
addjust footer height when legal links are present. fixes #9572
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 16:26:58 +02:00
Arthur Schiwon 323b665e88
also add a privacy link
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 16:26:51 +02:00
Roeland Jago Douma 930c11a6cd
Always set the request language to the force language
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-24 13:08:10 +02:00
Georg Ehrke 0493d0e3fb
make sure force language is reflected in html lang attribute
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-24 13:07:54 +02:00
Roeland Jago Douma 5bd9087cb7
Merge pull request #9573 from nextcloud/fix/9568/theming-wo-sig
bump version for theming again 🙇
2018-05-24 08:58:39 +02:00
Nextcloud bot c3a1d33959
[tx-robot] updated from transifex 2018-05-24 00:14:07 +00:00
Arthur Schiwon 67340846f9
bump version for theming again 🙇
also make appinfo compliant with appstore's schema. except default_enable…

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 00:19:20 +02:00
Morris Jobke fe20bb4b27
Merge pull request #9566 from nextcloud/backport/9395/stable13
[stable13] cleanup locks in scanner on error
2018-05-23 22:57:42 +02:00
Roeland Jago Douma 56b8a889c1
Merge pull request #9392 from nextcloud/dav-upload-lock-13
[13] only allow a single concurrent dav write to a file
2018-05-23 20:14:19 +02:00
Robin Appelman 874e312980
cleanup locks in scanner on error
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-23 20:05:54 +02:00
Morris Jobke 2f059d1caf
Merge pull request #9540 from nextcloud/backport/9517/stable13
[stable13] Improve OAuth
2018-05-23 15:42:22 +02:00
Roeland Jago Douma 01d3586a0f
Merge pull request #9522 from nextcloud/backport/9325/stable13
[stable13] Fix for unbound cloned LDAP connections
2018-05-23 09:18:21 +02:00
Nextcloud bot 82d0d1d704
[tx-robot] updated from transifex 2018-05-23 00:16:07 +00:00
Morris Jobke 04ff701090
Merge pull request #9548 from remyj38/stable13
[stable13] Fix translation bug on lost password page
2018-05-22 21:58:53 +02:00
Julius Härtl c628b613b9
Merge pull request #9547 from nextcloud/bump/noid/theming
[stable13] bump theming version for extraordinary release
2018-05-22 21:44:43 +02:00
Rémy Jacquin 0b8908b8df
Fix translation bug on lost password page
Fix nextcloud/password_policy#26

Signed-off-by: Rémy Jacquin <remy@remyj.fr>
2018-05-22 18:43:27 +02:00
Arthur Schiwon 3a73b9c0bb
bump theming version for extraordinary release
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-22 17:03:41 +02:00
Morris Jobke 5744827696
Merge pull request #9516 from nextcloud/backport/9437/stable13
[stable13] allow to specify a link to a legal notice
2018-05-22 16:54:07 +02:00
Morris Jobke bae5ec5cb0
Merge pull request #9525 from nextcloud/backport/8504/stable13
[stable13] Dont use $info as array when its not an array
2018-05-22 16:33:04 +02:00
Roeland Jago Douma 3c002706a4
Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:39 +02:00
Roeland Jago Douma 73f8373151
Don't use special chars to avoid confusion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:30 +02:00
Roeland Jago Douma d03265fb62
Rotate token
On a refresh token request:
* rorate
* reset expire

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:17 +02:00
Roeland Jago Douma 30750e4f92
Authenticate the clients on requesting a token
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:12 +02:00
Roeland Jago Douma a04ea70fca
Fail if the response type is not properly set
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:03 +02:00
Roeland Jago Douma 000cf1951c
Set OAuth token expiration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:50:58 +02:00
Roeland Jago Douma 46aafe4f11
Certain tokens can expire
However due to the nature of what we store in the token (encrypted
passwords etc). We can't just delete the tokens because that would make
the oauth refresh useless.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:26:13 +02:00
Roeland Jago Douma 8fcb7d4334
Allow the rotation of tokens
This for example will allow rotating the apptoken for oauth

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 12:51:25 +02:00
Nextcloud bot 41cd6076fb
[tx-robot] updated from transifex 2018-05-22 00:13:54 +00:00
Nextcloud bot ef95c1c5e3
[tx-robot] updated from transifex 2018-05-21 00:14:03 +00:00
Nextcloud bot 352d0af868
[tx-robot] updated from transifex 2018-05-20 00:13:45 +00:00
Nextcloud bot 3304991965
[tx-robot] updated from transifex 2018-05-19 00:14:03 +00:00
Joas Schilling ccedb314a8
Dont use $info as array when its not an array
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-18 23:50:10 +02:00
Roger Szabo 8c43834dbc
unbound cloned connection fix
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-18 15:09:51 +02:00
Arthur Schiwon c3d28885b0
Backport of #9437
allow to specify a link to a legal notice

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix undo for url-typed inputs

and minor adjustments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Use link not address in labels for URLs

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

this file does not belong here

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-18 11:26:57 +02:00
Nextcloud bot c101ad3a65
[tx-robot] updated from transifex 2018-05-18 00:14:09 +00:00
Nextcloud bot b08e53d365
[tx-robot] updated from transifex 2018-05-17 00:14:09 +00:00
Morris Jobke edd5712c6e
Merge pull request #9454 from nextcloud/stable13-9245-fix-race-condition-when-preparing-upload-folder
[stable13] Fix race condition when preparing upload folder
2018-05-14 13:41:47 +02:00
Morris Jobke e3d694fea2
Merge pull request #9453 from nextcloud/stable13-9237-fix-ids-of-permission-checkboxes-for-shares
[stable13] Fix ids of permission checkboxes for shares
2018-05-14 13:41:02 +02:00
Morris Jobke 003cc5acfd
Merge pull request #9432 from nextcloud/backport/9225/ipv6-database-host
[stable13] Allow IPv6 database host
2018-05-14 13:36:21 +02:00
Morris Jobke 1aa149a615
Merge pull request #9436 from nextcloud/backport/9373/stable13
[stable13] Get correct version of an app
2018-05-14 13:33:14 +02:00
Nextcloud bot d3d750fdc4
[tx-robot] updated from transifex 2018-05-14 00:13:48 +00:00
Nextcloud bot a46b8e34f9
[tx-robot] updated from transifex 2018-05-13 00:13:19 +00:00
Nextcloud bot cd3b0ca7da
[tx-robot] updated from transifex 2018-05-12 00:13:27 +00:00
Nextcloud bot 465397fa02
[tx-robot] updated from transifex 2018-05-11 00:13:23 +00:00
Daniel Calviño Sánchez 2b5d933b63 Remove no longer needed escaping of special characters
The escaping of special characters was needed when the ids of the
permission checkboxes for shares were based on the "shareWith" field.
Since they are based on the "shareId" field the escaping is no longer
needed, as the "sharedId" is expected to always contain compatible
characters.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-10 21:40:36 +02:00
Daniel Calviño Sánchez 0734325dda Fix ids of permission checkboxes for shares
The ids of permission checkboxes for shares were generated using the
"shareWith" field of the share. The "shareWith" field can contain spaces
(as spaces are allowed, for example, in user or circle names), so this
could cause the id attribute of the HTML element to contain spaces too,
which is forbidden by the HTML specification.

It is not just a "formal" issue, though; when the list was rendered
after a permission change, if the id contained a space the selector to
get the checkbox element was wrong (as it ended being something like
"#canEdit-view1-name with spaces") and thus the updated state of the
checkbox was not properly set.

Besides that, "shareWith" can contain too single quotes, which would
even cause the jQuery selector to abort the search and leave the UI in
an invalid state.

Instead of adding more cases to the regular expression to escape special
characters and apply it too when the ids are created now the ids of
permission checkboxes for shares are based on the "shareId" field
instead of on "shareWith", as "shareId" is expected to always contain
compatible characters.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-10 21:39:14 +02:00
Daniel Calviño Sánchez d74b5231b8 Fix race condition when preparing upload folder
Before any upload is submitted the upload is registered in a list of
known uploads; this is needed to retrieve the upload object at several
points of the upload process. When a chunked upload is submitted first a
directory to upload all the chunks is created and, once that is done,
the chunks are sent; in order to send a chunk the upload object needs to
be retrieved from the list of known uploads.

When all the active uploads were finished the list of known uploads was
cleared. However, an upload is not active until it actually starts
sending the data, so while waiting for the upload directory to be
created the upload is already in the list of known uploads yet not
active. Due to all this, if the active uploads finished while another
pending upload was waiting for the upload directory to be created that
pending upload would be removed from the list of known uploads too, and
once the directory was created and thus the chunks were sent a field of
a null upload object would be accessed thus causing a failure.

Instead of removing all the known uploads at once when the active
uploads finish now each upload is explicitly removed when it finishes.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-10 16:58:43 +02:00