Commit graph

45550 commits

Author SHA1 Message Date
Arthur Schiwon
e7b0f8b001
fix check for more users
after a refactor users et al were undefined. The check condition was moved.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-09-10 23:15:42 +02:00
blizzz
210b0f092f
Merge pull request #11133 from nextcloud/bugfix/noid/invalid-exception
Fix exception class
2018-09-10 13:24:48 +02:00
Joas Schilling
1fb84efedb
Fix exception class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-10 10:03:42 +02:00
Nextcloud bot
e9c644412c
[tx-robot] updated from transifex 2018-09-10 00:13:36 +00:00
Nextcloud bot
13166feed3
[tx-robot] updated from transifex 2018-09-09 00:13:09 +00:00
Nextcloud bot
3653a2c889
[tx-robot] updated from transifex 2018-09-08 00:12:33 +00:00
Roeland Jago Douma
c44368b9a3
Merge pull request #11096 from nextcloud/bugfix/11080/set-cookie-null-argument
replace setcookie value with '' instead of null.
2018-09-07 19:31:30 +02:00
Roeland Jago Douma
a3e86be8c7
Merge pull request #11104 from nextcloud/fix/token_expire_hardening
Expire tokens hardening
2018-09-07 13:42:49 +02:00
blizzz
f14f8cc51e
Merge pull request #11100 from nextcloud/enhancement/generated-migrations
Improve class import and strict typing for generated migration class
2018-09-07 12:58:48 +02:00
Roeland Jago Douma
47b46fa69d
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:01:31 +02:00
blizzz
0947cc6a7d
Merge pull request #11098 from nextcloud/3rdparty/id3parser/0.0.3
[3rdparty] Bump id3parser to 0.0.3
2018-09-07 09:51:12 +02:00
Christoph Wurst
c5cd8d9166
Improve class import and strict typing for generated migration class
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-09-07 09:22:57 +02:00
Nextcloud bot
09a223fee9
[tx-robot] updated from transifex 2018-09-07 00:12:37 +00:00
Roeland Jago Douma
d7216e5496
[3rdparty] Bump id3parser to 0.0.3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-06 22:55:45 +02:00
MartB
fe21b10de5 replace setcookie value with '' instead of null.
The php documentation states that an empty string should be used for a cookie when it has no real value.
null leads to the following error: expects parameter 2 to be string, null given

