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
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
e9fb5712bd
Merge branch 'develop' into dbkr/group_userlist
2017-09-19 13:26:55 +01:00
1f837d2ae1
Make /join join again
...
The auto_join parameter to view_room got broken at some point so
/join took you to the room and then sat there like a lemon.
Fixes https://github.com/vector-im/riot-web/issues/5029
2017-09-14 23:06:00 +01:00
3c3328c5f1
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-09-13 16:34:39 +01:00
0e8bd856bc
remove obsolete this._roomViewStoreToken.remove();
2017-09-08 20:14:27 +02:00
663dc3e513
Don't re-render matrixchat unnecessarily
...
...on room switch. We were setting most of the state in viewRoom,
but getting the current room ID from the RoomViewStore, but this
meant we did one setState from the RoomViewStore updating,
re-rendered and then setState again in viewRoom causing another
render. This just sets the room ID in viewRoom.
2017-09-08 18:56:57 +01:00
d86fe0df6e
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-29 13:29:55 +01:00
299db845ff
PR feedback
2017-08-25 12:10:13 +01:00
b65e1769d7
Dispatch incoming_call synchronously
...
- this should fix a race where if the 'hangup' arrives hard on the tail of the
Call.incoming, we don't ignore it.
(We still have a problem in that we blip the hangup tone and UI, but that is
arguably a separate problem)
2017-08-24 13:05:17 +01:00
bdb2d6b475
Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings
...
# Conflicts:
# src/components/structures/MatrixChat.js
2017-08-17 13:39:19 +01:00
ca5e26744f
Make dialog more specific and hide options behind advanced spoiler
2017-08-17 13:33:07 +01:00
ddf1017799
Make group invites work
2017-08-16 14:58:30 +01:00
252ab208e4
Merge pull request #1300 from matrix-org/dbkr/userpicker
...
Refactor ChatInviteDialog to be UserPickerDialog
2017-08-16 14:29:07 +01:00
e1ddd3781d
Merge branch 'dbkr/userpicker' into dbkr/group_userlist
2017-08-15 14:10:45 +01:00
1b66e88b6e
ChatInviteDialog -> UserPickerDialog pt 2
...
The other changes I forgot to add
2017-08-14 17:43:00 +01:00
2844b574d5
Re-add useful comment
2017-08-14 14:41:03 +01:00
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
d9e8292a5e
Revert "At /user, view member of current room"
2017-08-14 14:06:54 +01:00
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
89254e77f4
When no member, use `null` `roomId`
2017-08-10 15:23:14 +01:00
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
24599ace32
don't track error messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:49:11 +01:00
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
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
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
4b4b730233
fix and i18n the impl
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-02 13:41:26 +01:00
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
bf98c0da7c
un-i18n Modal Analytics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-27 17:19:18 +01:00
0d7cc59d99
replace q method calls with bluebird ones
...
```
find src test -name '*.js' |
xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
2017-07-12 18:05:40 +01:00
0254d2b3a2
q(...) -> Promise.resolve
...
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
2017-07-12 18:05:08 +01:00
a06bd84213
replace imports of `q` with bluebird
...
update `package.json`
```
find src test -name '*.js' |
xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
find src test -name '*.js' |
xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
2017-07-12 18:05:08 +01:00
29990296d2
Lint
2017-07-11 11:02:23 +01:00
925d5bd480
Add featured users to Group View
2017-07-10 19:32:02 +01:00
a2ff289ed8
Add 'groups' page
2017-06-28 13:56:18 +01:00
6c9716637e
Fix linting errors
2017-06-27 13:13:00 +01:00
09b1012388
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-26 17:49:06 +01:00
8f3eb89f8b
Fix potential race in setting client listeners
2017-06-23 10:48:21 +01:00
75ef80ecd4
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-23 09:51:24 +01:00
ac3e039e2a
Merge pull request #1019 from matrix-org/t3chguy/updating_stuff
...
manual check for updates
2017-06-22 17:36:55 +01:00
fcd945afc2
Fix an incorrect console error
...
... this error is thrown when registering as guest or loading from
localstorage, not when using tokenparams.
2017-06-22 15:08:30 +01:00
72e73c05ac
Merge pull request #1127 from matrix-org/t3chguy/reset_favicon_on_logout
...
reset page subtitle and favicon on_logged_out
2017-06-21 14:58:26 +01:00
9ef9d09d44
Fix another race with first-sync
...
Set the first sync variables in onWillStartClient, as they race if
set on logged in (similar fix to https://github.com/matrix-org/matrix-react-sdk/pull/1124 )
2017-06-21 11:27:18 +01:00
7f6a252bcb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout
2017-06-20 18:39:59 +01:00
cd73139af5
Various logging cleanups
...
* don't just log errors without any context as to where they came from or what
they mean
* avoid the use of '%s' and multi-argument console.log because it looks awful
under karma.
2017-06-20 17:38:02 +01:00
b712a15a14
move in case it is racey ---- somehow?
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-20 16:15:42 +01:00
04aed416d2
Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/structures/MatrixChat.js
2017-06-20 15:37:05 +01:00
5460b0f5b2
reset page subtitle on_logged_out
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-20 15:31:12 +01:00
a2dc17256a
Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff
2017-06-20 13:44:27 +01:00
0c431887b0
Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests
...
Pop up a dialog when we get a room key request
2017-06-20 13:20:58 +01:00
Michael Telatynski