Commit Graph

14914 Commits (2496ee3b664d7707136c081e3d03eaefc448115b)

Author SHA1 Message Date
Travis Ralston 2496ee3b66 Merge branch 'travis/breadcrumbs/livereload' into travis/breadcrumbs/telemetry 2019-04-04 13:55:22 -06:00
Travis Ralston 37afa9fc0e
Merge pull request #2871 from matrix-org/travis/redact-url
Ensure the page URL is redacted before tracking analytics events
2019-04-04 11:59:57 -06:00
Travis Ralston 7e96d493c9 Ensure the page URL is redacted before tracking analytics events
Sometimes the page URL isn't redacted, so we manually set it to be redacted prior to tracking the event. This isn't entirely documented by piwik, but having looked at the requests leaving the browser it seems to fix the issue.
2019-04-04 10:52:54 -06:00
Matthew Hodgson d45f43144f
Merge pull request #2869 from matrix-org/matthew/redacted_tombstones
fix NPE for rooms with redacted tombstones
2019-04-04 16:53:31 +01:00
Matthew Hodgson b9eebee13b turn NPE into a throw 2019-04-04 16:53:17 +01:00
Travis Ralston a61ab4eb4e
Merge pull request #2862 from matrix-org/travis/stickerpicker/remount
Don't re-init the stickerpicker unless something actually changes
2019-04-04 09:46:38 -06:00
Travis Ralston 9618187d2e
Merge pull request #2855 from YaoiFangirl420/rotate_images
Add option to rotate images
2019-04-04 09:46:06 -06:00
Travis Ralston 6722451207
semicolon 2019-04-04 09:36:45 -06:00
Travis Ralston f2b7042a33 misc cleanup 2019-04-04 09:30:15 -06:00
Travis Ralston 5066d68875
Merge pull request #2861 from matrix-org/travis/breadcrumbs/badges
Add badges to breadcrumb rooms
2019-04-04 08:24:41 -06:00
J. Ryan Stinnett cf69692d9e
Merge pull request #2866 from jryans/member-info-power
Include the current power level in the selector
2019-04-04 11:38:42 +01:00
J. Ryan Stinnett fea9b009b3 Track life buoy dialog 2019-04-04 11:28:13 +01:00
J. Ryan Stinnett b0f59007f3 Clarify `level` variable name 2019-04-04 10:30:23 +01:00
YaoiFangirl420 1cbbe5f31f Add i18n and fix method declaration
Add i18n entries for rotating images; fix the way `getName` is defined

Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-04 02:27:58 -07:00
YaoiFangirl420 9bd1ba60f5 Add option to rotate images
cf. https://github.com/vector-im/riot-web/issues/9257

Add rotate clockwise/counterclockwise buttons to <ImageView>

Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-04 01:48:41 -07:00
Travis Ralston 10369170ed Use a static prop on Stickerpicker to track the current widget 2019-04-03 17:16:56 -06:00
Travis Ralston ad777782b8 Merge branch 'develop' into travis/stickerpicker/remount 2019-04-03 17:00:19 -06:00
Travis Ralston f73c32e6c2 Track notifications in component state 2019-04-03 16:13:09 -06:00
Travis Ralston f5600fd4d7 Add badges to breadcrumb rooms
Fixes https://github.com/vector-im/riot-web/issues/8606
2019-04-03 15:29:15 -06:00
Matthew Hodgson e98ef0d537 only show continues link if tombstone has a continuation 2019-04-03 21:12:36 +01:00
Matthew Hodgson 1153ce43c6 fix NPE for rooms with redacted tombstones 2019-04-03 20:38:25 +01:00
Travis Ralston c3d3dd1fd7
Merge pull request #2860 from matrix-org/travis/breadcrumbs/parted
Apply 50% opacity to left breadcrumbs
2019-04-03 08:42:39 -06:00
J. Ryan Stinnett fa88185dee Include the current power level in the selector
This ensures we always include the current power level in the power selector,
even if it's greater than the level you're allowed to set yourself. This ensures
the selector can display the current value correctly when disabled.

Fixes https://github.com/vector-im/riot-web/issues/9340
2019-04-03 11:54:10 +01:00
J. Ryan Stinnett ba7caaa115 Update yarn.lock 2019-04-03 11:50:39 +01:00
Bruno Windels a11786884e
Merge pull request #2865 from matrix-org/bwindels/smallscrollfixes
Small scroll fixes
2019-04-03 07:29:13 +00:00
Bruno Windels fee8d79267 comment for PAGE_SIZE 2019-04-03 09:16:30 +02:00
Travis Ralston c0f06602c5 Use state instead of forceUpdate 2019-04-02 10:47:39 -06:00
Travis Ralston 8225b91179
Merge pull request #2863 from matrix-org/travis/stickerpicker/lower-z
Put the stickerpicker below dialogs
2019-04-02 10:23:17 -06:00
Bruno Windels 86c13b97ce increase PAGE_SIZE so users can scroll up already while waiting for pag. 2019-04-02 17:54:14 +02:00
Bruno Windels 726e91101a allow fractional values for scrollTop above and below expected value 2019-04-02 17:53:53 +02:00
David Baker ed03a92712
Merge pull request #2864 from matrix-org/dbkr/logging_for_7769
Logging tweaks
2019-04-02 13:34:20 +01:00
David Baker 6e6e748376 Logging tweaks
To try & diagnose https://github.com/vector-im/riot-web/issues/7769

