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
acb678afbd
Merge pull request #5343 from vector-im/luke/groups-are-communities
...
Groups->Communities
2017-10-19 15:30:39 +01:00
42ca840fef
Add div.warning and use the scss var
...
rather than the css color name
2017-10-19 15:17:09 +01:00
fc87fd2bb4
Merge pull request #5342 from vector-im/dbkr/add_rooms_button_no_swallow_clicks
...
Make the 'add rooms' button clickable
2017-10-19 15:07:52 +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
e5df06b2ab
Groups->Communities
2017-10-19 15:07:22 +01:00
2be0ebdd1d
More Groups->Communities
2017-10-19 15:01:16 +01:00
9d8b59e082
Make the 'add rooms' button clickable
...
SVG was swallowing pointer events
2017-10-19 14:54:56 +01:00
7395d866f6
Translated using Weblate (German)
...
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/de/
2017-10-19 13:40:12 +00:00
c4de42c6af
switch back to tint-friendly luke room icons
2017-10-19 15:40:00 +02: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
00f902cab1
Add script to prune unused translations
2017-10-19 12:11:53 +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
ae9263fa59
Merge pull request #5338 from vector-im/dbkr/i18n_script
...
Switch to gen-i18n script
2017-10-19 11:25:40 +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
f712804018
Add note about it apparently segfaulting on node 6
2017-10-19 11:13:42 +01:00
4e31aea402
Switch to gen-i18n script
2017-10-19 10:53:02 +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
568cd0aac6
Update parallelshell to ^3.02
2017-10-19 10:12:00 +01:00
ae3229b40c
Add package-lock.json to VC
2017-10-19 10:11:33 +01:00
987072b25a
Translated using Weblate (German)
...
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/de/
2017-10-19 09:08:54 +00:00
David Baker
Richard Lewis
David Baker
Weblate
Luke Barnard
Luke Barnard
Bamstam
Matthew Hodgson
Krombel