4c3f811050
switch RoomView:uploadFile to async to clean up then/catch handling
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-05-02 13:14:47 +01:00
f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-05-02 13:08:38 +01:00
db55f87699
avoid .done and .then anti-pattern
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-05-01 18:14:35 +01:00
6ec9e5f670
Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor
...
Refactor GroupStores into one global GroupStore
2018-05-01 12:33:06 +01:00
25690336c3
Prevent user getting trapped in group settings when an error occurs
2018-05-01 11:52:02 +01:00
023daef4b7
Refactor GroupStores into one global GroupStore
...
Take a step closer to a flux-like architecture for group data, for
the purposes of providing features that require it.
Now the app has a single GroupStore that can be poked to fetch
updates for a particular group.
2018-05-01 11:24:17 +01:00
22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons
...
Hide inline encryption icons except when hovering over a message
2018-04-30 17:57:22 +01:00
37cb8abf13
Fix UX issues with bug report dialog
...
* Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' &
escape to cancel works)
* Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous
about submitting logs.
* Continued campaign against 'Click here' links.
Fixes https://github.com/vector-im/riot-web/issues/6622
2018-04-30 13:39:46 +01:00
bbf4d3e39f
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-04-29 00:34:27 +01:00
0c309c88ad
Bluebird has no need for your .done()
2018-04-27 17:52:25 +01:00
0323f8ed0c
Wrap exception handling around all of loadSession
...
The user might (probably does) have a session even if we haven't actually tried
to load it yet, so wrap the whole loadSession code in the error handler we were
using for restoring sessions so we gracefully handle exceptions that happen
before trying to restore sessions too.
Remove the catch in MatrixChat that sent you to the login screen. This is
never the right way to handle an error condition: we should only display the
login screen if we successfully determined that the user has no session, or
they explicitly chose to blow their sessions away.
2018-04-27 11:25:13 +01:00
82d117974f
Remove unused import
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-04-27 11:16:29 +01:00
665e052596
Allow debugging of unhandled login errors
2018-04-26 15:09:17 +01:00
80837a9199
s/contian/contain/g
...
Fixes https://github.com/vector-im/riot-web/issues/6565
2018-04-24 17:53:23 +01:00
d42fa9d17a
Hide inline encryption icons except when hovering over a message
...
Closes https://github.com/vector-im/riot-web/issues/2882
This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988 )
I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
2018-04-22 22:30:37 -04:00
58cd585e86
start of BigMerge fixup
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-04-20 09:12:02 +01:00
92c98aa3e5
displayName should be tracked as static
2018-04-18 16:19:37 +01:00
f84573ec9f
convert HomePage to ES6 and split out the vectory bit
2018-04-18 10:23:32 +01:00
40a67ca8fe
point imports at the new locations
2018-04-13 00:43:44 +01:00
c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
# Conflicts:
# src/i18n/strings/en_EN.json
# src/i18n/strings/eu.json
# src/i18n/strings/fr.json
# src/i18n/strings/lv.json
# src/i18n/strings/ru.json
# src/i18n/strings/zh_Hant.json
2018-04-12 09:48:06 +01:00
8ab8f76254
move non-Riot-specific components over from riot-web
2018-04-11 23:58:04 +01:00
fca7325b20
Change comments
2018-04-10 15:56:57 +01:00
31e9979285
Add 500ms delay to show membershipBusy for longer
...
to avoid a UI that flashes quickly
2018-04-10 15:31:04 +01:00
74c84addea
Merge pull request #1831 from matrix-org/luke/fix-group-join-or-leave-update
...
Improve group join/leave feedback
2018-04-10 13:40:50 +01:00
de1073aacb
Factor out _closeSettings for cleanliness
2018-04-10 13:28:42 +01:00
24d4df87d1
Show membership spinner next to Leave/Join button when leaving/joining
2018-04-10 11:49:59 +01:00
0681df71b0
Hide settings after leaving a group
2018-04-10 11:49:35 +01:00
42141f7da7
Fetch group data when leaving or joining to update the view
2018-04-10 10:03:54 +01:00
0ff2837d7f
rename createGroupButton to not be a total misnomer...
2018-04-09 23:02:59 +01:00
2da45277cd
Update group join button to match new API
2018-04-09 16:57:27 +01:00
03016b9fc8
Merge pull request #1828 from matrix-org/luke/fix-redact-avatar
...
Make stickers/messages continuations of each other
2018-04-06 17:58:26 +01:00
01dd494f50
Make stickers/messages continuations of each other
2018-04-06 17:47:44 +01:00
008572afe1
Revert "Handle non-m.room.message event types."
...
This reverts commit f8d7ab10fa
2018-04-06 16:42:59 +01:00
1e586428ac
Update to match is_openly_joinable API
2018-04-06 14:58:10 +01:00
adb78c2931
Fix broken ForgotPassword component
2018-04-06 10:27:03 +01:00
59abfa6337
Merge pull request #1817 from matrix-org/luke/feature-group-set-joinable
...
Add radio button for setting group m.join_policy
2018-04-05 17:03:04 +01:00
03747b8287
Update to use new join_policy API
2018-04-05 16:56:35 +01:00
369cbdaaf6
Add missing PropType declarations.
2018-04-04 13:38:07 +01:00
702380c591
Add props to style (remaining) menu padding attributes.
2018-04-04 13:37:52 +01:00
1d90835de0
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
# Conflicts:
# src/components/structures/RoomView.js
2018-04-04 11:08:34 +01:00
f8f8bc469e
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-04-03 11:34:14 +01:00
80fbc757f5
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-03-31 17:46:31 +01:00
ff0834ad9d
Add comment.
2018-03-29 21:31:09 +01:00
c9283ad988
Merge branch 'luke/feature-group-set-joinable' of github.com:matrix-org/matrix-react-sdk into luke/feature-group-set-joinable
2018-03-29 17:28:44 +01:00
2bc8d6d3a4
Use less confusing values on radio buttons
2018-03-29 17:25:06 +01:00
e9193ff0b6
Merge branch 'develop' into luke/feature-group-set-joinable
2018-03-29 17:01:19 +01:00
f42cdf6a4c
Add radio button for setting group is_joinable
...
which dictates whether the group can be joined without invitation.
2018-03-29 16:57:07 +01:00
35fcb2c9ab
Catch rather than 'done' error handler.
2018-03-29 16:56:02 +01:00
23a52bdb4c
Indentation.
2018-03-29 16:46:22 +01:00
1226ad3330
Merge pull request #1815 from matrix-org/luke/feature-group-join
...
Join this community button
2018-03-29 15:44:46 +01:00
Michael Telatynski