Commit Graph

11999 Commits

Author SHA1 Message Date
Travis Ralston
c8b38606cc Fix terms auth continue button CSS 2018-11-14 18:40:00 -07:00
Travis Ralston
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
Travis Ralston
fe27fae80f Add m.login.terms to the ILAG-compatible flows
Otherwise we get "Registration Required" instead of "Pick a username"

Part of https://github.com/vector-im/riot-web/issues/7700
2018-11-14 17:59:24 -07:00
David Baker
7dd906620e Merge branch 'master' into develop 2018-11-13 18:50:20 +00:00
David Baker
09006a842a v0.14.4 2018-11-13 18:49:24 +00:00
David Baker
51a84c2f78 Prepare changelog for v0.14.4 2018-11-13 18:49:23 +00:00
J. Ryan Stinnett
a9e7ef17b3 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-13 18:45:17 +00:00
David Baker
208589d8ae Merge branch 'master' into develop 2018-11-13 17:58:18 +00:00
David Baker
3f8a3f761d v0.14.3 2018-11-13 17:57:26 +00:00
David Baker
9226548306 Prepare changelog for v0.14.3 2018-11-13 17:57:26 +00:00
David Baker
4f6a6df833
Merge pull request #2272 from matrix-org/travis/goto-command
Support room IDs and event permalinks in the join command
2018-11-09 10:52:30 +00:00
Travis Ralston
7e748add1f
Merge pull request #2274 from jryans/align-eed-safari
Align encrypted event buttons in Safari
2018-11-08 13:52:59 -07:00
J. Ryan Stinnett
b9ccdc4952 Align encrypted event buttons in Safari
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-11-08 20:38:16 +01:00
Travis Ralston
f0080c22bf
Merge pull request #2273 from jryans/align-eed
Align buttons in encrypted event dialog
2018-11-08 09:30:38 -07:00
J. Ryan Stinnett
13039b05b9 Align buttons in encrypted event dialog
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-11-08 17:17:57 +01:00
Travis Ralston
5d804e1e57 Appease the linter 2018-11-07 17:01:47 -07:00
Travis Ralston
88bfe6fc39 debugging--; 2018-11-07 16:59:24 -07:00
Travis Ralston
9017635c79 Support room IDs and event permalinks in the join command
Mostly useful for power users who want to jump to places more easily.

Examples:
* `/join !somewhere:example.org`
* `/join !somewhere:example.org altserver.com` - to join through `altserver.com`
* `/goto https://matrix.to/#/!somewhere:example.org/$something:example.org?via=altserver.com`

Fixes https://github.com/vector-im/riot-web/issues/3248
Fixes https://github.com/vector-im/riot-web/issues/7543
2018-11-07 16:53:29 -07:00
Travis Ralston
aeef80fb1c
Merge pull request #2268 from jryans/guest-warning
Add visible guest warning to encourage login
2018-11-07 13:15:34 -07:00
J. Ryan Stinnett
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
Travis Ralston
57ee816c90
Merge pull request #2266 from matrix-org/travis/fix-pinned-rooms
Regenerate the room list when m.fully_read is issued
2018-11-05 08:49:29 -07:00
Travis Ralston
ec2528e8b5
Update MatrixActionCreators.js 2018-11-04 23:00:47 -07:00
Travis Ralston
f9d5c11d8d Regenerate the room list when m.fully_read is issued
Not doing so results in the RoomListStore tracking stale data when the user reads messages on another device. The visual effect of this is rooms being incorrectly pinned in places they shouldn't be, such as the top of the list. This also fixes another visual bug where rooms don't move down once their timelines are read. This second issue is mot prominent when multiple rooms have been pinned to the top, and the middle one is read ahead of the others - it'll stick around until some other condition decides to wipe the room's cached state.

