Commit Graph

45530 Commits

Author SHA1 Message Date
blizzz 8e3e25a057
Merge pull request #11186 from nextcloud/backport/11181/user-list-broken-with-integer-only-users
[stable14] Fix user and group listing with users that have an integer user id
2018-09-12 13:17:13 +02:00
Joas Schilling 2518cdd2d9
Fix exception class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-12 11:57:43 +02:00
Joas Schilling 73e870bd78
Fix user and group listing with users that have an integer user id
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-12 11:54:22 +02:00
John Molakvoæ 5209348c64
Merge pull request #11152 from nextcloud/davclient-js-decode-14
[14] fix js files client for user names with spaces
2018-09-11 10:46:12 +02:00
Robin Appelman 9b64c27ce2
fix js files client for user names with spaces
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-10 22:39:06 +02:00
Roeland Jago Douma e296f7d348
Merge pull request #11090 from nextcloud/backport/11082/stable14
[stable14] Do not invalidate main token on OAuth
2018-09-07 13:59:45 +02:00
Roeland Jago Douma 5b89eff367
Merge pull request #11103 from nextcloud/backport/token_expire_hardening
[stable14] Expire tokens hardening
2018-09-07 13:59:10 +02:00
Roeland Jago Douma b580ef18c8
Merge pull request #11039 from nextcloud/backport/fix/10968/upload-progress
Fixes the upload progress bar layout - 14 backport
2018-09-07 13:58:58 +02:00
Roeland Jago Douma c83ac2472d
Expire tokens hardening
Just to be sure that the field is also not 0

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-07 10:02:56 +02:00
Roeland Jago Douma 54859329ef
Do not invalidate main token on OAuth
Fixes #10584

We deleted the main token when using the login flow else mutliple tokens
would show up for a single user.

However in the case of OAuth this is perfectly fine as the
authentication happens really in your browser:

1. You are already logged in, no need to log you out
2. You are not logged in yet, but since you log in into the exact same
browser the expected behavior is to stay logged in.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-06 13:28:48 +02:00
Roeland Jago Douma 1b35dc1cba
Merge pull request #11069 from nextcloud/release/14.0.0
14.0.0 final
2018-09-06 09:25:18 +02:00
Roeland Jago Douma b619e8ddde
14.0.0 final
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-06 08:35:10 +02:00
Daniel Calviño Sánchez 51b978d3f0 Add new line at the end of file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 20:59:02 +02:00
Daniel Calviño Sánchez 2e424d84a4 Ensure that the avatar and the user name will be kept together
Otherwise a line break could be added between the avatar and the user
name when the wrapper is close to the right border of the message.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 20:59:02 +02:00
Daniel Calviño Sánchez e7d4d3a34b Remove unneeded CSS rule for mentions
Most of the properties of the rule are not needed for mentions, so the
rule is no longer applied to them; the only needed property was moved to
the main rule for mentions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 20:59:02 +02:00
Daniel Calviño Sánchez 7c851b5b77 Fix pointer cursor not shown on avatars
When the cursor is on an avatar wrapper the cursor is shown as a pointer
to inform the user that it can be clicked (which will either show the
contacts menu or insert a mention, depending on the case); the cursor
must be explicitly defined for the "img" element that shows the avatar
too, or otherwise the default cursor would be shown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 20:59:02 +02:00
Daniel Calviño Sánchez b14425ef6f Highlight mentions to the current user
Like done in Talk, mentions to the current user are now shown with the
primary colors to make them more prominent.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 20:59:02 +02:00
Daniel Calviño Sánchez 3c63850117 Ensure that the user name is shown in bold in mentions
Different browsers use different font weights for strong elements
(Chromium uses "bold", but Firefox uses "bolder", which is relative to
the font weight of the parent), so now the user name in mentions is
explicitly shown with a bold weight.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 20:59:02 +02:00
Daniel Calviño Sánchez 6b7e049288 Reformat embedded HTML code to resemble HTML code
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 20:59:02 +02:00
Daniel Calviño Sánchez 3ee07ac770 Remove space between avatar and user name
The avatar should be shown immediately after the avatar to be able to
accurately define the space between them using only CSS rules.

