dad8e6a261
Merge pull request #2326 from jryans/group-users-error
...
Allow group summary to load when /users fails
2018-12-05 10:56:32 +00:00
5fc25fd6ba
Only mark group as failed to load for summary
...
Currently, any error in the `GroupStore`s several requests can cause the whole
`GroupView` component to hide and be mark the group as failed to load.
Since it is known that group members may fail to load in some cases, let's only
show failed to load for the whole group when the summary fails.
This also strengthens the `GroupView` test by ensuring we wait for multiple
updates for checking results.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com >
2018-12-04 18:32:16 -06:00
2b077b4f5d
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
2018-12-01 16:24:43 +00:00
015af7d771
Use sensible logging
2018-11-27 13:41:34 -07:00
5600a9d02a
Validate the identity server
2018-11-21 14:14:08 -07:00
4cfefe4c3c
Introduce an onUsernameBlur and fix hostname parsing
2018-11-21 14:13:56 -07:00
6f0f930e0a
Merge branch 'develop' into travis/well-known
2018-11-21 13:30:57 -07:00
d714176fcd
Merge pull request #2169 from matrix-org/dbkr/e2e_backups
...
Online incremental megolm backups (v2)
2018-11-21 18:37:43 +00:00
985966f8be
Update async dialog interface to use promises
...
Hopefully makes the syntax a bit nicer. Also uses ES6 async import
rather than require.ensure which is now deprecated. Also also
displays an error if the component fails to load rather than falling
over in a heap, which is nice.
2018-11-21 16:56:44 +00:00
8ccaf53d20
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-11-20 18:08:39 +00:00
c61031d3e1
Merge pull request #2279 from matrix-org/rav/sso_login_type
...
Support for m.login.sso
2018-11-19 14:14:21 +01:00
7df003ef74
Be more positive in property naming
2018-11-16 12:15:44 -07:00
90f22c7b43
Support for m.login.sso
...
Adds support for the m.login.sso login type, which is handled the same way as
CAS, and also makes it look a bit nicer.
2018-11-15 19:05:39 +00:00
2ffc024fab
Add a dedicated "Continue" button to the terms auth stage
...
The button itself is conditionally enabled because the ILAG dialog already has a continue button. It'd be confusing to users to have 2 continue buttons on the same dialog, so this commit adds the structure required to pass along clicks from the dialog's button down to the UI auth component.
The other place the continue button would appear is on the register page (not ILAG). The button's style is different here, however that will be improved in a later commit.
Part of https://github.com/vector-im/riot-web/issues/7700
2018-11-14 18:26:35 -07:00
975392cbbb
Add visible guest warning to encourage login
...
If you happen to get logged out, it might not be very clear what has happened
visually. This adds a visible warning to the top of the home page to suggest
logging in.
Fixes vector-im/riot-web#7629 .
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com >
2018-11-06 21:08:57 +01:00
57b99893e5
Merge pull request #1936 from turt2live/travis/pinned-room-list
...
Add options to pin unread/mentioned rooms to the top of the room list
2018-11-01 08:04:12 -06:00
8ac62f8c12
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-29 16:20:45 +00:00
49ce4ef117
eslint --fix src/
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-26 22:50:38 -05:00
ef8c9246aa
Maybe fix UserSettings?
2018-10-26 10:07:21 -06:00
9cdb527163
Merge branch 'develop' into travis/pinned-room-list
2018-10-25 10:57:08 -06:00
b59b8b7fca
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-25 17:42:46 +01:00
6ee495b912
Merge remote-tracking branch 'origin/develop' into travis/permalink-routing
2018-10-24 16:36:39 -06:00
def0b2d8fb
Add developertools option to UserSettings
2018-10-24 18:20:16 +01:00
d7367a7cfd
Merge branch 'develop' into travis/permalink-routing
2018-10-24 09:12:14 -06:00
fe901142aa
Split long string over two lines
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-23 17:20:57 -05:00
92bfb42784
Use one string instead of two
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-23 13:11:36 -05:00
a6c78ace4f
Add warning when administrator leaves community
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-23 12:25:12 -05:00
8ff1da11ed
Merge pull request #2237 from aaronraimist/camel-case
...
lint: make colorScheme camel case
2018-10-22 22:44:14 -06:00
1aa3085958
Oh right, can't change these
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-22 23:33:38 -05:00
cb033bcadd
Why not change it everywhere while we're at it
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-22 23:16:07 -05:00
4b3c865959
lint: make colorScheme camel case
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-22 23:07:47 -05:00
41bd6e4366
Change leave room button text, OK -> Leave
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-22 20:55:24 -05:00
c677dd8a24
Merge pull request #2225 from matrix-org/travis/join-room-text
...
Add a bit of text to explain the purpose of the RoomPreviewSpinner
2018-10-22 13:11:09 +01:00
b8153dcec7
Merge pull request #2219 from matrix-org/travis/login-register-composer
...
Move the login box from the left sidebar to where the composer is
2018-10-22 13:05:19 +01:00
7383133846
Support parsing matrix.to links in the timeline with ?via= in them
...
This ends up being translated to ?server_name= in the matrix-js-sdk, although that has a bug at the time of writing. It converts `server_name: ['a', 'b']` to `?server_name=a,b` instead of `?server_name=a&server_name=b`
For reference: the `viaServers` option is routed through the 'join_room' action to RoomViewStore#_joinRoom which is passed directly to the js-sdk http-api#joinRoom function.
Next steps:
* Fix the js-sdk parsing
* Make the SDK generate matrix.to links with ?via=
2018-10-19 13:31:18 -06:00
71a97170d7
Linting
2018-10-18 17:06:47 -06:00
0030ba7015
Support .well-known discovery
...
Fixes https://github.com/vector-im/riot-web/issues/7253
2018-10-18 16:42:54 -06:00
af8dfda9a7
Add a bit of text to explain the purpose of the RoomPreviewSpinner
...
Fixes https://github.com/vector-im/riot-web/issues/5869
2018-10-17 13:53:12 -06:00
06764c2bab
Merge pull request #2220 from matrix-org/travis/peek-invite-nag
...
Don't show the invite nag bar when peeking
2018-10-16 09:30:09 -06:00
6323d78b0c
Move tinter init to MatrixChat
...
This is a much better place for it to live
2018-10-15 14:41:00 -06:00
2d62fda862
Don't show the invite nag bar when peeking
2018-10-15 14:35:36 -06:00
94aac62f25
Move the login box from the left sidebar to where the composer is
...
Fixes https://github.com/vector-im/riot-web/issues/4227
This includes removing the collapse button that isn't needed anymore.
2018-10-15 14:26:24 -06:00
5a72a5863f
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
2018-10-15 19:20:55 +01:00
3d8f0adf56
Move pinned rooms check to the RoomListStore
2018-10-12 14:35:54 -06:00
103ed71eb5
Merge branch 'develop' into travis/pinned-room-list
2018-10-12 14:09:52 -06:00
bba04a6820
Merge pull request #2205 from matrix-org/dbkr/lazy_load_check_before_sync
...
Handle InvalidStoreError from js-sdk
2018-10-10 18:35:36 +02:00
655627209a
unused function
2018-10-10 17:25:32 +01:00
0abcb5c78d
Handle InvalidStoreError from js-sdk
...
js-sdk now emits sync state ERROR with an InvalidStoreError if the
store needs to be cleared before it can be used.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/759
2018-10-10 17:07:17 +01:00
dfb4c594a8
Merge pull request #2204 from matrix-org/bwindels/rrfallbackavatars
...
Fall back to default avatar in RR when member isn't loaded yet
2018-10-10 16:58:59 +02:00
5128386160
allow read receipts without an existing member in MessagePanel
2018-10-10 16:15:20 +02:00
David Baker