Signed-off-by: Martin Böh <mart.b@outlook.de>
2018-09-06 20:34:16 +02:00
Roeland Jago Douma
bf630e46f6
Merge pull request #11081 from nextcloud/3rdparty/symfony-console-completion/0.8.0
[3rdparty] Bump symfony-console-completion to 0.8.0
2018-09-06 13:31:10 +02:00
Roeland Jago Douma
70a21de4c2
Merge pull request #11082 from nextcloud/fix/10584/no_invalidate_token_oauth
Do not invalidate main token on OAuth
2018-09-06 13:14:26 +02:00
Roeland Jago Douma
646728d7d1
[3rdparty] Bump symfony-console-completion to 0.8.0
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-06 12:21:19 +02:00
Roeland Jago Douma
5767f1c9d3
Merge pull request #10973 from nextcloud/feature/crash-report-breadcrumbs
Add breadcrumb support to crash reporters
2018-09-06 09:18:10 +02:00
Roeland Jago Douma
be2d8cc4e9
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 08:30:52 +02:00
Roeland Jago Douma
f778da9093
Merge pull request #11076 from nextcloud/3rdpart/scssphp/0.7.7
[3rdparty] Bump scssphp to 0.7.7
2018-09-06 07:48:44 +02:00
Nextcloud bot
3a08f71981
[tx-robot] updated from transifex 2018-09-06 00:12:53 +00:00
Roeland Jago Douma
50a6a7ca41
Merge pull request #10963 from nextcloud/fix/10957/logo-scss
Updates logo scss to regard default values and updates favicon upload check
2018-09-05 23:14:59 +02:00
Roeland Jago Douma
8aa09a6f5b
[3rdparty] Bump scssphp to 0.7.7
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-05 22:20:10 +02:00
Roeland Jago Douma
99edbac06c
Merge pull request #11054 from nextcloud/fix-size-of-icons-in-menus-inside-apps-when-shown-as-images
Fix size of icons in menus inside apps when shown as images
2018-09-05 22:17:32 +02:00
Roeland Jago Douma
764c912294
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-05 21:00:53 +02:00
Christoph Wurst
b4b095ca91
Fix @since version on new API
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-09-05 20:58:39 +02:00
Christoph Wurst
ff58732c0d
Add breadcrumb support to crash reporters
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-09-05 20:58:39 +02:00
Michael Weimann
38ea5d14b3
Disables SVG favicon uploads when imagemagick is missing.
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-09-05 20:50:21 +02:00
Roeland Jago Douma
0899f2cbc4
Merge pull request #11064 from nextcloud/fix-markup-and-style-of-mentions-in-comments
Fix markup and style of mentions in comments
2018-09-05 20:49:11 +02:00
Daniel Calviño Sánchez
bd75366016 Add new line at the end of file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:38 +02:00
Daniel Calviño Sánchez
92bf1cec44 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 18:35:38 +02:00
Daniel Calviño Sánchez
45cde96d83 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 18:35:37 +02:00
Daniel Calviño Sánchez
99989b37ff 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 18:35:37 +02:00
Daniel Calviño Sánchez
83bf3095cf 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 18:35:37 +02:00
Daniel Calviño Sánchez
be5a1faf70 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 18:35:37 +02:00
Daniel Calviño Sánchez
63ab5d919e Reformat embedded HTML code to resemble HTML code
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez
db1fce6a59 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 18:35:37 +02:00
Daniel Calviño Sánchez
c9ce96ff05 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 18:33:10 +02:00
blizzz
bc0bc58dad
Merge pull request #11066 from nextcloud/bump-version-master
Bump the version on master
2018-09-05 18:17:20 +02:00
Christoph Wurst
cfb2098e5c
Merge pull request #10958 from nextcloud/bugfix/10727/fix_caldav_logic_exception
remove LogicException, because it's also triggered with legitimate parameters
2018-09-05 18:07:40 +02:00
blizzz
d2803aeb5c
Merge pull request #10836 from nextcloud/fix_8281
Add an occ command to report updates
2018-09-05 18:03:04 +02:00
Julius Härtl
59aad5dac6
Merge pull request #11068 from nextcloud/3rdparty/symofny/3.4.15
[3rdparty] Bump symfony to 3.4.15
2018-09-05 15:09:26 +02:00
Julius Härtl
3d0867594e
Merge pull request #11061 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-select-2.5.0
Bump vue-select from 2.4.0 to 2.5.0 in /apps/updatenotification
2018-09-05 15:07:53 +02:00
Joas Schilling
47cc5e5895
Update version requirements and versions of shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-05 14:27:06 +02:00
Georg Ehrke
83639a9898
remove LogicException, because it's also triggered with legitimate parameters
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-09-05 14:10:26 +02:00
John Molakvoæ (skjnldsv)
bba81869ce
Compiled bump
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-05 13:19:45 +02:00
Roeland Jago Douma
4b687cf297
[3rdparty] Bump symfony to 3.4.15
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-05 13:07:33 +02:00
Roeland Jago Douma
1c1bf01241
Merge pull request #11060 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.17.2
Bump webpack from 4.17.1 to 4.17.2 in /apps/oauth2
2018-09-05 12:55:39 +02:00
Roeland Jago Douma
e0e95447a5
Merge pull request #11063 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.17.2
Bump webpack from 4.17.1 to 4.17.2 in /apps/updatenotification
2018-09-05 12:55:03 +02:00