Fixes https://github.com/vector-im/riot-web/issues/7653
2018-11-04 19:47:24 -07:00
Travis Ralston
ba56803e0d
Merge pull request #2263 from matrix-org/travis/cleanup-request
Remove the request-only stuff we don't need anymore
2018-11-02 09:39:08 -06:00
Travis Ralston
151b4cc7fa
Merge pull request #2265 from matrix-org/travis/fix-pinned-rooms
Improve performance of room list and fix timestamp ordering when pinning rooms
2018-11-01 18:24:04 -06:00
Travis Ralston
3960ae2fcd Add more commentary around how the roomCache works 2018-11-01 17:17:01 -06:00
Travis Ralston
a713cc5c52 Compare the right types of events 2018-11-01 17:07:05 -06:00
Travis Ralston
122868e32f Removing timing/performance tracking on room list store
This was used to verify the fix was actually making improvements and can be safely taken out.
2018-11-01 16:30:48 -06:00
Travis Ralston
0c7aadb92b Improve room list sort performance by caching common variables
This won't help much if the user is in a ton of highly active rooms, but for the most part this will help those in thousands of rooms, many of which are likely to be quiet. 

Fixes https://github.com/vector-im/riot-web/issues/7646
Fixes https://github.com/vector-im/riot-web/issues/7645 (due to timestamp ordering)
2018-11-01 16:28:13 -06:00
Travis Ralston
272acfa2f5 Appease the linter 2018-11-01 14:46:39 -06:00
Travis Ralston
5558b7a3b2 Avoid hitting the SettingsStore thousands of times when generating room lists
Should fix https://github.com/vector-im/riot-web/issues/7646 to some degree
2018-11-01 14:43:15 -06:00
Travis Ralston
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
Travis Ralston
873133458a Remove the request-only stuff we don't need anymore
This was introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2250 but can be pulled out due to https://github.com/matrix-org/matrix-js-sdk/pull/770. See https://github.com/vector-im/riot-web/issues/7634 for more information about the future.
2018-10-31 13:06:57 -06:00
Bruno Windels
cf31f01c85
Merge pull request #2261 from matrix-org/bwindels/e2eonlyondevelop
only run e2e tests on PRs targeted on develop
2018-10-31 15:12:57 +00:00
Bruno Windels
8a08180187 only run e2e tests on prs targeted on develop 2018-10-31 15:39:45 +01:00
David Baker
33e2fc28b7
Merge pull request #2254 from matrix-org/travis/permalink-routing-2
Fix and test matrix.to alias permalinks
2018-10-29 15:55:11 +00:00
David Baker
507bfb4b69 Merge branch 'master' into develop 2018-10-29 14:10:28 +00:00
David Baker
c5004ffbe3 v0.14.2 2018-10-29 14:07:03 +00:00
David Baker
2077678088 Prepare changelog for v0.14.2 2018-10-29 14:06:41 +00:00
David Baker
eb22b9141a released js-sdk 2018-10-29 14:03:19 +00:00
David Baker
69a8b3bd95
Merge pull request #2258 from matrix-org/dbkr/fix_ascii_smiley_emojification_2
Fix autoreplacement of ascii emoji
2018-10-29 13:57:09 +00:00
David Baker
9933a3cc63 Fix autoreplacement of ascii emoji
More slate API updates in code paths I didn't test

Fixes https://github.com/vector-im/riot-web/issues/7509
2018-10-29 13:55:41 +00:00
David Baker
04ed61ec4e
Merge pull request #2257 from matrix-org/t3chguy/view_community_context_menu
click-through svg on tag tile context menu to make it less weird
2018-10-29 11:37:56 +00:00
Travis Ralston
fcbc16337e
Merge pull request #2256 from matrix-org/t3chguy/hide_timetravel
Hide Matthew's Time Machine
2018-10-28 23:22:43 -06:00
Travis Ralston
c2b7df763d
Merge pull request #2255 from aaronraimist/lint
Update babel-eslint to 8.1.1
2018-10-28 23:21:39 -06:00
Michael Telatynski
8a3824b9ca click-through svg on tag tile context menu to make it less weird
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-10-27 11:27:43 +01:00
Michael Telatynski
d54bf13fab Hide all the time travel.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-10-27 11:06:52 +01:00
Aaron Raimist
e61e7f2626
Fix eslint --fix
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 23:04:00 -05:00
Aaron Raimist
5f3b03c85a
Fix a few no-useless-escape lint errors
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 23:00:54 -05:00
Aaron Raimist
49ce4ef117
eslint --fix src/
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:50:38 -05:00