Commit Graph

15239 Commits (3161682836f26c8620eae087d2cba28f0595b832)

Author SHA1 Message Date
Travis Ralston 3161682836
Merge pull request #2804 from matrix-org/devtools_serverlist
Add View Servers in Room to Devtools
2019-05-10 11:32:17 -06:00
David Baker 35435edd46
Merge pull request #2951 from Yoshiin/yoshiin/develop
Update 'Rooms' import RoomView.js file
2019-05-10 09:54:45 +01:00
Michael Telatynski cd5a460b2b Iterate PR based on feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-05-09 22:30:45 +01:00
Michael Telatynski 16c027dc61 Merge branches 'develop' and 'devtools_serverlist' of github.com:matrix-org/matrix-react-sdk into devtools_serverlist 2019-05-09 22:27:37 +01:00
Léo Mora 2342eb5426
Update 'Rooms' import 2019-05-09 16:17:54 +02:00
J. Ryan Stinnett d6f47d4c10
Merge pull request #2950 from matrix-org/jryans/extract-reaction-dimensions
Extract `ReactionDimension` out of `MessageActionBar`
2019-05-09 11:34:44 +01:00
J. Ryan Stinnett 576241236c Extract `ReactionDimension` out of `MessageActionBar`
The reactions bits were cluttering up `MessageActionBar` so they have now been
extracted to a separate component.
2019-05-08 13:53:41 +01:00
David Baker 09a9b2e15e Merge branch 'master' into develop 2019-05-07 15:50:14 +01:00
David Baker 3b03e23ace v1.1.0 2019-05-07 15:36:10 +01:00
David Baker e798177c7a Prepare changelog for v1.1.0 2019-05-07 15:36:09 +01:00
David Baker aec1e98086 Released js-sdk 2019-05-07 15:30:21 +01:00
J. Ryan Stinnett 2b2bfbeaaf Relax password requirements to score of 3 out of 4
This makes it a bit easier to meet the requirements while still requiring a
fairly strong value. The progress bar displays a score of 3 as reaching 100% for
simplicity.

Fixes https://github.com/vector-im/riot-web/issues/9642
2019-05-07 12:59:53 +01:00
J. Ryan Stinnett 0316deb6c5 Restore access to message quote option on first click
This repairs access to the "Quote" option of the message context menu by passing
down a getter so that we always access the most recent tile and reply thread
instances. This ensures the context menu uses the newest information about the
current event when determining menu options to show.

Fixes https://github.com/vector-im/riot-web/issues/9639
2019-05-07 12:59:53 +01:00
J. Ryan Stinnett 098476d050
Merge pull request #2949 from matrix-org/jryans/relax-password
Relax password requirements to score of 3 out of 4
2019-05-07 12:56:46 +01:00
J. Ryan Stinnett 406c9d5d21
Merge pull request #2948 from matrix-org/jryans/quote-regression
Restore access to message quote option on first click
2019-05-07 12:56:37 +01:00
J. Ryan Stinnett 74803c8ae1 Relax password requirements to score of 3 out of 4
This makes it a bit easier to meet the requirements while still requiring a
fairly strong value. The progress bar displays a score of 3 as reaching 100% for
simplicity.

Fixes https://github.com/vector-im/riot-web/issues/9642
2019-05-07 12:35:42 +01:00
J. Ryan Stinnett 94a7afa35b Restore access to message quote option on first click
This repairs access to the "Quote" option of the message context menu by passing
down a getter so that we always access the most recent tile and reply thread
instances. This ensures the context menu uses the newest information about the
current event when determining menu options to show.

Fixes https://github.com/vector-im/riot-web/issues/9639
2019-05-07 12:20:10 +01:00
J. Ryan Stinnett 19cd02e4e2
Merge pull request #2946 from matrix-org/jryans/release-v1.1.0/guard-room
Check for `room` in all `Room.timeline*` handlers
2019-05-03 18:42:10 +01:00
J. Ryan Stinnett c37ecb7a91 Check for `room` in all `Room.timeline*` handlers
All `Room.timeline*` handlers must currently test for `room` first if they
expect it to exist. It is emitted not only for rooms, but also for timeline sets
without rooms, such as for notifications.

Almost all such handlers were correctly testing as needed, but it was missing
from `RoomBreadcrumbs`.

While that's quite confusing, we can start by testing for `room` when we expect
to have one.

Fixes https://github.com/vector-im/riot-web/issues/9630
2019-05-03 18:28:05 +01:00
Travis Ralston e8a94ca3cf
Merge pull request #2942 from matrix-org/travis/simplify-login-form
Always default to the registration form
2019-05-03 11:23:52 -06:00
J. Ryan Stinnett 2d25cab693
Merge pull request #2945 from matrix-org/jryans/guard-room
Check for `room` in all `Room.timeline*` handlers
2019-05-03 18:21:05 +01:00
Travis Ralston 35ad68751b Remove unused skipServerDetails prop from registration 2019-05-03 11:13:36 -06:00
J. Ryan Stinnett df4e6a3913 Check for `room` in all `Room.timeline*` handlers
All `Room.timeline*` handlers must currently test for `room` first if they
expect it to exist. It is emitted not only for rooms, but also for timeline sets
without rooms, such as for notifications.

Almost all such handlers were correctly testing as needed, but it was missing
from `RoomBreadcrumbs`.

While that's quite confusing, we can start by testing for `room` when we expect
to have one.

