e858cf3bcb
Merge branch 'master' into develop
2018-06-12 14:26:29 +01:00
13d52065f5
Merge branch 'release-v0.12.7'
2018-06-12 14:23:48 +01:00
50e08c7560
Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone
...
re-run checkIfAlone if a member change occurred in the active room
2018-06-08 17:36:42 +01:00
0b9b03c9ee
re-run checkIfAlone if a member change occurred in the active room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-07 22:01:27 +01:00
83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open
2018-06-06 09:17:08 -06:00
bea99e07b3
Merge pull request #1940 from matrix-org/luke/exit_settings
...
Fix click on faded left/right/middle panel -> close settings
2018-06-05 10:36:58 +01:00
6a317569d7
Add null-guard to support browsers that don't support performance
...
Like Tor.
Fixes https://github.com/vector-im/riot-web/issues/6781
2018-06-04 09:38:21 +01:00
d30bc2dc6b
Merge pull request #1937 from turt2live/travis/no-guest
...
Replace "Login as guest" with "Try the app first" on login page
2018-06-01 11:58:26 +01:00
404c071f2a
Remove lie from docs
2018-05-29 13:19:56 +01:00
da9fe9917b
Fix click on faded left/right/middle panel -> close settings
...
- implement generic dispatch to close user/room/group settings
- use dispatch to allow clicks on disabled left/right/middle panel to
close settings
A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
2018-05-29 13:16:39 +01:00
05357b9f8c
improve comment
2018-05-29 12:07:56 +01:00
e690bcb6ef
Replace "Login as guest" with "Try the app first" on login page
...
Fixes vector-im/riot-web#5875
Signed-off-by: Travis Ralston <travpc@gmail.com >
2018-05-26 20:54:19 -06:00
752605429c
Persist pinned message open-ness between room switches
...
Addresses part of https://github.com/vector-im/riot-web/issues/5405
Signed-off-by: Travis Ralston <travpc@gmail.com >
2018-05-26 19:58:12 -06:00
5147246c17
kill stream when using gUM for permission to device labels to kill camera
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-05-26 15:41:25 +01:00
168b956b3c
homeserver
2018-05-24 17:01:00 +01:00
9d2f223773
Message for leaving server notices room
2018-05-24 16:54:48 +01:00
658e88c30f
Implement consent/terms and conditions dialog for /_matrix/consent flow
2018-05-22 18:03:56 +01:00
ae10491f95
Space between sentences in 'leave room' warning
2018-05-22 09:28:41 +01:00
0bda607bb2
Only show cookie bar if analytics configured
2018-05-16 15:53:43 +01:00
d15051a635
Add policyLink configuration to piwik
...
Also:
- Make CookieBar ES6 class
- Alter phrasing on CookieBar
- Conditionaly display longer "...(See our ++cookie and privacy
policies++)." if policy link is configured.
2018-05-16 15:49:23 +01:00
d01e738839
Fix UserSettings for new analyticsOptIn
2018-05-16 15:20:38 +01:00
ac1cd384e7
Implement opt-in analytics with cookie bar
2018-05-16 15:20:38 +01:00
9e11720191
Add setting to enable widget screenshots (if widgets declare support)
...
Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708
Signed-off-by: Travis Ralston <travpc@gmail.com >
2018-05-12 14:30:59 -06:00
1f2f3474ed
Delinting
2018-05-11 17:28:12 +01:00
2c2eda1f00
Export ContextualMenu component, with added hasBackground property
...
, which is only enabled when `createMenu` is used.
2018-05-10 17:51:49 +01:00
9046769132
Factor out ContextualMenu component
2018-05-10 16:02:25 +01:00
22f2d6f292
Fix crash when browser doesn't report page change measurement
2018-05-03 14:08:10 +01:00
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
David Baker