OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
28,312 Commits
215 Branches
561 Tags
465 MiB
Commit Graph

28312 Commits (c3a37544323da3c2d7801114563c597fd57e352a)

Author SHA1 Message Date
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
Travis Ralston 2ad08c8394
Merge pull request #5224 from matrix-org/travis/ft-sep1620/05-directory 
Fix setState() usage in the constructor of RoomDirectory
 2020-09-16 15:47:32 -06:00
Travis Ralston 815a1559ff Fix setState() usage in the constructor of RoomDirectory 
React doesn't like it when we setState() in the constructor
 2020-09-16 15:05:14 -06:00
Michael Telatynski 4db9ac16b5
Merge pull request #5211 from matrix-org/t3chguy/fix/15173 
Hide Analytics sections if piwik config is not provided
 2020-09-16 16:34:55 +01:00
Michael Telatynski aeb30c08ca
Merge pull request #5213 from matrix-org/t3chguy/fix/15174 
UI Feature Flag: Disable feedback button
 2020-09-16 16:34:12 +01:00
Michael Telatynski 9be04f8a67 i18n 2020-09-16 16:10:43 +01:00
Michael Telatynski 93323febcb undo change 2020-09-16 16:10:24 +01:00
Michael Telatynski a784e29622 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15174 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-16 16:09:08 +01:00
Michael Telatynski 4d15a44d61
Merge pull request #5220 from matrix-org/t3chguy/fix/15202 
Clean up UserInfo to not show a blank Power Selector for users not in room
 2020-09-16 16:04:15 +01:00
Michael Telatynski 4e2b6c2a30
Merge pull request #5212 from matrix-org/t3chguy/fix/15172 
Also hide bug reporting prompts from the Error Boundaries
 2020-09-16 15:59:07 +01:00
Michael Telatynski 06c4abd65e Clean up UserInfo to not show a blank Power Selector for users not in room 2020-09-16 15:23:08 +01:00
Michael Telatynski f4f94e31d1 UI Feature Flag: Disable integrations entry UI 2020-09-16 11:38:50 +01:00
Michael Telatynski 45420ff13b i18n 2020-09-16 11:27:39 +01:00
Michael Telatynski 04d7aebad0 UI Feature Flag: Disable feedback button 2020-09-16 10:59:14 +01:00
Michael Telatynski dbd3245e02 i18n 2020-09-16 10:53:30 +01:00
Michael Telatynski caef9b27a0 Also hide bug reporting prompts from the Error Boundaries 2020-09-16 10:50:53 +01:00
Michael Telatynski d990986407 Also hide Privacy heading in settings and fix React Key warning 2020-09-16 10:37:15 +01:00
Michael Telatynski 771ab82598 Hide Analytics sections if piwik config is not provided 2020-09-16 10:29:21 +01:00
Travis Ralston 3d9c520af8
Merge pull request #5201 from matrix-org/travis/3pid-invites 
Tactical improvements to 3PID invites
 2020-09-15 10:42:55 -06:00
Michael Telatynski 6f0f427ef4
Merge pull request #5210 from matrix-org/t3chguy/fix/15172 
If no bug_report_endpoint_url, hide rageshaking from the App
 2020-09-15 16:23:48 +01:00
Michael Telatynski 16d8ea184d i18n 2020-09-15 15:58:23 +01:00
Travis Ralston 60c6e23b94 Match intended case for settings 2020-09-15 08:55:03 -06:00
Travis Ralston 88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base 
Introduce a concept of UI features, using it for URL previews at first
 2020-09-15 08:53:48 -06:00
Travis Ralston 246b802206 Merge branch 'develop' into travis/3pid-invites 2020-09-15 08:53:32 -06:00
Travis Ralston d11ce5fade
Merge pull request #5207 from matrix-org/travis/ui-func/e2e-icons 
Remove defunct "always show encryption icons" setting
 2020-09-15 08:52:19 -06:00
Michael Telatynski 6c166f0560 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01:00
Michael Telatynski 9a3c30b1f1
Merge pull request #5203 from matrix-org/t3chguy/fix/15150 
Don't show Notifications Prompt Toast if user has master rule enabled
 2020-09-15 14:09:38 +01:00
Michael Telatynski 6b5426bddd Rename toolbar Notifier methods to prompt 2020-09-15 13:58:29 +01:00
Travis Ralston 0cac6874d4 Update i18n 2020-09-14 22:31:45 -06:00
Travis Ralston f4f30a3274 Introduce a concept of UI features, using it for URL previews at first 
Fixes https://github.com/vector-im/element-web/issues/15176

This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
 2020-09-14 22:28:02 -06:00
Travis Ralston b177843e45 Remove defunct "always show encryption icons" setting 
It doesn't do anything in practice.

Fixes https://github.com/vector-im/element-web/issues/8725
 2020-09-14 22:03:54 -06:00
Travis Ralston 61e8d3e3d7 Merge branch 'develop' into travis/3pid-invites 2020-09-14 11:50:08 -06:00
Michael Telatynski ab91ce4b2d
Merge pull request #5206 from matrix-org/t3chguy/fix/15170 
Fix Bridges tab crashing when the room does not have bridges
 2020-09-14 17:09:46 +01:00
RiotRobot 747126950b Merge branch 'master' into develop 2020-09-14 16:07:54 +01:00
RiotRobot 4f930ac50c v3.4.1 2020-09-14 15:49:09 +01:00
RiotRobot a5d42d1e2a Prepare changelog for v3.4.1 2020-09-14 15:49:09 +01:00
Michael Telatynski e32cb175cb Fix Bridges tab crashing when the room does not have bridges 2020-09-14 15:44:00 +01:00
Michael Telatynski e261a18183
Merge pull request #5202 from matrix-org/t3chguy/fix/15140 
Don't count widgets which no longer exist towards pinned count
 2020-09-14 15:38:10 +01:00
Michael Telatynski c6a3b8b783
Merge pull request #5205 from matrix-org/t3chguy/fix/resizeNotifier-optional 
Fix crashes with cannot read isResizing of undefined
 2020-09-14 15:38:02 +01:00
Michael Telatynski e6e77633ad Fix crashes with cannot read isResizing of undefined 2020-09-14 15:37:02 +01:00
Michael Telatynski ca0ad0b7ed Don't count widgets which no longer exist towards pinned count 2020-09-14 15:36:44 +01:00
Michael Telatynski fa50b31fd2 Fix crashes with cannot read isResizing of undefined 2020-09-14 15:20:06 +01:00
Michael Telatynski 493d3ae288 Don't show Notifications Prompt Toast if user has master rule enabled 2020-09-14 14:35:08 +01:00
Michael Telatynski 73608c4aa9 Don't count widgets which no longer exist towards pinned count 2020-09-14 14:03:51 +01:00
RiotRobot 148cad6ea2 Reset matrix-js-sdk back to develop branch 2020-09-14 13:42:34 +01:00
RiotRobot c652ca56da Merge branch 'master' into develop 2020-09-14 13:41:29 +01:00
RiotRobot 099f50b10e v3.4.0 2020-09-14 13:36:32 +01:00
RiotRobot c6eda819f0 Prepare changelog for v3.4.0 2020-09-14 13:36:31 +01:00
RiotRobot ba73847296 Upgrade matrix-js-sdk to 8.3.0 2020-09-14 13:31:41 +01:00