Note that in the case of the "atwho" menu it is not really needed, as a
whitespace removal seems to be done automatically by the plugin, but it
was modified for its displayed elements too for consistency.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 20:59:02 +02:00
Daniel Calviño Sánchez da75c7ff6d Show avatar using "span" instead of "div"
Visually it makes no difference, but as the ".avatar" element is inside
a "span" element it can not be a block element to be compliant with the
HTML specification.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 20:59:02 +02:00
Georg Ehrke 4173f9d588
Merge pull request #11071 from nextcloud/bugfix-stable14/10727
[stable14] remove LogicException, because it's also triggered with legitimate pa…
2018-09-05 18:08:55 +02:00
Georg Ehrke 2bdc407a82
remove LogicException, because it's also triggered with legitimate parameters
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-09-05 14:12:27 +02:00
Roeland Jago Douma b08f67085d
Merge pull request #11052 from nextcloud/backport/10963/stable14
[stable14] Updates logo scss to regard default values
2018-09-05 10:30:29 +02:00
Michael Weimann b0d9030388
Updates logo scss to regard default values
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-09-04 21:27:45 +02:00
Michael Weimann 209b3bee68
Fixes the upload progress bar layout
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-09-03 21:13:28 +02:00
Morris Jobke c31632ccdf
Merge pull request #10861 from nextcloud/version/noid/14.0.0RC2
14.0.0 RC 2
2018-08-31 15:09:46 +02:00
Morris Jobke 9cc6634776
14.0.0 RC 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-31 14:44:50 +02:00
Morris Jobke 7159ac1233
Merge pull request #10943 from nextcloud/fix/2fa-provider-dao-concurrent-insert
Fix handlng of concurrent inserts of the 2FA provider registry DAO
2018-08-31 14:42:55 +02:00
Roeland Jago Douma 3693d9568e
Merge pull request #10944 from nextcloud/content-list-overflow-fix
Fix overflow x scroll on app content list
2018-08-31 14:19:06 +02:00
Morris Jobke f4ffa1737e
Merge pull request #10942 from nextcloud/feature/10776/longer-password-reset-time
Change password expiration time from 12h to 7d
2018-08-31 14:13:14 +02:00
Morris Jobke cf3f4888cc
Change password expiration time from 12h to 7d
We use the same logic for creating accounts without a password and there the 12h is a bit short. Users don't expect that the signup link needs to be clicked within 12h - 7d should be a more expected behavior.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-31 13:31:03 +02:00
Christoph Wurst fb98db7da7
Fix handlng of concurrent inserts of the 2FA provider registry DAO
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-31 11:46:27 +02:00
John Molakvoæ (skjnldsv) 27f14cf91b
Fix overflow x scroll on app content list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-31 09:17:54 +02:00
Nextcloud bot 2a22615879
[tx-robot] updated from transifex 2018-08-31 00:12:09 +00:00
Morris Jobke 1ddde36e93
Merge pull request #10939 from nextcloud/bugfix/10930/perm-checker-wrong-path
Fix path when app has wrong permission
2018-08-30 21:43:25 +02:00
Morris Jobke 8ea2f8dea4
Merge pull request #10910 from nextcloud/customproperties-ignored-list
use the same ignored properties list for both CustomerPropertiesBackends
2018-08-30 21:23:36 +02:00
Roeland Jago Douma 625c81bd11
Merge pull request #10906 from nextcloud/request-params-array
ensure we always return an array from `Request::getParams`
2018-08-30 21:07:49 +02:00
Morris Jobke f393cb71ce
Merge pull request #10936 from nextcloud/make-possible-to-pick-both-files-and-folders
Make possible to pick both files and folders
2018-08-30 21:03:25 +02:00
Morris Jobke df7dc9c4ab
Merge pull request #10925 from nextcloud/use-main-text-color-for-editable-divs-and-text-areas
Use main text color for editable divs and text areas
2018-08-30 20:59:47 +02:00
Daniel Kesselberg a6bb19fa11
Fix path when app has wrong permission
Replace slow array function used in loop: https://github.com/kalessil/phpinspectionsea/blob/master/docs/performance.md#slow-array-function-used-in-loop

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-08-30 20:52:43 +02:00
Morris Jobke ab9672a32f
Merge pull request #10913 from nextcloud/do-not-parse-html-in-user-id-and-display-name
Do not parse HTML in user id and display name
2018-08-30 20:52:20 +02:00
Julius Härtl 25857c4900
Merge pull request #10924 from nextcloud/bugfix/10901/theming-bugfix-primary
Fix SCSS variable management with the theming app
2018-08-30 17:35:40 +02:00
Julius Härtl cdc4eee278
Merge pull request #10853 from nextcloud/apps-menu-fix-mobile
Fix apps menu on mobile
2018-08-30 14:51:09 +02:00
Julius Härtl a791bdb3ab
Fix capabilities test
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-30 14:45:06 +02:00
Daniel Calviño Sánchez c14c6e5ccf Make possible to pick both files and folders
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-30 14:40:12 +02:00
Daniel Calviño Sánchez f080fa55ac Store the mime type filter always as an array
This will make easier to check if both directories and files should be
pickable.

This also removes an unused assignment to the mime type.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-30 14:23:47 +02:00
Daniel Calviño Sánchez 66f2b155ce Fix empty mime type filter
When the mime type is an empty array no filter should be applied.
However, the filter was loosely compared to an empty array, but as
arrays are objects then it became an implicit strict equality comparison
which always failed due to being different objects. Now the length of
the array is compared instead, and also moved outside the loop as it is
not needed to check it for each file.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-30 14:02:50 +02:00
Julius Härtl 5bae5bf3eb
Make the default element color for bright theming colors lighter
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-30 10:37:05 +02:00
Daniel Calviño Sánchez 4508a12188 Prevent default action from being executed when the button is disabled
When "enter" is pressed in the file picker a "click" event is triggered
on the primary action button. However, in some cases, like when the file
picker is in "Choose" mode and the current directory in the file picker
is the root folder, the primary action button is disabled. In those
cases pressing enter should not trigger a click action on the button and
be ignored instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-30 10:25:09 +02:00