wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
45525 commits 157 branches 562 tags 714 MiB
Commit graph

45525 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Roeland Jago Douma
330bd3c02a
Merge pull request #11062 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.17.2 
Bump webpack from 4.17.1 to 4.17.2 in /apps/accessibility
 2018-09-05 12:54:36 +02:00
Joas Schilling
3cec0080cf
Bump the version on master 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-05 12:31:40 +02:00
Christoph Wurst
16ecd9558f
Merge pull request #11058 from nextcloud/3rdparty/guzzle/6.3.3 
[3rdparty] Update to guzzle 6.3.3
 2018-09-05 11:54:19 +02:00
Roeland Jago Douma
66af2f092f
[3rdparty] Update to guzzle 6.3.3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-05 11:20:16 +02:00
dependabot[bot]
816afe9df1
Bump webpack from 4.17.1 to 4.17.2 in /apps/updatenotification 
Bumps [webpack](https://github.com/webpack/webpack) from 4.17.1 to 4.17.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.17.1...v4.17.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-05 08:40:53 +00:00
dependabot[bot]
9232ce576a
Bump webpack from 4.17.1 to 4.17.2 in /apps/accessibility 
Bumps [webpack](https://github.com/webpack/webpack) from 4.17.1 to 4.17.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.17.1...v4.17.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-05 08:40:35 +00:00
dependabot[bot]
b34e45a1b0
Bump vue-select from 2.4.0 to 2.5.0 in /apps/updatenotification 
Bumps [vue-select](https://github.com/sagalbot/vue-select) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/sagalbot/vue-select/releases)
- [Commits](https://github.com/sagalbot/vue-select/compare/v2.4.0...v2.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-05 08:40:16 +00:00
dependabot[bot]
014b1bbdca
Bump webpack from 4.17.1 to 4.17.2 in /apps/oauth2 
Bumps [webpack](https://github.com/webpack/webpack) from 4.17.1 to 4.17.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.17.1...v4.17.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-05 08:39:53 +00:00
Nextcloud bot
bcaf9a48bb
[tx-robot] updated from transifex 2018-09-05 00:12:50 +00:00
Daniel Calviño Sánchez
0c758dbe5b Fix size of icons in menus inside apps when shown as images 
Some popover menus, like the contacts menu, still show their icon using
an img element. The main CSS rules assume that a "content-box" sizing is
being used, and thus set the size and padding of the image to add up to
the line height.

However, ".app-*" descendants use a "border-box" sizing, so when a menu
with an image was shown in an app the icon was not properly shown. Now
both the width and height of the image is set to the item height in
those cases, which causes the visible size of the icon to be the item
height minus the padding (the same as when "content-box" sizing is
used).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-04 22:21:22 +02:00
Julius Härtl
8feadb8d98
Merge pull request #11048 from nextcloud/stable14-10963 
[stable14] Updates logo scss to regard default values
 2018-09-04 20:31:16 +02:00
Julius Härtl
2e25d22d16
Merge pull request #11022 from nextcloud/bump/npm/settings 
Bump js deps settings
 2018-09-04 13:34:39 +02:00
Roeland Jago Douma
419c7071ff
Merge pull request #11047 from nextcloud/typo/config.sample.php 
Fix typo in config.sample.php
 2018-09-04 12:17:07 +02:00
Roeland Jago Douma
adbeb74dc1
Merge pull request #11046 from nextcloud/feature/10725/applogger 
Add wrapper Logger in DIContainer
 2018-09-04 12:15:43 +02:00
Marius Blüm
182636b809
Fix typo in config.sample.php 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2018-09-04 11:18:10 +02:00
Michael Weimann
a74629d1e1
Updates logo scss to regard default values 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-09-04 11:12:48 +02:00
Roeland Jago Douma
b52454db56
Bump js deps settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 10:32:26 +02:00
Roeland Jago Douma
9319d557a4
Add wrapper Logger in DIContainer 
This makes sure that for example app for the context is always set.
We can in the future extend this to include more info.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 10:05:25 +02:00
John Molakvoæ
bcdd5d7b4c
Merge pull request #10975 from nextcloud/dependabot/npm_and_yarn/build/node-sass-4.9.3 
Bump node-sass from 4.9.2 to 4.9.3 in /build
 2018-09-04 09:58:25 +02:00
Christoph Wurst
fdc61e81db
Merge pull request #11023 from nextcloud/bump/npm/accessibility 
Bump JS deps Accessibility
 2018-09-04 09:53:23 +02:00
Christoph Wurst
54b1f4df3e
Merge pull request #11044 from nextcloud/td/8.2.0-public-util 
Remove deprecated methods from OCP\Util
 2018-09-04 09:51:33 +02:00
Roeland Jago Douma
52012be4fa
Merge pull request #11040 from nextcloud/feature/11035/worker-src 
Add worker-src to CSP
 2018-09-04 09:50:36 +02:00
Roeland Jago Douma
4f02b307b0
Remove deprecated methods from OCP\Util 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 08:43:07 +02:00
Roeland Jago Douma
373630c78f
Merge pull request #10914 from nextcloud/quota-typo 
remove space between quota and colon
 2018-09-04 08:29:01 +02:00
Roeland Jago Douma
8354c50911
Deprecate the childSrc functions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 07:35:44 +02:00