f4e3e84765
Merge pull request #1338 from matrix-org/rxl881/parallelshell
...
Rxl881/parallelshell
2017-10-20 17:11:03 +01:00
d859504276
Merge pull request #1513 from matrix-org/dbkr/prunei18n_oct17
...
Run prunei18n
2017-10-20 11:56:35 +01:00
00a13c780f
Run prunei18n
2017-10-20 11:39:01 +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
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
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
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
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
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
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
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
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
284b8803c0
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 14:07:45 +00:00
388218be6e
Translated using Weblate (German)
...
Currently translated at 97.5% (883 of 905 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-19 14:07:44 +00:00
e324511143
Merge pull request #1503 from matrix-org/luke/groups-are-communities-2
...
More Groups->Communities
2017-10-19 15:07:40 +01:00
2be0ebdd1d
More Groups->Communities
2017-10-19 15:01:16 +01:00
d397858e81
Don't remove other plural variants
2017-10-19 14:39:23 +01:00
28c4e80870
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 11:16:19 +00:00
fd65cb1396
Merge pull request #1501 from matrix-org/luke/groups-are-communities
...
Groups -> Communities
2017-10-19 12:16:15 +01:00
8a9de7343c
Add script to prune unused translations
2017-10-19 12:11:21 +01:00
9d40e1ad46
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 11:05:10 +00:00
059f46b7a5
Merge pull request #1500 from matrix-org/luke/groups-flair-store
...
Factor out Flair cache into FlairStore
2017-10-19 12:05:06 +01:00
bafa2c6be0
Fix typo
2017-10-19 12:03:59 +01:00
25d14af616
Export a global.singletonFlairStore to allow cross-project singleton
2017-10-19 12:00:03 +01:00
c3f143acc3
Merge branch 'develop' into luke/groups-are-communities
2017-10-19 11:31:00 +01:00
Richard Lewis