imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7058 commits 222 branches 563 tags 470 MiB
Commit graph

1849 commits

Author SHA1 Message Date
David Baker
a15c2100d1 Sort out right panel callapsing on GroupView 2017-08-15 13:12:39 +01:00
David Baker
64f352dda7 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-15 10:49:07 +01:00
David Baker
1b66e88b6e ChatInviteDialog -> UserPickerDialog pt 2 
The other changes I forgot to add
 2017-08-14 17:43:00 +01:00
Luke Barnard
e48c4911b8 Merge pull request #1294 from matrix-org/revert-1290-luke/fix-user-url-no-middle-panel 
Revert "At /user, view member of current room"
 2017-08-14 16:31:24 +01:00
Luke Barnard
0079e70006 Display RM when it = a standalone member event 
Standalone = not next to any member events in the timeline.

fixes vector-im/riot-web#4694
 2017-08-14 15:40:49 +01:00
Luke Barnard
2844b574d5 Re-add useful comment 2017-08-14 14:41:03 +01:00
Luke Barnard
b59de7964c Wait for first sync before dispatching view_user on /user 
the RightPanel will be mounted once we're done doing the first sync, so wait until then and then dispatch a view_user. This is not very nice but it's what we do for view_room.
 2017-08-14 14:37:49 +01:00
Luke Barnard
d9e8292a5e Revert "At /user, view member of current room" 2017-08-14 14:06:54 +01:00
Luke Barnard
3d5d7fa9c8 Lint 2017-08-14 13:59:12 +01:00
Luke Barnard
cbd8018ac8 Support semi-perma-disabling of lab features 
Adding `override: true` will remove the feature from the labs section, and force Riot to always use the default value (i.e. ignoring localStorage). This is useful removing features entirely when they might be deliberately not working but we still want to do a release.
 2017-08-14 12:26:31 +01:00
David Baker
02217c8bd2 Merge pull request #1290 from matrix-org/luke/fix-user-url-no-middle-panel 
At /user, view member of current room
 2017-08-11 10:49:22 +01:00
Luke Barnard
12966d06cd Merge pull request #1255 from matrix-org/t3chguy/i18n_analytics 
un-i18n Modal Analytics
 2017-08-10 15:35:46 +01:00
Luke Barnard
d3ba1f40dc Merge pull request #1272 from matrix-org/t3chguy/hide_other_events 
allow hiding of avatar/display name changes
 2017-08-10 15:35:11 +01:00
Luke Barnard
89254e77f4 When no member, use null roomId 2017-08-10 15:23:14 +01:00
Michael Telatynski
41843f021d
don't track two more potential risks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:21:01 +01:00
Michael Telatynski
56ea528f43
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:17:52 +01:00
Michael Telatynski
ab3abd2f7f
fix string casing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:59:55 +01:00
Michael Telatynski
b19c1010aa
Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/Analytics.js
 2017-08-10 13:54:55 +01:00
Michael Telatynski
24599ace32
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:49:11 +01:00
Marcel
60c1ba4f4d Add LanguageDropdown to LoginPage (#1284) 2017-08-10 13:29:10 +01:00
Luke Barnard
07633fe67f At /user, view member of current room 
With the fallback of existing behaviour, which is UserView (no middle panel and no avatar, display name).

To improve, MemberInfo should probably track the current roomId and userId and then update the view asynchronously by re-fetching the member object when either roomId or userId change.

Also, it should be hitting the profile API to get the user's avatar if a room hasn't been specified.
 2017-08-10 13:12:50 +01:00
David Baker
c1546ceb59 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-09 13:46:15 +01:00
Richard van der Hoff
38114711fd Make MatrixChat do fewer render cycles during mount 
This is mostly with the intent of making the login tests more reliable, but it
seems generally worthwhile:

* keep screenAfterLogin in the object props rather than `state` so that we can
  clear it without triggering a rerender

* also move our record of the window width to the object props, and call
  `handleResize` from componentWillMount rather than componentDidMount so that
  we don't trigger a rerender by updating `state.width`

* Remove update of unused `loading` state
 2017-08-08 22:31:40 +01:00
Luke Barnard
bef6726290 Lint 2017-08-08 13:42:51 +01:00
Luke Barnard
b08d32371d Add optional setting for hiding avatars in <Pill>s 
As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445
 2017-08-08 11:13:29 +01:00
Michael Telatynski
ffdffb643d
allow hiding of avatar/display name changes 2017-08-04 17:22:01 +01:00
David Baker
fe19dbee02 Remove unused component 2017-08-03 09:26:41 +01:00
Michael Telatynski
6e39e72849
fix m.federate always being false because value is a string. Y HTML... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-02 14:00:24 +01:00
Michael Telatynski
4b4b730233
fix and i18n the impl 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-02 13:41:26 +01:00
Michael Telatynski
fd454b476a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings 2017-08-02 12:15:00 +01:00
Michael Telatynski
bf98c0da7c
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:19:18 +01:00
Luke Barnard
c4f049effe Merge pull request #1243 from matrix-org/t3chguy/hide-join-part-2 
T3chguy/hide join part (attempt) 2
 2017-07-26 17:15:43 +01:00
Michael Telatynski
2348c24369
revert the rm-always-moves-down loop as thats done Server side... 2017-07-26 14:33:48 +01:00
Michael Telatynski
3eb87e2aa3
change lastShownEventIndex -> lastShownEvent since some places 
do not have the same i reference (namely MELS generation)
this way a member event at bottom of MELS (if is the last event
in the timeline will have last set appropriately)
 2017-07-26 12:17:05 +01:00
Michael Telatynski
f42ae1662b
change wording of comment as per Luke's review 2017-07-26 11:46:59 +01:00
David Baker
7469a9ae2a Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-07-25 17:20:16 +01:00
David Baker
c2034d5335 Add user list to groups 2017-07-25 15:56:16 +01:00
Michael Telatynski
8e66e64621
fix for loop - check happens before pre-inc so cause issues at end of TL 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 13:16:16 +01:00
Michael Telatynski
c9b547368b
add algo to ensure that RM always moves forwards 
this is needed so that if a client which does not hide any events
sets and RM at bottom of timeline, then riot-web which hides events
sets the RM it'd set it at X-N where X is bottom and N is the amount of
hidden events at bottom of the timeline, this way now an RM will
fall through to the hidden events below a seen event.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 13:10:57 +01:00
Michael Telatynski
a4abd1baa7
fix comment and remove unused const 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 12:03:32 +01:00
Michael Telatynski
ae973e1e99
unrevert some more... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 11:37:21 +01:00
Michael Telatynski
7e355f7cda
unrevert most of the logic. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 23:18:18 +01:00
Michael Telatynski
1fa4fe0b9a
remove comments/commented code 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 22:51:31 +01:00
Michael Telatynski
5808fce60e
fix logic ordering 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 22:45:19 +01:00
Michael Telatynski
17758cd1db
attempt to incorporate more code #2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 20:43:03 +01:00
Michael Telatynski
e47e14ed19
attempt to incorporate more code #1 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 20:22:01 +01:00
Michael Telatynski
928294eba3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide-join-part-2 2017-07-21 19:23:42 +01:00
David Baker
f9cff50ef5 _loadGroupFromServer doesn't return a promise 2017-07-21 14:41:29 +01:00
David Baker
d48924e768 Lint 2017-07-21 14:30:09 +01:00
David Baker
be7228996a This should be null rather than false 2017-07-21 14:18:28 +01:00