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
2db0eab5c5
s/Groups/Communities
2017-10-19 11:29:03 +01:00
6cf0a4a6d7
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 10:18:34 +00:00
b1a59d73fd
Translated using Weblate (German)
...
Currently translated at 100.0% (901 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-19 10:18:33 +00:00
17c610559f
Merge pull request #1499 from matrix-org/dbkr/i18n_script
...
Add i18n script to package.json
2017-10-19 11:18:29 +01:00
027a70ffe7
Add gen-i18n as a 'binary'
...
and add appropriate shebang
2017-10-19 10:51:54 +01:00
71443e9b94
Remove logs comments
2017-10-19 10:34:24 +01:00
5f3c06b38a
Factor out Flair cache into FlairStore
...
This will make invalidating the userGroups cache for the user architecturally more sound (the plan is to have GroupStore hit FlairStore as opposed to Flair itself in order to invalidate the cache).
2017-10-19 10:28:59 +01:00
61b05e7ec3
Add i18n script to package.json
2017-10-19 10:19:43 +01:00
9442184d0d
Updated parallelshell dep to ^3.0.2 to match riot-web.
2017-10-19 10:18:31 +01:00
99520779e8
Translated using Weblate (German)
...
Currently translated at 100.0% (901 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-19 08:29:51 +00:00
a81f654838
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 08:23:23 +00:00
e56f9ec63b
Merge pull request #1498 from matrix-org/dbkr/geni18n-html
...
Make gen-i18n support 'HTML'
2017-10-19 09:23:20 +01:00
2d3885b146
Merge remote-tracking branch 'origin/develop' into develop
2017-10-19 08:20:31 +00:00
Weblate