enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
28,332 Commits 1 Branch 7 Tags
c904b4f416916bd046cc1538fd28232d94de4a3b
Commit Graph

1277 Commits

Author SHA1 Message Date
Michael Telatynski c904b4f416 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 14:10:51 +01:00
Michael Telatynski c1cf8db78f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181 
 Conflicts:
	src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
	src/i18n/strings/en_EN.json
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:55:11 +01:00
Michael Telatynski ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:42:27 +01: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
Michael Telatynski c11abb74e0 UI Feature Flag: Share dialog QR code and social icons 2020-09-16 16:06:17 +01:00
Michael Telatynski feb37878d8 tidy 2020-09-16 15:04:13 +01:00
Michael Telatynski aa25bad689 tidy 2020-09-16 14:57:46 +01:00
Michael Telatynski 1c44f15d2d i18n 2020-09-16 14:54:30 +01:00
Michael Telatynski d3c84e25f5 UI Feature Flag: Identity server 2020-09-16 14:45:34 +01:00
Michael Telatynski d1070c05dd UI Feature Flag: Disable VoIP 2020-09-16 13:40:27 +01:00
Michael Telatynski 9cc789756b UI Feature Flag: Hide flair 2020-09-16 11:26:15 +01:00
Michael Telatynski 6c166f0560 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01:00
Travis Ralston 9b5823cccb Run the rageshake command through the bug report dialog 
Ideally we encourage users to give us information like a github issue or options to download their logs.
 2020-09-09 14:53:38 -06:00
J. Ryan Stinnett 7b1031d6a6 Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup 
Prep work for Settings changes with cross-signing deferral
 2020-09-04 12:51:25 +01: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
J. Ryan Stinnett fb2bde94fa Rename CrossSigningManager to SecurityManager 
The file encompasses bits of cross-signing and also secret storage / secure
backup.
 2020-09-03 14:50:49 +01:00
Travis Ralston 9b12355b2a Appease the linter 2020-09-02 08:59:24 -06:00
Travis Ralston 92c184385c Merge branch 'develop' into travis/communities/proto/userinfo 2020-09-01 10:51:42 -06:00
Michael Telatynski d668f8018b undo some delint 2020-09-01 15:59:19 +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
Travis Ralston fdbaddbace Add a simple edit dialog for communities 2020-08-31 10:52:08 -06:00
Travis Ralston 724e3f6905 Run all selected prototype community logic through one store 2020-08-31 10:19:05 -06:00
Michael Telatynski 517dee413e Delint 2020-08-29 12:57:11 +01:00
Michael Telatynski 72498df28f Remove create-react-class 2020-08-29 12:14:16 +01:00
Michael Telatynski 9ba33c7f80 Fix eslint ts override tsx matching and delint 2020-08-29 01:11:08 +01:00
Travis Ralston 90d9d7128d Use FlairStore's cache for group naming 
Turns out GroupStore doesn't really know much.
 2020-08-28 14:56:59 -06:00
Travis Ralston 6f237161fd Appease the linter 2020-08-28 13:28:54 -06:00
Travis Ralston e58b514803 Add clarifying text to DM dialog about what is about to happen 2020-08-28 13:22:20 -06:00
Michael Telatynski 1fc55b33c1 Stash lodash import optimization 2020-08-28 18:53:43 +01:00
Travis Ralston cc2fc911af Minor copy addition to DM dialog for communities prototype 2020-08-28 10:03:27 -06:00
Travis Ralston f038103f97 Fix copy 2020-08-28 09:47:36 -06:00
Travis Ralston be1de1d295 Update create room dialog copy 2020-08-27 13:49:40 -06:00
resynth1943 2c20afc047 Fix lodash imports 
Signed-off-by: resynth1943 <resynth1943@tutanota.com>
 2020-08-26 23:23:18 +01:00
Travis Ralston 4f29770adb Force the GroupStore to update after creating a prototype community 2020-08-26 11:02:14 -06:00
Travis Ralston 027f263589 Remove prototype code from CreateGroupDialog 
The prototype code paths prevent users from ending up here, so we don't need custom code.
 2020-08-26 11:01:58 -06:00
Travis Ralston c28134eb11 Associate created rooms with the selected community 2020-08-26 10:53:06 -06:00
Travis Ralston 82b015bd5f Rename components to match prior convention 2020-08-26 08:52:39 -06:00
Travis Ralston 3e7d82b421 Change tip copy 2020-08-26 08:48:01 -06:00
Travis Ralston 56c7f86983 Add an invite users to community step to dialog flow 2020-08-25 21:08:31 -06:00
Travis Ralston 7c1a9993e3 Add new create group dialog 2020-08-25 21:08:24 -06:00
Travis Ralston 65fe562cbf Select new tag after creating the group 2020-08-25 21:08:12 -06:00
Travis Ralston f0bd4d3625 Show the group's room if one is returned 2020-08-21 18:19:34 -06: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 3659115921 Followup on some SettingsStore removals 2020-08-17 13:37:16 -06:00
Travis Ralston 96087d61f6 Convert feature setting usages to regular settings 2020-08-17 13:12:18 -06:00
Michael Telatynski 8aa50ecb59 Iterate rageshake download styling 2020-08-13 13:08:07 +01:00
Michael Telatynski df980dbf92 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-12 22:48:03 +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