sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
16,779 Commits 4 Branches 19 Tags
03151418afcfde4feb45a70d8d588da23584eaa6
Commit Graph
16779 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
RiotRobot 03151418af Merge branch 'master' into develop 2019-07-18 15:51:33 +01:00
RiotRobot 3c0c64af8e v1.4.0 2019-07-18 15:50:46 +01:00
RiotRobot 8b0e36e884 Prepare changelog for v1.4.0 2019-07-18 15:50:45 +01:00
RiotRobot 480061bde3 Upgrade JS SDK to v2.2.0 2019-07-18 15:46:38 +01:00
J. Ryan StinnettandGitHub 4a7264cc15 Merge pull request #3236 from matrix-org/jryans/v1.4.0/dontredactfirst 
Don't show remove button for original event in edit history
 2019-07-18 14:40:58 +01:00
Bruno WindelsandJ. Ryan Stinnett 1b06b9957a dont show remove button for original event in edit history 2019-07-18 14:40:05 +01:00
J. Ryan StinnettandGitHub 6c6300e1cc Merge pull request #3235 from matrix-org/bwindels/dontredactfirst 
dont show remove button for original event in edit history
 2019-07-18 14:35:07 +01:00
Bruno Windels aca41fe80a dont show remove button for original event in edit history 2019-07-18 14:09:29 +02:00
J. Ryan StinnettandGitHub adc2648b46 Merge pull request #3234 from matrix-org/jryans/v1.4.0/rm-reactions-edits-flags 
Remove feature flags for reactions and edits
 2019-07-18 10:28:57 +01:00
J. Ryan Stinnett 537eb2c88f Remove reactions feature flag 
Fixes https://github.com/vector-im/riot-web/issues/10282
 2019-07-18 10:23:12 +01:00
J. Ryan Stinnett 25351d552e Remove editing feature flag 
Part of https://github.com/vector-im/riot-web/issues/10282
 2019-07-18 10:23:12 +01:00
J. Ryan StinnettandGitHub 76a60c84ac Merge pull request #3233 from matrix-org/jryans/rm-reactions-edits-flags 
Remove feature flags for reactions and edits
 2019-07-18 09:58:55 +01:00
J. Ryan Stinnett 599c49613f Remove reactions feature flag 
Fixes https://github.com/vector-im/riot-web/issues/10282
 2019-07-17 17:00:36 +01:00
J. Ryan Stinnett 674f33917f Remove editing feature flag 
Part of https://github.com/vector-im/riot-web/issues/10282
 2019-07-17 16:56:15 +01:00
J. Ryan StinnettandGitHub b8aae63c83 Merge pull request #3229 from matrix-org/jryans/enable-reactions-edits-default 
Enable reactions and edits by default
 2019-07-17 15:20:07 +01:00
J. Ryan StinnettandGitHub 88a0dbe2f1 Merge pull request #3232 from matrix-org/jryans/v1.4.0/enable-reactions-edits-default 
Enable reactions and edits by default
 2019-07-17 15:19:08 +01:00
J. Ryan Stinnett 19b3b41ad6 Continue to next config level after device for features 
This ensures we continue checking further config levels for the feature setting
if nothing is found when reading the device level. For example, this means the
feature setting's default value can be used.
 2019-07-17 15:16:10 +01:00
J. Ryan Stinnett db560989da Enable reactions and edits by default 
This enables reactions and edits by default, assuming you don't have any local
device settings that would disable them.

Fixes https://github.com/vector-im/riot-web/issues/10281
 2019-07-17 15:16:10 +01:00
J. Ryan StinnettandGitHub 470f9b7704 Merge pull request #3231 from matrix-org/jryans/v1.4.0/tooltip-safe-area-alt 
Improve interactive tooltip safe mousing area
 2019-07-17 15:04:30 +01:00
J. Ryan Stinnett e3d849e993 Improve interactive tooltip safe mousing area 
This adds a more complex trapezoidal safe area between the button that triggers
the tooltip and the tooltip itself. It should be easier to move from the button
into the tooltip without accidentally closing it.

Fixes https://github.com/vector-im/riot-web/issues/10185
 2019-07-17 15:03:35 +01:00
J. Ryan StinnettandGitHub 3f760be540 Merge pull request #3230 from matrix-org/jryans/v1.4.0/action-bar-safe-area 
Add a previous event safe area around action bar
 2019-07-17 14:58:24 +01:00
J. Ryan Stinnett 2be9696a27 Add a previous event safe area around action bar 
This adds a previous event safe area so that you can't accidentally hover the
previous event while trying to mouse into the action bar or from the react
button to its tooltip.

Part of https://github.com/vector-im/riot-web/issues/10185
Fixes https://github.com/vector-im/riot-web/issues/9650
 2019-07-17 14:57:42 +01:00
J. Ryan Stinnett 202f6fb94d Continue to next config level after device for features 
This ensures we continue checking further config levels for the feature setting
if nothing is found when reading the device level. For example, this means the
feature setting's default value can be used.
 2019-07-17 14:50:35 +01:00
J. Ryan Stinnett 3801f0b78e Enable reactions and edits by default 
This enables reactions and edits by default, assuming you don't have any local
device settings that would disable them.

Fixes https://github.com/vector-im/riot-web/issues/10281
 2019-07-17 14:50:35 +01:00
