92fa373314
Merge pull request #11297 from nextcloud/bugfix/noid/this-database-dude
...
Copy the expiration from 480864b3e3
2018-09-25 09:04:44 +02:00
d616782773
Merge pull request #11249 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-loader-15.4.2
...
Bump vue-loader from 15.2.6 to 15.4.2 in /apps/oauth2
2018-09-25 08:39:27 +02:00
bdb01064e2
[tx-robot] updated from transifex
2018-09-25 00:12:07 +00:00
50a280338e
Merge pull request #11337 from nextcloud/feature/noid/add-test-for-11134
...
Add simple unit test for findLanguageFromLocale
2018-09-24 12:20:44 +02:00
67da97c362
Merge pull request #11222 from nextcloud/gs-and-saml
...
make the server ready to use global scale with SAML as auth back-end
2018-09-24 12:00:13 +02:00
58d63df420
Bump vue-loader from 15.2.6 to 15.4.2 in /apps/oauth2
...
Bumps [vue-loader](https://github.com/vuejs/vue-loader ) from 15.2.6 to 15.4.2.
- [Release notes](https://github.com/vuejs/vue-loader/releases )
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue-loader/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-24 09:57:38 +00:00
7034192a61
Merge pull request #11342 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-cli-3.1.1
...
Bump webpack-cli from 3.1.0 to 3.1.1 in /apps/updatenotification
2018-09-24 11:54:33 +02:00
17cf2d95c2
Bump webpack-cli from 3.1.0 to 3.1.1 in /apps/updatenotification
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/commits/v3.1.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-24 01:14:16 +00:00
895bccd246
[tx-robot] updated from transifex
2018-09-24 00:12:14 +00:00
2440ee6b84
Add simple unit test for findLanguageFromLocale
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-09-23 20:12:00 +02:00
cce9f25d86
[tx-robot] updated from transifex
2018-09-23 00:12:30 +00:00
bd89af478e
[tx-robot] updated from transifex
2018-09-22 00:12:06 +00:00
0211e17e3f
[tx-robot] updated from transifex
2018-09-21 00:12:08 +00:00
58e281857f
Merge pull request #11228 from nextcloud/fix/11144/empty-favorite-names
...
Fixes empty favorite names for trailing slashes
2018-09-20 13:42:50 +02:00
f258e65f13
Also adjust the expiration of PublicKeyTokenProvider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-20 09:54:27 +02:00
75ec460d05
[tx-robot] updated from transifex
2018-09-20 00:12:58 +00:00
30dbbfbd45
Merge pull request #11292 from nextcloud/revert/9442/do-not-apcu-cache-the-autoloader
...
Revert "Use APCu caching of composer"
2018-09-19 19:39:00 +02:00
5e6187926f
Copy the expiration from 480864b3e3 to getTokenById
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-19 17:55:48 +02:00
7e92b52974
Fixes empty favorite names for trailing slashes
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-09-19 17:43:55 +02:00
b026b5deb0
Merge pull request #11134 from nextcloud/locale-template-fix
...
Use user locale as default in the template
2018-09-19 16:06:35 +02:00
1e9ab0a367
Fix since tag
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:02:09 +02:00
12977a257d
Merge pull request #10847 from nextcloud/fix-icons-cacher
...
Fix icons cacher regex for compressed output
2018-09-19 16:00:20 +02:00
40d185e928
Revert "Use APCu caching of composer"
...
This reverts commit 948ab8a4d0https://github.com/nextcloud/server/issues/11290
2018-09-19 15:47:01 +02:00
d4b023844d
[tx-robot] updated from transifex
2018-09-19 12:38:00 +00:00
dda0dfd5f1
Merge pull request #11171 from nextcloud/bugfix/noid/shared-by-info-for-room-shares-without-names
...
Better shared-by info for conversations without names
2018-09-19 13:45:31 +02:00
3095ec4125
Fix icons cacher regex for compressed output
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 13:06:04 +02:00
b75dde0c9a
Merge pull request #11268 from nextcloud/include-empty-directories-in-the-default-state-of-acceptance-tests
...
Include empty directories in the default state of acceptance tests
2018-09-19 12:43:44 +02:00
06141b2b8a
Merge pull request #11041 from nextcloud/fix/noid/get_permission_of_storage_for_shares
...
Check the permission of the underlying storage
2018-09-19 12:15:40 +02:00
d8f554944d
[tx-robot] updated from transifex
2018-09-19 00:12:24 +00:00
9bbb88a3d0
Merge pull request #11262 from nextcloud/drone-postgres-db-name
...
use a dummy database name for the default postgres database name
2018-09-18 14:00:22 +02:00
7f6d42c263
Merge pull request #11258 from nextcloud/fix-contacts-menu-on-mentions
...
Fix contacts menu on mentions
2018-09-18 11:42:26 +02:00
7ab19366dc
Merge pull request #11257 from nextcloud/prevent-comment-being-composed-from-overlapping-the-submit-button
...
Prevent comment being composed from overlapping the submit button
2018-09-18 11:40:53 +02:00
d9247f7640
Merge pull request #11245 from nextcloud/bugfix/8288/userldap-getusername-on-null
...
Check if user is null before getUsername
2018-09-18 11:38:16 +02:00
bc84aa0269
Include empty directories in the default state of acceptance tests
...
Before each scenario of the acceptance tests is run the Nextcloud server
is reset to a default state. To do this the full directory of the
Nextcloud server is commited to a local Git repository and then reset to
that commit when needed.
Unfortunately, Git does not support including empty directories in a
commit. Due to this, when the default state was restored, it could
happen that the file cache listed an empty directory that did not exist
because it was not properly restored (for example,
"data/appdata_*/css/icons"), and that in turn could lead to an error
when the directory was used.
Currently the only way to force Git to include an empty directory is to
add a dummy file to the directory (so it will no longer be empty,
but that should not be a problem in the affected directories, even if
the dummy file is not included in the file cache); although Git FAQ
suggests using a ".gitignore" file a ".keep" file was used instead, as
it conveys better its purpose.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-18 10:23:35 +02:00
45c35fc7fd
[tx-robot] updated from transifex
2018-09-18 00:12:31 +00:00
254d7caab6
use a dummy database name for the default postgres database name
...
For some reason the docker image does not setup the permissions correctly,
by using a different name the nextcloud installer will create the database instead
with the correct permissions
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-17 18:19:29 +02:00
cccd3fc077
Merge pull request #11251 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-loader-15.4.2
...
Bump vue-loader from 15.4.1 to 15.4.2 in /apps/updatenotification
2018-09-17 10:29:25 +02:00
37bf4ae250
Merge pull request #11252 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.19.0
...
Bump webpack from 4.17.2 to 4.19.0 in /apps/updatenotification
2018-09-17 10:28:56 +02:00
9d7647e991
Merge pull request #11208 from violoncelloch/add-mastodon-icon
...
add mastodon icon to settings/user
2018-09-17 10:25:56 +02:00
1bd3755ed6
Bump webpack from 4.17.2 to 4.19.0 in /apps/updatenotification
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.17.2 to 4.19.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.17.2...v4.19.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-17 01:16:11 +00:00
383cb5cace
Bump vue-loader from 15.4.1 to 15.4.2 in /apps/updatenotification
...
Bumps [vue-loader](https://github.com/vuejs/vue-loader ) from 15.4.1 to 15.4.2.
- [Release notes](https://github.com/vuejs/vue-loader/releases )
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue-loader/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-17 01:15:29 +00:00
2a51572cc4
[tx-robot] updated from transifex
2018-09-17 00:12:30 +00:00
2d30511fa6
Check if user is null before getUsername
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-09-16 19:33:03 +02:00
40bb45225a
[tx-robot] updated from transifex
2018-09-16 00:12:29 +00:00
9cb8b51d42
Fix position of contacts menu shown on mentions
...
There are no default CSS rules for the contacts menu, as its position
depends on the element on which it is shown. Note, however, that if no
explicit rules are provided the contacts menu on mentions is affected by
the rules for the contacts menu on shares from the sharing tab.
The contacts menu is now positioned to show the tip of the arrow
horizontally aligned with the center of the avatar, and with the top of
the menu slightly below the bottom border of the mention.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-15 19:53:06 +02:00
527d237289
Fix contacts menu not triggered on certain areas of a mention
...
The contacts menu was triggered only when the avatar or the name of the
user were clicked. Due to this, clicking on certain (small) areas of a
mention (like the right end, or the space between the avatar and the
name) did not show the contacts menu. Now the contacts menu is shown
when any area of the mention is clicked.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-15 18:42:52 +02:00
3771aeb584
[tx-robot] updated from transifex
2018-09-15 00:12:09 +00:00
bb86a8ca36
add back-end as parameter to the pre-login hook
...
This is needed for the Global Scale setup to allow the master
node to perform different operations during login, depending
on the user management. Because in case of SAML, the authentication
at the idp happens at the master node.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-09-14 17:23:06 +02:00
cc97769bb4
change "(remote-)follow" to "follow"
...
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2018-09-14 14:58:10 +02:00
6112adfe06
[tx-robot] updated from transifex
2018-09-14 00:12:27 +00:00
Roeland Jago Douma
Nextcloud bot
Morris Jobke
blizzz
dependabot[bot]
Joas Schilling
Daniel Kesselberg
Joas Schilling
Michael Weimann
John Molakvoæ (skjnldsv)
Daniel Calviño Sánchez
Robin Appelman
Bjoern Schiessle
Jonas Sulzer