Null check on e before looking for the `name` property and log it
separately rather than appending it to a string (not that this will
help if it's undefined, but it's more useful in general).
2019-04-02 12:31:18 +01:00
David Baker 24ccfa69f4
Merge pull request #2858 from matrix-org/dbkr/upload_redesign
Implement redesigned upload confirmation screens
2019-04-02 11:00:16 +01:00
David Baker b6faaf419c PR feedback 2019-04-02 10:50:17 +01:00
Travis Ralston 3f9d088667 Put the stickerpicker below dialogs
Fixes https://github.com/vector-im/riot-web/issues/9353

The ContextualMenu now accepts a zIndex parameter which can be used to control its level. Dialogs are at around 4000 in the z-index, and the context menu defaults to 5000 for the things that need tooltips and such in a dialog.
2019-04-01 20:34:33 -06:00
Travis Ralston 51750cf153 General cleanup of handling for WidgetMessaging instances
When setting, delete the old one. Because delete checks if it exists first, we can safely call this.

The change in FromWidgetPostMessageApi is just something noticed while debugging.
2019-04-01 19:50:05 -06:00
Travis Ralston a4f76670c4 Don't re-init the stickerpicker unless something actually changes
Fixes https://github.com/vector-im/riot-web/issues/9354

https://github.com/matrix-org/matrix-react-sdk/pull/2801 introduced a change which tried to make sure that when the widget URL was changed that the picker would be re-mounted, however it accidentally introduced a regression. While it effectively did the task it wanted to, it failed to keep the previously-mounted sticker picker alive. This is because the Stickerpicker component is remounted when opened, and the _updateWidget function is called. This results in this.state not having the "current" widget, meaning a URL change is always detected when the component is remounted (room changes, open sticker picker). 

Instead of remounting always, we'll instead track which sticker picker widget is being used out of band. This therefore means that whenever the Stickerpicker component is mounted it doesn't create a whole new widget, and the existing (background) picker can be used. This also fixes the loading screen that people would see when opening the sticker picker after switching rooms, something which the persistent widget stuff is supposed to solve.
2019-04-01 19:48:05 -06:00
Travis Ralston 7e2291592c Apply 50% opacity to left breadcrumbs
Fixes https://github.com/vector-im/riot-web/issues/8564

We listen for membership changes to make sure the state is kept up to date.
2019-04-01 11:59:39 -06:00
Travis Ralston 842e19280d Apply changes to breadcrumbs setting live 2019-04-01 11:49:58 -06:00
J. Ryan Stinnett d92336fc16
Merge pull request #2859 from jryans/redesign-debug-logs
Use Field component in bug report dialog
2019-04-01 18:33:22 +01:00
J. Ryan Stinnett 3948520eaa Use Field component in bug report dialog
This uses the field component in the bug report dialog, which generally improves
the styling to fit in more naturally with the rest of the app so that it feels
more trustworthy.

Fixes https://github.com/vector-im/riot-web/issues/9343
2019-04-01 17:50:12 +01:00
J. Ryan Stinnett 57d72b4deb
Merge pull request #2841 from jryans/storage-eviction-modal
Notify user when crypto data is missing
2019-04-01 17:31:39 +01:00
David Baker 0add3d0825 Translate into peoplecounting 2019-04-01 16:52:06 +01:00
David Baker fedd4598b5 Space
The final frontier
2019-04-01 16:50:23 +01:00
David Baker 5b2cee2fc1 Implement redesigned upload confirmation screens
Also fairly significant refactor of the uploading code: there are
a number of different ways of triggerring a file upload and each
went through a different code path (the media config size limit
worked on one of those paths). Basically take a lot of code out
of the views and put it into ContentMessages.

Sorry about the size of this patch.

https://github.com/vector-im/riot-web/issues/7565
2019-04-01 16:42:41 +01:00
David Baker f3e8722504 Merge branch 'master' into develop 2019-04-01 13:48:54 +01:00
David Baker 33f2401e63 v1.0.6 2019-04-01 13:43:49 +01:00
David Baker 9cba85e3f4 Prepare changelog for v1.0.6 2019-04-01 13:43:48 +01:00
David Baker 6cde0eb1b2 released js-sdk 2019-04-01 13:38:06 +01:00
David Baker 9e704a9636
Merge pull request #2857 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-04-01 13:21:07 +01:00