Matthew Hodgson
3fd5937687
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing
...
Fixes React warning
2017-11-04 15:41:57 +00:00
Michael Telatynski
b2cd65e182
Fixes React warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-03 12:30:58 +00:00
David Baker
8895ab7e5b
Merge pull request #1564 from matrix-org/dbkr/pillify_at_room
...
Pillify room notifs in the timeline
2017-11-02 14:22:58 +00:00
David Baker
4f8d6d8fbe
Pillify room notifs in the timeline
...
This scans text nodes in the DOM for room notifications and turns
them into pills. Changes the pillification code around a bit so it
works with text nodes. Uses the push processor directly to test
the event against the room notifiation rule so we know whether
this event would actually trigger a room notification (needs to
hook into push at a lower level because otherwise our own room
notifications would not pillify since our own events never
generate notifications).
Requires https://github.com/matrix-org/matrix-js-sdk/pull/565
2017-11-01 19:42:47 +00:00
Stefan Parviainen
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
David Baker
8ed3474b64
Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists
...
Only show editing UI for aliases/related_groups for users /w power
2017-10-25 15:52:51 +01:00
Richard Lewis
fd85c74bc5
Merge pull request #1520 from matrix-org/rxl881/deleteWidget
...
Add a delete confirmation dialog for widgets
2017-10-25 10:45:52 +01:00
Richard Lewis
2e3bdfd55d
Fix string indentation.
2017-10-25 10:45:17 +01:00
Stefan Parviainen
88fd60066f
Fix typo
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 20:07:57 +02:00
Stefan Parviainen
b5024cca75
Further simplify MemberEventListSummary a bit
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 19:34:08 +02:00
Luke Barnard
640d88f25d
Typo
2017-10-24 16:21:18 +01:00
Luke Barnard
ee7ebc425c
Only show editing UI for aliases/related_groups for users /w power
2017-10-24 16:19:09 +01:00
Richard Lewis
11d4a63a32
Update text and split across multiple lines.
2017-10-23 23:59:36 +01:00
Richard Lewis
8b7f737c97
Remove logging.
...
Return early.
2017-10-23 23:47:37 +01:00
Richard Lewis
54bd916862
Split string across multiple lines.
2017-10-23 20:08:52 +01:00
Stefan Parviainen
115772d526
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-23 19:57:52 +02:00
Stefan Parviainen
ef30ba889b
Make MemberEventListSummary more translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-23 19:55:40 +02:00
Richard Lewis
3c4c986aca
Update button text
2017-10-23 18:42:43 +01:00
Luke Barnard
2f418976aa
Only show flair for groups with avatars set
...
Fix vector-im/riot-web#5377
2017-10-23 17:06:47 +01:00
Richard Lewis
ee60155846
Add delete widget confirmation dialog.
2017-10-23 17:05:44 +01:00
Matthew Hodgson
440b8e0e31
16px for flair please
2017-10-23 14:56:24 +01:00
Luke Barnard
fd65cb1396
Merge pull request #1501 from matrix-org/luke/groups-are-communities
...
Groups -> Communities
2017-10-19 12:16:15 +01:00
Luke Barnard
71443e9b94
Remove logs comments
2017-10-19 10:34:24 +01:00
Luke Barnard
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
Luke Barnard
a40704f085
Merge branch 'develop' into luke/groups-are-communities
2017-10-18 15:57:37 +01:00
Stefan Parviainen
7eeed3e093
Simplify MemberEventListSummary by using pluralization provided by the i18n library
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-17 23:46:23 +02:00
Luke Barnard
1b8c5b50db
Don't show room IDs when picking rooms
2017-10-17 18:02:35 +01:00
Luke Barnard
eaa5dd5f22
Groups -> Communities in the UI
...
Translation files still need updating, and this would be much simpler with a script that could automate the tedium
2017-10-16 13:18:39 +01:00
Luke Barnard
d3f9a3aeb5
Run eslint --fix
...
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
Luke Barnard
060bf3bdf6
Remove inline CSS
2017-10-11 16:02:01 +01:00
David Baker
0f84216a9f
Grey out login form when no valid HS
2017-10-11 14:05:34 +01:00
David Baker
92be3af990
Make it clearer which HS you're logging into
...
Otherwise there's no indication without clicking 'custom server'
2017-10-10 19:16:42 +01:00
Luke Barnard
8d46b19916
Restrict Flair in the timeline to related groups of the room
2017-10-04 14:06:49 +01:00
Luke Barnard
9e3954865a
Fix a couple of bugs with EditableItemList
...
- fix entering the same thing twice (which had the bug of not emptying the "new" field)
- fix editing items in the list (which would stack overflow because of typo)
2017-10-04 13:15:38 +01:00
Luke Barnard
28b8582bd6
Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings
2017-10-04 10:37:45 +01:00
Luke Barnard
4e9694be6d
Maintain "blur to add" function to match previous UX
2017-10-04 10:28:26 +01:00
Luke Barnard
d25ebfb844
Remove cruft from EIL
2017-10-04 10:15:44 +01:00
Luke Barnard
8243c39d83
Factor out EditableItemList from AliasSettings
...
Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).
2017-10-04 10:00:01 +01:00
Stefan Parviainen
a96169e80e
Fix merge conflict
2017-10-02 17:57:22 +02:00
Luke Barnard
c8b2158156
Lint
2017-09-29 10:42:23 +01:00
Luke Barnard
18e0d8da86
Rename Flair feature to Groups
2017-09-29 10:27:40 +01:00
Luke Barnard
739ddb8410
Merge branch 'develop' into luke/groups-button
2017-09-28 12:11:26 +01:00
Luke Barnard
6b9a2909df
Add rule to enforce spacing in curly brackets in JSX children
...
This required an updated in version of eslint-plugin-react to 7.4.0.
2017-09-28 11:21:06 +01:00
Luke Barnard
929c8627d3
Add button to get to MyGroups (view_my_groups or path #/groups)
2017-09-27 17:45:49 +01:00
Luke Barnard
d52355f80e
Implement adding rooms to a group (or group summary) by room ID
2017-09-27 15:30:58 +01:00
Luke Barnard
f528e147e3
Give flair avatars a tooltip = the group ID
2017-09-27 14:36:22 +01:00
Stefan Parviainen
35cb52febc
Fix merge conflict
2017-09-27 08:41:37 +02:00
Robert Swain
24de01e21d
AppTile: Test if widgetUrl startsWith instead of has a substring
...
The event origin should be at the beginning of the URL.
2017-09-25 17:14:25 +02:00
Robert Swain
6e49926228
AppTile: Do not test for electron platform
...
The method platform method is instead stubbed on all other platforms.
2017-09-25 17:13:18 +02:00
Robert Swain
b047f1caaa
Merge branch 'develop' into rob/electron-screensharing
2017-09-25 17:02:30 +02:00
