f694fb24ff
Fix merge-conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-10-11 20:02:14 +02:00
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
8958be9321
Merge pull request #1441 from turt2live/travis/who_banned
...
Show who banned the user on hover
2017-10-11 17:33:53 +02:00
d2b9fcc7aa
Merge pull request #1440 from turt2live/travis/pl_enhancements
...
Enhancements to room power level settings
2017-10-11 17:31:20 +02:00
8a2813ac08
Fallback to MXID instead of relying on the user being in the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-11 09:08:40 -06:00
d1fdd20809
Show who banned the user on hover
...
Fixes https://github.com/vector-im/riot-web/issues/5039
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-11 09:08:29 -06:00
21a31b02d0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-10-11 16:02:10 +01:00
060bf3bdf6
Remove inline CSS
2017-10-11 16:02:01 +01:00
0ab5b1a6af
_td translatable strings
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-11 08:50:28 -06:00
f874fc1203
Merge branch 'develop' into travis/pl_enhancements
2017-10-11 08:42:45 -06:00
ffb9dd844a
Merge pull request #868 from psaavedra/set_default_federate_by_settings
...
Added TextInputWithCheckbox dialog
2017-10-11 16:28:03 +02:00
f6eca14bee
Merge pull request #1456 from matrix-org/dbkr/say_which_homeserver
...
Make it clearer which HS you're logging into
2017-10-11 15:11:22 +02:00
0f84216a9f
Grey out login form when no valid HS
2017-10-11 14:05:34 +01:00
99aabd9025
Merge pull request #1451 from matrix-org/t3chguy/redundant_thing
...
Remove redundant stale onKeyDown
2017-10-11 14:31:08 +02:00
fa24b4bd2d
Remove this log - it's not an error worth logging
2017-10-11 09:48:12 +01:00
581abcb4b7
Consistent subsitution variable in translations
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-10-11 09:15:24 +02:00
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
917957c1dc
Modify the group store to include group rooms
...
and modify components to use this new part of the store such that feedback can be given
when adding or removing a room from the room list.
2017-10-05 14:30:04 +01:00
a8231f7bf9
Remove redundant stale onKeyDown
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-05 08:26:57 +01:00
c115980f21
remove redundant&stale onKeyDown
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-05 08:08:39 +01:00
38de4ae152
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-05 08:00:22 +01:00
7492f2dffa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings
2017-10-04 22:35:29 +01:00
4017fa7f1d
Factor-out GroupStore and create GroupStoreCache
...
In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required.
The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore.
(We're running out of words to describe the hierachy of things that store things)
2017-10-04 16:56:35 +01:00
ed74ac394b
Put related groups UI behind groups labs flag
2017-10-04 14:35:13 +01:00
a400c03768
Merge pull request #1447 from matrix-org/luke/feature-flair-related-only
...
Restrict Flair in the timeline to related groups of the room
2017-10-04 14:24:59 +01:00
0c6b5776ec
Remove commented imports
2017-10-04 14:09:51 +01:00
02e7287123
Remove constraint on groups being local, remove logging
2017-10-04 14:08:31 +01:00
8d46b19916
Restrict Flair in the timeline to related groups of the room
2017-10-04 14:06:49 +01:00
7be5e685f7
Implement UI for editing related groups of a room
...
(using the new EditableItemList)
2017-10-04 13:19:57 +01:00
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
28b8582bd6
Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings
2017-10-04 10:37:45 +01:00
4e9694be6d
Maintain "blur to add" function to match previous UX
2017-10-04 10:28:26 +01:00
407a632a8d
Fix typo
2017-10-04 10:26:43 +01:00
d25ebfb844
Remove cruft from EIL
2017-10-04 10:15:44 +01:00
011aadcb94
Merge pull request #1421 from pafcu/develop
...
Add dummy translation function to mark translatable strings
2017-10-04 10:09:09 +01:00
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
03581adf85
Merge pull request #1438 from matrix-org/luke/groups-remove-room
...
Implement button to remove a room from a group
2017-10-03 11:45:03 +01:00
6b834bc72e
Add confirmation dialog for removing room from group
2017-10-03 11:16:22 +01:00
0116c4b486
Log the error when failing to removie room from group
2017-10-03 10:14:08 +01:00
3e34a460a4
Add error dialog for when removing room fails
2017-10-03 10:12:11 +01:00
a96169e80e
Fix merge conflict
2017-10-02 17:57:22 +02:00
b202601d65
Fix showing 3pid invites in member list
2017-10-02 15:10:32 +01:00
20798dd2fa
Expose power level setting for widgets
...
Fixes https://github.com/vector-im/riot-web/issues/4866
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-09-29 15:37:32 -06:00
8ee9d39ffa
Expose option for m.room.topic power level
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-09-29 15:12:05 -06:00
8ab3d94c1c
Always show common events in the PL section of room settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-09-29 15:11:48 -06:00
614cf950b6
Supply user-friendly labels for common events
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-09-29 14:45:00 -06:00
2e1b2178a1
Remove assumptions on how languages work in the power levels section
...
This does mean that the strings will need to be re-translated, but now they may be more accurate because the comma is not assumed in the code.
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-09-29 14:35:49 -06:00
415693bd83
Support editing power levels of events.
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-09-29 14:32:40 -06:00
955ca6cd2b
Implement button to remove a room from a group
...
NB: This doesn't provide any feedback to the user. We should use a GroupSummaryStore-style component to refresh the view after a successful hit to the API. This could affect the summary view as well, because when rooms are removed from a group, they are also removed from the summary (if necessary).
2017-09-29 17:59:24 +01:00
c8b2158156
Lint
2017-09-29 10:42:23 +01:00
Stefan Parviainen