47bf991471
Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills
...
Room notifs in autocomplete & composer
2017-11-07 10:25:48 +00:00
df5c6470e8
get dict syntax right
2017-11-06 22:01:23 +00:00
aa4feb0563
Info plinth CSS variables
2017-11-06 18:57:08 +00:00
956c5ff343
Use a constant for easy reading of long desc placeholder
2017-11-06 18:52:55 +00:00
d87d6cbc64
CSS for improving group creation UX, namely setting long description
2017-11-06 18:38:47 +00:00
477051cfa6
Add placeholder for when a long desc hasn't been set
...
this is only visible to group admins.
2017-11-06 18:35:52 +00:00
137f1311b3
Add useful placeholder for the long description textarea
2017-11-06 18:35:23 +00:00
36cd22663a
Open group settings when the group is created
2017-11-06 18:02:50 +00:00
afc9c36e4e
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 18:02:44 +00:00
17ae37bd3b
Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug
...
Ignore img tags in HTML if src is not specified
2017-11-06 18:02:38 +00:00
d14f943629
Ignore img tags in HTML if src is not specified
...
This applies to HTML messages and group summaries.
2017-11-06 17:52:46 +00:00
16771cac4f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 17:16:39 +00:00
029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges
...
Indicate admins in the group member list with a sheriff badge
2017-11-06 17:16:34 +00:00
08d006d112
PR feedback
2017-11-06 17:15:09 +00:00
d6a6e59d6c
Indicate admins in the group member list with a sheriff badge
2017-11-06 16:37:16 +00:00
3633f55e20
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 15:49:46 +00:00
a8bdde9f55
Merge pull request #5531 from vector-im/dbkr/composer_at_room_pills
...
CSS for room notif pills in composer
2017-11-06 15:49:41 +00:00
41e7496ff1
unused var
2017-11-06 15:25:25 +00:00
e1eba559fe
CSS for room notif pills in composer
2017-11-06 15:12:28 +00:00
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +00:00
706981688a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 14:29:30 +00:00
f1db564506
Merge pull request #1533 from anoadragon453/develop
...
Remember whether widget drawer was hidden per-room
2017-11-06 14:29:25 +00:00
01401fe4f8
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 14:10:32 +00:00
ba1ab9bdd1
Translated using Weblate (Ukrainian)
...
Currently translated at 99.5% (216 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-11-06 14:10:32 +00:00
25782404d4
Translated using Weblate (German)
...
Currently translated at 98.6% (214 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-11-06 14:10:32 +00:00
a1512af9f9
Merge pull request #5520 from vector-im/luke/right-panel-no-group
...
Do not init a group store when no groupId specified
2017-11-06 14:10:27 +00:00
0fdde954d4
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 13:02:51 +00:00
cb7b1268fe
Translated using Weblate (Ukrainian)
...
Currently translated at 10.6% (98 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-11-06 13:02:51 +00:00
48def50fec
Merge pull request #1576 from matrix-org/luke/throw-on-undefined-group
...
Throw an error when trying to create a group store with falsey groupId
2017-11-06 13:02:46 +00:00
febeb0429e
Throw an error when trying to create a group store with falsey groupId
2017-11-06 10:18:10 +00:00
cd26f63315
Do not init a group store when no groupId specified
...
(in RightPanel), otherwise the store will happily send requests to the server for the `undefined` group.
2017-11-06 10:16:03 +00:00
781b94c8f4
Appease the linter
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-05 15:37:06 -07:00
10519f9465
Fix the tests
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-05 14:56:41 -07:00
f0000f7400
Update documentation
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-05 14:33:40 -07:00
50807d498a
Use settings in slash commands too
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-05 13:06:55 -07:00
68bb61d281
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-11-05 18:49:35 +00:00
e31c89d360
Make the controller work for notifications
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 22:28:35 -07:00
63607f29e7
Use SettingsStore for notification settings
...
Signed-off-by: Travis Ralstron <travpc@gmail.com >
2017-11-04 22:27:34 -07:00
7ce4316cc8
Initial support for notification settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 21:47:18 -07:00
8351ec7e73
Local echo on all setting levels
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 20:32:00 -07:00
3958e32672
Ensure blacklistUnverifiedDevices persists reloads
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 20:13:23 -07:00
45140cab69
Don't assume false means "use state"
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:52:42 -07:00
ef45d82ec6
Fix URL preview save calls
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:52:20 -07:00
b75be41f94
Fix split-brain for blacklistUnverifiedDevices
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:52:06 -07:00
d14285eb08
fix secondary accent color tinting
2017-11-05 02:20:12 +00:00
cb17c0a379
Migrate blacklistUnverifiedDevicesPerRoom
...
This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour.
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:15:55 -07:00
68115f5b9c
tint when theming correctly
2017-11-05 00:40:38 +00:00
555847e5e9
make default theme actually work
2017-11-05 00:40:13 +00:00
8587b36715
Merge branch 'develop' into matthew/status
2017-11-04 23:51:26 +00:00
816042d3a8
Merge branch 'develop' into matthew/status
2017-11-04 23:51:20 +00:00
Luke Barnard
David Baker
Luke Barnard
Weblate
Matthew Hodgson
David Baker
Richard Lewis
Walter
Bamstam
Travis Ralston
Szimszon
Matthew Hodgson