J. Ryan StinnettandGitHub 35ba489a2b Merge pull request #3228 from matrix-org/jryans/tooltip-safe-area-alt 
Improve interactive tooltip safe mousing area
 2019-07-17 14:28:57 +01:00
J. Ryan Stinnett fc8cdc5661 Improve interactive tooltip safe mousing area 
This adds a more complex trapezoidal safe area between the button that triggers
the tooltip and the tooltip itself. It should be easier to move from the button
into the tooltip without accidentally closing it.

Fixes https://github.com/vector-im/riot-web/issues/10185
 2019-07-17 14:11:27 +01:00
J. Ryan StinnettandGitHub 1cdfff850c Merge pull request #3227 from matrix-org/jryans/action-bar-safe-area 
Add a previous event safe area around action bar
 2019-07-17 11:30:37 +01:00
J. Ryan Stinnett 58a75949c3 Add a previous event safe area around action bar 
This adds a previous event safe area so that you can't accidentally hover the
previous event while trying to mouse into the action bar or from the react
button to its tooltip.

Part of https://github.com/vector-im/riot-web/issues/10185
Fixes https://github.com/vector-im/riot-web/issues/9650
 2019-07-17 10:10:08 +01:00
J. Ryan StinnettandGitHub 5f2fe181df Merge pull request #3217 from matrix-org/jryans/im-origin-check 
Parse integration manager origins more sensibly
 2019-07-17 10:05:28 +01:00
J. Ryan Stinnett 60adbdc2eb Remove logging of origin mismatch 2019-07-17 09:42:04 +01:00
Travis RalstonandGitHub e53b922290 Merge pull request #3225 from matrix-org/t3chguy/create_reuse_dialog_hide_left 
ChatCreateOrReuse show only rooms both you and the other party still in
 2019-07-16 11:58:10 -06:00
Michael Telatynski df26840d9e ChatCreateOrReuse show only rooms both you and the other party still in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-15 23:07:59 +01:00
Travis RalstonandGitHub 2471f92331 Merge pull request #3218 from matrix-org/travis/check-when-dead 
Check for liveliness on submission when the server was previously dead
 2019-07-15 14:46:55 -06:00
Travis Ralston 2bc0e8e151 Don't rely on React being fast 2019-07-15 10:51:08 -06:00
RiotRobot 008903470a v1.4.0-rc.3 2019-07-15 17:28:48 +01:00
RiotRobot 415f88dd9a Prepare changelog for v1.4.0-rc.3 2019-07-15 17:28:47 +01:00
David BakerandGitHub 3809134d73 Merge pull request #3223 from matrix-org/dbkr/fix-powerlevels-crash-2 
Check content and content.users in power levels
 2019-07-15 17:23:43 +01:00
David BakerandGitHub a8ccd6dfd7 Merge pull request #3222 from matrix-org/dbkr/read-receipt-ignore-no-tile-fix-2 
Take adjacent invisible events into account for read receipt, even if any but first should be ignored.
 2019-07-15 17:20:32 +01:00
Bruno WindelsandDavid Baker 02ec96cff1 also check content and content.users before proceeding 2019-07-15 17:17:20 +01:00
Bruno WindelsandDavid Baker f901c8c4fe remove unneeded else 2019-07-15 17:14:03 +01:00
Bruno WindelsandDavid Baker d39a86b126 improve comments 2019-07-15 17:13:58 +01:00
Bruno WindelsandDavid Baker e66ebec083 take adjacent no-tile events in combination with ignored events into account when determining the last displayed event 2019-07-15 17:13:52 +01:00
Travis RalstonandGitHub d08cb70fa6 Merge pull request #3219 from matrix-org/travis/fix-delay 
Fix autocomplete delay text field not accepting text
 2019-07-15 09:30:33 -06:00
Travis RalstonandGitHub 3fcbd46939 Merge pull request #3220 from matrix-org/travis/kick-reason 
Don't show a reason if there's no reason for a kick/ban
 2019-07-15 09:30:19 -06:00
Bruno WindelsandGitHub 141352b158 Merge pull request #3221 from matrix-org/bwindels/read-receipt-ignore-no-tile-fix 
Take adjacent invisible events into account for read receipt, even if any but first should be ignored.
 2019-07-15 15:07:17 +00:00
Bruno Windels 7e25e1b2fc remove unneeded else 2019-07-15 14:02:41 +02:00
Bruno Windels 034883dc7e improve comments 2019-07-15 14:01:28 +02:00
Bruno Windels 8ac54661be take adjacent no-tile events in combination with ignored events into account when determining the last displayed event 2019-07-15 12:53:39 +02:00
Travis Ralston 31339aa11f Don't show a reason if there's no reason for a kick/ban 
Fixes https://github.com/vector-im/riot-web/issues/9677
 2019-07-14 23:31:38 -06:00
Travis Ralston 345dbce6e4 Fix autocomplete delay text field not accepting text 
SettingsStore.setValue is async (fire&forget) however getValueAt is cached. Theory was supposed to be that getValueAt local echos, however the animation loop of React is probably just too fast to actually make the local echo happen.

Fixes https://github.com/vector-im/riot-web/issues/9907
 2019-07-14 23:28:23 -06:00