mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-29 12:58:53 +03:00
Code Issues Projects Releases Packages Wiki Activity
6786 commits 215 branches 561 tags 417 MiB
Commit graph

6786 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
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
Luke Barnard
d2b9fcc7aa Merge pull request #1440 from turt2live/travis/pl_enhancements 
Enhancements to room power level settings
 2017-10-11 17:31:20 +02:00
Travis Ralston
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
Travis Ralston
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
Luke Barnard
21a31b02d0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-10-11 16:02:10 +01:00
Luke Barnard
060bf3bdf6 Remove inline CSS 2017-10-11 16:02:01 +01:00
Travis Ralston
0ab5b1a6af _td translatable strings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-11 08:50:28 -06:00
Travis Ralston
f874fc1203 Merge branch 'develop' into travis/pl_enhancements 2017-10-11 08:42:45 -06:00
Luke Barnard
ffb9dd844a Merge pull request #868 from psaavedra/set_default_federate_by_settings 
Added TextInputWithCheckbox dialog
 2017-10-11 16:28:03 +02:00
Luke Barnard
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
David Baker
0f84216a9f Grey out login form when no valid HS 2017-10-11 14:05:34 +01:00
Luke Barnard
99aabd9025 Merge pull request #1451 from matrix-org/t3chguy/redundant_thing 
Remove redundant stale onKeyDown
 2017-10-11 14:31:08 +02:00
Luke Barnard
8aee5e1c25 Merge pull request #1453 from matrix-org/t3chguy/textForEvent 
Only allow event state event handlers on state events
 2017-10-11 14:30:02 +02:00
David Baker
fa24b4bd2d Remove this log - it's not an error worth logging 2017-10-11 09:48:12 +01:00
Luke Barnard
904c3aa9f0 Merge pull request #1452 from matrix-org/luke/groups-store-2 
Modify the group store to include group rooms
 2017-10-11 10:42:42 +02:00
David Baker
80ad7d4ad6 Update translations 2017-10-10 19:27:51 +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
Michael Telatynski
152499a17d
DRY map lookup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-06 12:16:54 +01:00
Michael Telatynski
91ba939e23
tiny bit of de-lint for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-06 12:10:07 +01:00
Michael Telatynski
6a4e3792d4
split handlers into state and non-states 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-06 12:07:38 +01:00
Luke Barnard
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
Michael Telatynski
a8231f7bf9
Remove redundant stale onKeyDown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-05 08:26:57 +01:00
Michael Telatynski
c115980f21
remove redundant&stale onKeyDown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-05 08:08:39 +01:00
Michael Telatynski
38de4ae152
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-05 08:00:22 +01:00
Michael Telatynski
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
Luke Barnard
2ba0a801c4 Merge pull request #1449 from matrix-org/luke/groups-store 
Factor-out GroupStore and create GroupStoreCache
 2017-10-04 18:11:11 +01:00
Luke Barnard
cbb36b163b Typo 2017-10-04 18:05:40 +01:00
Luke Barnard
c1318e9102 Only maintain one GroupStore in the GroupStoreCache 
So that the group store data is up-to-date and to prevent group stores hanging around in memory
 2017-10-04 17:51:38 +01:00
Luke Barnard
b16eb1713e Typo 2017-10-04 17:01:44 +01:00
Luke Barnard
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
Luke Barnard
6875005e30 Merge pull request #1448 from matrix-org/luke/fix-related-groups-in-labs 
Put related groups UI behind groups labs flag
 2017-10-04 15:00:08 +01:00
Luke Barnard
ed74ac394b Put related groups UI behind groups labs flag 2017-10-04 14:35:13 +01:00
Luke Barnard
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
Luke Barnard
54ba164862 Merge pull request #1446 from matrix-org/luke/feature-related-groups-ui 
Implement UI for editing related groups of a room
 2017-10-04 14:21:48 +01:00
Luke Barnard
0c6b5776ec Remove commented imports 2017-10-04 14:09:51 +01:00
Luke Barnard
02e7287123 Remove constraint on groups being local, remove logging 2017-10-04 14:08:31 +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
9f39a15163 Merge pull request #1445 from matrix-org/luke/fix-editable-item-list 
Fix a couple of bugs with EditableItemList
 2017-10-04 13:22:46 +01:00
Luke Barnard
7be5e685f7 Implement UI for editing related groups of a room 
(using the new EditableItemList)
 2017-10-04 13:19:57 +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
1938a767a2 Merge pull request #1444 from matrix-org/luke/refactor-editable-list-from-alias-settings 
Factor out EditableItemList from AliasSettings
 2017-10-04 10:56:17 +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
407a632a8d Fix typo 2017-10-04 10:26:43 +01:00
Luke Barnard
d25ebfb844 Remove cruft from EIL 2017-10-04 10:15:44 +01:00
Luke Barnard
011aadcb94 Merge pull request #1421 from pafcu/develop 
Add dummy translation function to mark translatable strings
 2017-10-04 10:09:09 +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
Luke Barnard
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
Luke Barnard
6b834bc72e Add confirmation dialog for removing room from group 2017-10-03 11:16:22 +01:00
Luke Barnard
0116c4b486 Log the error when failing to removie room from group 2017-10-03 10:14:08 +01:00