a76fdc750a
Run prunei18n
2017-10-20 11:40:05 +01:00
00a13c780f
Run prunei18n
2017-10-20 11:39:01 +01:00
1f9b5b25cb
Merge pull request #5369 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-10-20 11:31:51 +01:00
6fb8f06095
Merge pull request #1512 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-10-20 11:31:24 +01:00
0e3fbb6770
Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
...
Conflicts:
src/i18n/strings/de_DE.json
src/i18n/strings/hu.json
src/i18n/strings/ru.json
src/i18n/strings/zh_Hant.json
2017-10-20 10:29:12 +00:00
cc0a6d5c94
Merge pull request #5339 from vector-im/dbkr/prunei18n
...
Add script to prune unused translations
2017-10-20 11:21:57 +01:00
db4d96a1eb
Merge remote-tracking branch 'origin/develop' into develop
2017-10-20 10:21:50 +00:00
93997ac5fd
Merge pull request #1502 from matrix-org/dbkr/prunei18n
...
Add script to prune unused translations
2017-10-20 11:21:45 +01:00
639820cfc8
Merge remote-tracking branch 'origin/develop' into develop
2017-10-20 10:01:34 +00:00
f15bf8931a
Merge pull request #1510 from matrix-org/dbkr/fix_dms
...
Fix creation of DM rooms
2017-10-20 11:01:28 +01:00
449af3c2e1
Update deps.
2017-10-20 10:27:59 +01:00
3cf5864879
Update deps
2017-10-20 10:27:33 +01:00
f829012045
Fix creation of DM rooms
...
The check on whether a new chat was being started as a DM room got
broken, so we weren't using the trusted_private_chat preset or
setting the appropriate DM flags.
Fixes https://github.com/vector-im/riot-web/issues/5318 and
probably https://github.com/vector-im/riot-web/issues/3987
2017-10-20 10:16:51 +01:00
528a856d54
Add class to identify non-scalar widget instances
2017-10-20 09:46:45 +01:00
b2288e6525
Fix deps.
2017-10-20 09:45:29 +01:00
dea6f9ac9e
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (906 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-20 05:09:45 +00:00
c6f75fbf37
Adjust CSS in MyGroups, justify-content:space-around
2017-10-19 18:08:52 +01:00
81bb81b61b
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 17:06:42 +00:00
a85a011db9
Fix faulty translation in GroupView
2017-10-19 18:06:32 +01:00
7369719492
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (215 of 215 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-10-19 16:41:38 +00:00
62fd98245d
Merge pull request #5360 from vector-im/luke/groups-my-groups
...
CSS for improved MyGroups page
2017-10-19 17:41:34 +01:00
577f00e589
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 16:38:00 +00:00
d4aac4a69c
Merge pull request #1507 from matrix-org/dbkr/groupid_only_enter_localpart
...
Group create dialog: only enter localpart
2017-10-19 17:37:56 +01:00
93ae0a26fa
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 16:35:53 +00:00
877f213057
Merge pull request #1509 from matrix-org/luke/groups-my-groups
...
Improve MyGroups UI
2017-10-19 17:35:48 +01:00
cbb36f4780
Lint
2017-10-19 17:31:06 +01:00
1bf295f733
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 16:28:54 +00:00
bd982cf0ae
Merge pull request #1508 from matrix-org/dbkr/image_objecturl
...
Use object URLs to load Files in to images
2017-10-19 17:28:49 +01:00
8317bcbb9f
CSS for improved MyGroups page
2017-10-19 17:27:21 +01:00
b0f8619754
Improve MyGroups UI
...
as per design layed out by @tur2live!
2017-10-19 17:24:45 +01:00
40c301c400
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (906 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-19 16:23:16 +00:00
b74ad8634b
Use object URLs to load Files in to images
...
Fixes https://github.com/vector-im/riot-web/issues/5326
2017-10-19 17:16:52 +01:00
b9574ff382
Group create dialog: only enter localpart
...
Since we currently can only create groups on the local server anyway,
there's no point making the user jump through the hoop of forming the
whole group ID and telling them off if they got the server name wrong.
2017-10-19 16:47:43 +01:00
43f27e5d9d
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 15:43:20 +00:00
0f4ca1992d
Merge pull request #1506 from matrix-org/dbkr/group_id_alphanum
...
Add clientside error for non-alphanumeric group ID
2017-10-19 16:43:16 +01:00
19173ab4d6
Space, man.
2017-10-19 16:31:45 +01:00
4abaa93cf0
Add clientside error for non-alphanumeric group ID
2017-10-19 16:28:02 +01:00
a49eabda4c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into rxl881/parallelshell
2017-10-19 16:26:22 +01:00
b2e9b36978
Merge pull request #5346 from vector-im/dbkr/dialog_pad_right
...
Add padding-right to Dialogs
2017-10-19 16:19:40 +01:00
7c7cf2714b
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 15:18:36 +00:00
21b684381d
Merge pull request #1505 from matrix-org/luke/groups-fix-invites-to-unnamed-groups
...
Fix invites to groups without names
2017-10-19 16:18:32 +01:00
ca00a64da5
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 15:03:31 +00:00
8b047737b9
Merge pull request #1504 from matrix-org/dbkr/group_add_warning
...
Add warning when adding group rooms/users
2017-10-19 16:03:27 +01:00
9141ba280a
Lint
2017-10-19 15:55:57 +01:00
ea459c84ba
Other dialog subclasses have padding-right
2017-10-19 15:48:56 +01:00
ea1dbe1f76
Fix invites to groups without names
2017-10-19 15:47:52 +01:00
f98fe7fa87
Add warning when adding group rooms/users
2017-10-19 15:37:35 +01:00
6929442fc0
Don't ignore package-lock.json
2017-10-19 15:34:26 +01:00
86226bc22d
Add padding-right to Dialogs
...
The "groups will be public" warning was apparently the first thing
long enough to reach the right hand edge
2017-10-19 15:32:28 +01:00
289743c5fe
Merge pull request #5344 from vector-im/dbkr/error_warning_color
...
Add div.warning and use the scss var
2017-10-19 15:31:03 +01:00
David Baker
David Baker
Weblate
Luke Barnard
Richard Lewis
Szimszon
Luke Barnard