Fixes https://github.com/vector-im/riot-web/issues/9630
2019-05-03 17:59:28 +01:00
David Baker 4450740d7d
Merge pull request #2944 from matrix-org/dbkr/thanks_you_junit_but_its_not_2005_anymore
Remove the karma junit reporter
2019-05-03 11:05:44 +01:00
David Baker 75e2001860 don't need to ignore this anymore either 2019-05-03 10:49:08 +01:00
David Baker 4b9be2aec4 Remove the karma junit reporter
We may have used it in our jenkins tests at some point but we don't
have those anymore. It weas pulling in ancient dependencies because
we were using version 2.0.0 which is fact much older than the
current version (1.2.0). We have little use for junit output anymore
so just remove it.
2019-05-03 10:39:13 +01:00
David Baker 37212c0aeb
Merge pull request #2943 from matrix-org/dbkr/yarn_upgrade_may19
yarn upgrade
2019-05-03 10:36:48 +01:00
David Baker 4e57993094 yarn upgrade 2019-05-03 10:22:10 +01:00
Travis Ralston 1620ccac53 Always default to the registration form
Fixes https://github.com/vector-im/riot-web/issues/8886
2019-05-02 23:55:40 -06:00
J. Ryan Stinnett 33bb9e2af6 Update action bar colors for dark theme
In addition, this also adjusts the event hover colors to match the palette.

Fixes https://github.com/vector-im/riot-web/issues/9591
2019-05-02 17:23:33 +01:00
Travis Ralston a7a50351d1
Merge pull request #2798 from matrix-org/travis/tombstone-notif
Support changing options for .m.rule.tombstone push rule
2019-05-02 09:47:41 -06:00
Travis Ralston 8fe8b8ab18
Merge pull request #2939 from matrix-org/travis/remove-timeline-crash
Remove timeline explosion rageshake prompt
2019-05-02 09:46:03 -06:00
J. Ryan Stinnett 6fcc418acc
Merge pull request #2940 from matrix-org/jryans/reactions-below-message
Add existing reactions below message
2019-05-02 14:52:44 +01:00
J. Ryan Stinnett 87f737b8a3 Increment an existing reaction
This allows you to increment an existing reaction below a message by clicking on
it.

At the moment, this is not linked to the action bar, so they each are using
local state. We'll likely want to add some mechanism so that we can local echo
to both of these UI areas at the same time, but that can be done separately.

Fixes https://github.com/vector-im/riot-web/issues/9486
2019-05-02 12:05:17 +01:00
J. Ryan Stinnett 15c5893278 Display existing reactions below the message
This displays the existing reactions a message has from all users below the
message.

Since we don't currently have an API to actually get these events yet,
adds a temporary hook that looks for a specific message to inject some sample
data. This helps build out the UI for now and can be removed once it exists.

Fixes https://github.com/vector-im/riot-web/issues/9573
2019-05-02 12:05:17 +01:00
J. Ryan Stinnett 44e9ca6c52 Extract `isContentActionable` to a separate helper
This moves the check about whether an event is actionable (for the purpose of
replies, edits, reactions, etc.) to shared utils module.
2019-05-02 12:05:17 +01:00
Travis Ralston 5a204edf90 Remove timeline explosion rageshake prompt
Concludes https://github.com/vector-im/riot-web/issues/8593

We are no longer seeing this error being triggered, and are considering it fixed. As a result, the dialog can be removed to reduce the amount of dead code in the project.
2019-05-01 13:37:57 -06:00
J. Ryan Stinnett 187193f689
Merge pull request #2938 from matrix-org/jryans/lint-timeline-panel
Fix lint errors in TimelinePanel
2019-05-01 16:55:13 +01:00
J. Ryan Stinnett f4b783e802 Fix lint errors in TimelinePanel 2019-05-01 14:30:50 +01:00
J. Ryan Stinnett a74824aef4
Merge pull request #2937 from jryans/primary-reactions
Add primary reactions to action bar
2019-05-01 09:37:12 +01:00
J. Ryan Stinnett 784599d9e9 Add primary reactions to action bar
This adds the primary reactions to the action bar. They act as toggles where you
can only select one from each group at a time.

Note that currently we aren't actually sending the reaction at all. That's left
for a separate task.

Fixes https://github.com/vector-im/riot-web/issues/9576
2019-04-30 18:09:10 +01:00
J. Ryan Stinnett 00ca930d2e Extract actionable content check to helper 2019-04-30 17:51:18 +01:00
J. Ryan Stinnett 7f62cdf124 Add reactions feature flag 2019-04-30 17:51:18 +01:00
J. Ryan Stinnett 4b50d2a2bf Update action bar colors for dark theme
In addition, this also adjusts the event hover colors to match the palette.

Fixes https://github.com/vector-im/riot-web/issues/9591
2019-04-30 17:42:17 +01:00
J. Ryan Stinnett 561ecc5ebe Rebuild strings 2019-04-30 13:36:37 +01:00
David Baker 57322f82be v1.1.0-rc.1 2019-04-30 12:02:19 +01:00
David Baker 0f59ceb93c Prepare changelog for v1.1.0-rc.1 2019-04-30 12:00:53 +01:00
David Baker 5b92693cb3 js-sdk rc.1 2019-04-30 11:53:10 +01:00
J. Ryan Stinnett 6db12f84df
Merge pull request #2936 from jryans/preview-bar-fire
Add important info to new preview bar
2019-04-30 10:20:09 +01:00
J. Ryan Stinnett b7642b38a7 Show the room avatar for invites
This changes to the room avatar instead of the inviter's avatar.
2019-04-30 09:56:44 +01:00