Travis Ralston
|
870c35be6f
|
Merge branch 'develop' into travis/ft-sep1620/09-enc-files
|
2020-09-18 10:56:20 -06:00 |
|
Michael Telatynski
|
5bf6697e48
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
|
2020-09-17 13:31:00 +01:00 |
|
Travis Ralston
|
c3a3754432
|
Appease the linter
|
2020-09-16 17:27:45 -06:00 |
|
Travis Ralston
|
bfbbf44dfc
|
Add a note to use the desktop builds when seshat isn't available
Fixes https://github.com/vector-im/element-web/issues/15184
This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
|
2020-09-16 17:23:37 -06:00 |
|
Michael Telatynski
|
9cc789756b
|
UI Feature Flag: Hide flair
|
2020-09-16 11:26:15 +01:00 |
|
Michael Telatynski
|
caef9b27a0
|
Also hide bug reporting prompts from the Error Boundaries
|
2020-09-16 10:50:53 +01:00 |
|
David Baker
|
b7058a33ad
|
lint
|
2020-09-10 14:37:44 +01:00 |
|
David Baker
|
eeb4c5696f
|
Don't show 'unpin' for persistent widgets
This will mostly fix https://github.com/vector-im/element-web/issues/15139
although it could still break in a race condition.
|
2020-09-10 14:30:35 +01:00 |
|
Travis Ralston
|
0a7090dd64
|
Account for via in pill matching regex
Fixes https://github.com/vector-im/element-web/issues/15133
Regression first appeared in a80bcaa292
This also affects room IDs.
|
2020-09-09 14:36:35 -06:00 |
|
David Baker
|
62556c2afe
|
Merge pull request #5184 from matrix-org/dbkr/always_allow_local_widgets
Always allow widgets when using the local version
|
2020-09-09 15:52:31 +01:00 |
|
David Baker
|
f9079975a1
|
write correct jsdoc
|
2020-09-09 15:42:25 +01:00 |
|
David Baker
|
99b0a0a78e
|
Always allow widgets when using the local version
Since we're not loading the widget URL, there's no need to ask
for permission to load it: it's just another part of the app.
|
2020-09-09 15:35:05 +01:00 |
|
Michael Telatynski
|
98b59fb217
|
Consolidate all the work thus far
|
2020-09-08 15:43:38 +01:00 |
|
Michael Telatynski
|
2527344294
|
Create name/title Widget utils
|
2020-09-08 15:42:31 +01:00 |
|
Michael Telatynski
|
87b72de25f
|
Merge pull request #5176 from matrix-org/t3chguy/dpsah/6785.4
Fix WatchManager for global room watchers and tidy widget code a little
|
2020-09-08 15:24:10 +01:00 |
|
Jason Robinson
|
75518254fb
|
Merge pull request #5173 from matrix-org/jaywink/jitsi-openidjwt-auth
Support creation of Jitsi widgets with "openidtoken-jwt" auth
|
2020-09-08 17:16:50 +03:00 |
|
Michael Telatynski
|
99cd2dceec
|
Fix create-react-class regression.
Can't call setState in c'tor
|
2020-09-08 12:07:24 +01:00 |
|
Michael Telatynski
|
48d9c94c88
|
Extract editWidget into WidgetUtils
|
2020-09-08 11:12:14 +01:00 |
|
Michael Telatynski
|
667c129ebc
|
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
Conflicts:
src/components/structures/ScrollPanel.js
src/components/views/rooms/AppsDrawer.js
|
2020-09-07 14:33:57 +01:00 |
|
Jason Robinson
|
13dbfa6b85
|
Remove debug statement
|
2020-09-04 12:44:43 +03:00 |
|
Jason Robinson
|
baa6d8a294
|
Correctly template in Jitsi widget auth if such exists
Also add roomId to the widget data and URL template. It's needed by
the Element Web Jitsi code to produce auth for the Jitsi backend.
|
2020-09-04 12:42:46 +03:00 |
|
Michael Telatynski
|
e624ce11b4
|
Merge pull request #5157 from matrix-org/t3chguy/crc1
Remove create-react-class
|
2020-09-03 17:21:58 +01:00 |
|
Michael Telatynski
|
97ebfa02c3
|
Merge pull request #5162 from matrix-org/t3chguy/lodash
Consolidate Lodash files in bundle
|
2020-09-03 15:54:43 +01:00 |
|
Michael Telatynski
|
24006588d5
|
iterate PR
|
2020-09-03 10:34:19 +01:00 |
|
Michael Telatynski
|
beb77799f6
|
Respect user preference for whether pills should have an avatar or not
|
2020-09-02 17:26:23 +01:00 |
|
Michael Telatynski
|
243af3c9f2
|
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
|
2020-09-02 09:27:06 +01:00 |
|
Michael Telatynski
|
7c4a84aae0
|
Merge pull request #5155 from matrix-org/t3chguy/lint-ts
Fix eslint ts override tsx matching and delint
|
2020-09-01 16:44:22 +01:00 |
|
Michael Telatynski
|
842821b038
|
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/lodash
|
2020-09-01 09:09:50 +01:00 |
|
Michael Telatynski
|
656a815991
|
delint some more
|
2020-09-01 09:07:46 +01:00 |
|
Michael Telatynski
|
517dee413e
|
Delint
|
2020-08-29 12:57:11 +01:00 |
|
Michael Telatynski
|
78812b6f85
|
Fix some stuff
|
2020-08-29 12:53:04 +01:00 |
|
Michael Telatynski
|
72498df28f
|
Remove create-react-class
|
2020-08-29 12:14:16 +01:00 |
|
Michael Telatynski
|
672d0fe97b
|
Remove redundant components and devDependencies
|
2020-08-29 12:09:07 +01:00 |
|
Michael Telatynski
|
9ba33c7f80
|
Fix eslint ts override tsx matching and delint
|
2020-08-29 01:11:08 +01:00 |
|
Michael Telatynski
|
1fc55b33c1
|
Stash lodash import optimization
|
2020-08-28 18:53:43 +01:00 |
|
Michael Telatynski
|
2823156ef6
|
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/display-capture
|
2020-08-28 17:26:10 +01:00 |
|
Michael Telatynski
|
b9cfa95ceb
|
Add display-capture to iframe allow
|
2020-08-28 17:06:56 +01:00 |
|
resynth1943
|
2c20afc047
|
Fix lodash imports
Signed-off-by: resynth1943 <resynth1943@tutanota.com>
|
2020-08-26 23:23:18 +01:00 |
|
Travis Ralston
|
b294ec6427
|
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher
Communities v2 prototype: Tag panel selection changes
|
2020-08-26 10:22:50 -06:00 |
|
Travis Ralston
|
0c67a42b0f
|
Make padding only on the prototype tag panel
|
2020-08-26 08:42:26 -06:00 |
|
Travis Ralston
|
20c562c208
|
Change user avatar to a home icon
|
2020-08-25 21:46:26 -06:00 |
|
Travis Ralston
|
7c1a9993e3
|
Add new create group dialog
|
2020-08-25 21:08:24 -06:00 |
|
Travis Ralston
|
276ed90884
|
Add a personal group for an all-communities state
Design is approximate and needs review, though being completed out of band.
|
2020-08-21 18:19:29 -06:00 |
|
Michael Telatynski
|
cca5ccd79d
|
Switch widget resizing to re-resizable and add persistence
|
2020-08-21 16:29:07 +01:00 |
|
Travis Ralston
|
d7a43df793
|
Disable context menu for v2 communities
|
2020-08-20 19:54:09 -06:00 |
|
Michael Telatynski
|
ae65ed5c2e
|
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer
Conflicts:
res/css/views/rooms/_AppsDrawer.scss
|
2020-08-20 10:26:35 +01:00 |
|
Travis Ralston
|
c9d98a1d19
|
Merge pull request #5124 from matrix-org/travis/settings-v3
Settings v3: Feature flag changes
|
2020-08-19 12:00:48 -06:00 |
|
Travis Ralston
|
96087d61f6
|
Convert feature setting usages to regular settings
|
2020-08-17 13:12:18 -06:00 |
|
Michael Telatynski
|
8f0e4dae9d
|
Allow room tile context menu when minimized using right click
|
2020-08-14 12:01:16 +01:00 |
|
Jorik Schellekens
|
0060acbb33
|
Merge pull request #5056 from matrix-org/joriks/style-fighting
Quick win session 24/07/2020
|
2020-08-12 15:21:06 +01:00 |
|