Joas Schilling
5e6187926f
Copy the expiration from 480864b3e3
to getTokenById
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-19 17:55:48 +02:00
Michael Weimann
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
Joas Schilling
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
John Molakvoæ (skjnldsv)
1e9ab0a367
Fix since tag
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:02:09 +02:00
Joas Schilling
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
Joas Schilling
40d185e928
Revert "Use APCu caching of composer"
...
This reverts commit 948ab8a4d0
.
For details why see https://github.com/nextcloud/server/issues/11290
2018-09-19 15:47:01 +02:00
Nextcloud bot
d4b023844d
[tx-robot] updated from transifex
2018-09-19 12:38:00 +00:00
Joas Schilling
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
John Molakvoæ (skjnldsv)
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
blizzz
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
Joas Schilling
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
Nextcloud bot
d8f554944d
[tx-robot] updated from transifex
2018-09-19 00:12:24 +00:00
blizzz
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
blizzz
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
blizzz
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
blizzz
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
Daniel Calviño Sánchez
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
Nextcloud bot
45c35fc7fd
[tx-robot] updated from transifex
2018-09-18 00:12:31 +00:00
Robin Appelman
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
Joas Schilling
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
Joas Schilling
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
Joas Schilling
9d7647e991
Merge pull request #11208 from violoncelloch/add-mastodon-icon
...
add mastodon icon to settings/user
2018-09-17 10:25:56 +02:00
dependabot[bot]
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
dependabot[bot]
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
Nextcloud bot
2a51572cc4
[tx-robot] updated from transifex
2018-09-17 00:12:30 +00:00
Daniel Kesselberg
2d30511fa6
Check if user is null before getUsername
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-09-16 19:33:03 +02:00
Daniel Kesselberg
6bdcec67ab
Add openssl to mock
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-09-16 12:38:08 +02:00
Daniel Kesselberg
90a9a1ecc6
Consider openssl settings from config.php
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-09-16 11:51:15 +02:00
Nextcloud bot
40bb45225a
[tx-robot] updated from transifex
2018-09-16 00:12:29 +00:00
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Nextcloud bot
3771aeb584
[tx-robot] updated from transifex
2018-09-15 00:12:09 +00:00
Bjoern Schiessle
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
Jonas Sulzer
cc97769bb4
change "(remote-)follow" to "follow"
...
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2018-09-14 14:58:10 +02:00
Nextcloud bot
6112adfe06
[tx-robot] updated from transifex
2018-09-14 00:12:27 +00:00
Jonas Sulzer
6de7850458
add mastodon icon to settings/user
...
fixes #6714
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2018-09-13 21:31:49 +02:00
Daniel Kesselberg
3b7ac0c94d
Change visibility to private
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-09-13 12:24:06 +02:00
John Molakvoæ (skjnldsv)
92fbb6d795
Fallback to $lang if no $locale match
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-13 11:37:40 +02:00
Joas Schilling
a2c8b3f00b
Merge pull request #11151 from nextcloud/davclient-js-decode
...
fix js files client for user names with spaces
2018-09-13 11:17:29 +02:00
blizzz
ef97ef72f6
Merge pull request #10743 from danielkesselberg/bugfix/noid/allow-password-reset-for-duplicate-email
...
Enable password reset for user with same email address when only one is active
2018-09-13 10:48:30 +02:00
blizzz
d1cb83424f
Merge pull request #11091 from nextcloud/bugfix/11088/cannot-read-passwd
...
Remove posix_getpwuid and compare only userid
2018-09-13 10:29:08 +02:00
Joas Schilling
d062c8687b
Merge pull request #11036 from nextcloud/fix/10903/users-undefined-maxautocompleteresults
...
fix check for more users in sharing dialogue
2018-09-13 09:49:43 +02:00
Joas Schilling
480783a630
Merge pull request #11042 from nextcloud/bugfix/10894/php73-filter_var-deprecation
...
Remove filter_var flags due to PHP 7.3 deprecation, fixes #10894
2018-09-13 09:31:41 +02:00
Joas Schilling
a1c969a170
Merge pull request #10840 from webfoersterei/refactor/5530-urandom-check
...
Refactor secure randomness check
2018-09-13 09:29:42 +02:00
Nextcloud bot
10351cb9da
[tx-robot] updated from transifex
2018-09-13 00:12:08 +00:00
Arthur Schiwon
b628ec4701
adjust and extend js unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-09-12 17:49:48 +02:00
Daniel Kesselberg
45dab2d2a2
Add int-typehint
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-09-12 15:05:17 +02:00
blizzz
2e72efef3b
Merge pull request #11183 from nextcloud/bugfix/10765/fix-link-for-update-notifications
...
Fix the link and anchor for the update notifications
2018-09-12 13:18:44 +02:00
blizzz
7168749398
Merge pull request #11181 from nextcloud/bugfix/11178/user-list-broken-with-integer-only-users
...
Fix user and group listing with users that have an integer user id
2018-09-12 11:15:49 +02:00
Joas Schilling
57ef1d307b
Fix the link and anchor for the update notifications
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-12 10:24:02 +02:00