Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • fb867fc05b Merge pull request #3801 from matrix-org/travis/ftue/user-lists/2-suggestions Travis Ralston 2020-01-06 12:32:27 -07:00
  • 6c410e6027 Fix comment style Travis Ralston 2020-01-06 12:23:35 -07:00
  • bef824e84e Remove harmful html entities encoding and other style nits Travis Ralston 2020-01-06 12:21:59 -07:00
  • 5f1ef6dfb8 v1.5.7-rc.1 v1.5.7-rc.1 RiotRobot 2020-01-06 16:26:46 +00:00
  • 14620a5763 Prepare changelog for v1.5.7-rc.1 RiotRobot 2020-01-06 16:26:45 +00:00
  • 66b40d8c61 v1.5.7-rc.1 RiotRobot 2020-01-06 16:25:40 +00:00
  • 1de2fe5e27 Merge remote-tracking branch 'origin/develop' into release-v1.5.7 RiotRobot 2020-01-06 16:22:33 +00:00
  • 52ca0908e2 Fix the build David Baker 2020-01-06 14:55:38 +00:00
  • bdef54622b delint and add copyright Michael Telatynski 2020-01-06 14:52:08 +00:00
  • f1de6d060a Add a regression test for editing events and url previews Michael Telatynski 2020-01-06 14:38:21 +00:00
  • f7618e3c73 react-sdk & js-sdk rc.1 RiotRobot 2020-01-06 14:05:47 +00:00
  • 0df16631c2 v1.7.6-rc.1 RiotRobot 2020-01-06 14:01:54 +00:00
  • 623799ebdc Prepare changelog for v1.7.6-rc.1 RiotRobot 2020-01-06 14:01:54 +00:00
  • 6b8f6239c5 js-sdk 3.0.0-rc.1 RiotRobot 2020-01-06 13:58:43 +00:00
  • 93c4439045 js-sdk rc.1 RiotRobot 2020-01-06 13:30:56 +00:00
  • c551f2983a Add TextualBody-test.js Michael Telatynski 2020-01-06 13:28:29 +00:00
  • d4645542f9 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 13:10:34 +00:00
  • ffd09e42bd Merge pull request #3806 from matrix-org/t3chguy/dedup_recent_emoji Michael Telatynski 2020-01-06 13:10:28 +00:00
  • a5d5749420 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 13:10:18 +00:00
  • 4c40266938 Merge pull request #3803 from matrix-org/t3chguy/fix_avatar_remove Michael Telatynski 2020-01-06 13:10:13 +00:00
  • 8b3df0d793 Bump electron version David Baker 2020-01-06 13:09:10 +00:00
  • d5eb4ff310 Update src/components/views/settings/ProfileSettings.js Michael Telatynski 2020-01-06 13:02:32 +00:00
  • 9c500e3544 Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody Michael Telatynski 2020-01-06 11:51:35 +00:00
  • b24268a6fb Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 11:34:54 +00:00
  • 6b6d0dd866 Merge pull request #3810 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2020-01-06 11:34:47 +00:00
  • 5e2b48acff Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 11:26:01 +00:00
  • 6a1f4c41ce Merge pull request #3788 from matrix-org/t3chguy/user_info_non-historical Michael Telatynski 2020-01-06 11:25:54 +00:00
  • e6be00a97a Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 11:15:30 +00:00
  • f371034ef8 Merge pull request #3808 from matrix-org/t3chguy/remove_slate Michael Telatynski 2020-01-06 11:15:24 +00:00
  • 1f1c8d07c3 Merge pull request #11784 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2020-01-06 10:29:38 +00:00
  • 393c610b5a Translated using Weblate (Hungarian) Szimszon 2020-01-06 07:06:31 +00:00
  • d8a88387f3 Translated using Weblate (French) Kévin C 2020-01-06 07:24:10 +00:00
  • 51a1507f47 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-06 07:27:45 +00:00
  • 3b91b31534 Translated using Weblate (Basque) Osoitz 2020-01-06 05:49:40 +00:00
  • 2af4cdf532 Translated using Weblate (Albanian) Besnik Bleta 2020-01-06 10:05:50 +00:00
  • bd0a96f2b2 Merge branches 'develop' and 't3chguy/fix_react_complaining' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_react_complaining Michael Telatynski 2020-01-06 09:35:59 +00:00
  • ac1d9b03bf undo one of the "fixes" Michael Telatynski 2020-01-06 09:35:14 +00:00
  • 2f257c2dc7 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 05:18:26 +00:00
  • 4ab7b9ba92 Merge pull request #3809 from aaronraimist/pinned-msg-display-name Travis Ralston 2020-01-05 22:18:21 -07:00
  • 98ede6437e Use display name when pinned messages are changed Aaron Raimist 2020-01-05 23:04:42 -06:00
  • c802f9a302 remove unused stale Test Suite Michael Telatynski 2020-01-06 00:23:19 +00:00
  • 64754a3f88 Add comment and delint Michael Telatynski 2020-01-06 00:18:24 +00:00
  • d31c863563 Remove all usages of slate in favour of CIDER Michael Telatynski 2020-01-06 00:13:16 +00:00
  • 58271e840c Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 00:08:43 +00:00
  • 92fb6fcdc2 Merge pull request #3790 from justin-sleep/fix-dark-diff-highlighting Travis Ralston 2020-01-05 17:08:38 -07:00
  • 06dc5aa410 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 00:03:33 +00:00
  • 83e5ebafd7 Merge pull request #11778 from vector-im/hs/feature_bridge_state Travis Ralston 2020-01-05 17:03:27 -07:00
  • 0cad813071 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 00:03:22 +00:00
  • 781b69f4e3 Merge pull request #3693 from matrix-org/hs/bridge-info Travis Ralston 2020-01-05 17:03:15 -07:00
  • 8ec8a7c015 Comment rationale for swapping dark theme colors Justin Sleep 2020-01-05 17:58:07 -06:00
  • dcdf68d7e1 Explicitly define diff colors in light theme Justin Sleep 2020-01-05 17:35:05 -06:00
  • 7f0ed05ee1 Update BridgeSettingsTab.js Will Hunt 2020-01-05 23:32:49 +00:00
  • 4bea87f00d Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description Michael Telatynski 2020-01-05 22:23:03 +00:00
  • 378a82e6fb Use html-entities instead Michael Telatynski 2020-01-05 22:22:09 +00:00
  • 4a836349ab regenerate i18n Michael Telatynski 2020-01-05 22:01:59 +00:00
  • b6098ddb47 Delegate all room alias validation to the RoomAliasField validator Michael Telatynski 2020-01-05 21:58:36 +00:00
  • 95cc08e5d7 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-05 21:46:48 +00:00
  • a231419a77 Translated using Weblate (Turkish) catborise 2020-01-04 09:27:22 +00:00
  • 8128b97f35 Translated using Weblate (Hungarian) Szimszon 2020-01-05 21:12:03 +00:00
  • d1405233bd Translated using Weblate (French) Kévin C 2020-01-04 08:16:36 +00:00
  • e6c8016086 Translated using Weblate (Finnish) Samu Voutilainen 2020-01-04 16:49:31 +00:00
  • b8f1ca679b Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-04 13:20:53 +00:00
  • c2c4426396 Translated using Weblate (Albanian) Besnik Bleta 2020-01-04 10:32:00 +00:00
  • 449efec1a1 Merge pull request #3805 from matrix-org/t3chguy/rageshake_enabled_labs Michael Telatynski 2020-01-05 21:46:32 +00:00
  • ba2f4aa973 tidy Michael Telatynski 2020-01-05 21:26:32 +00:00
  • cf071c5ac6 Deduplicate recent emoji Michael Telatynski 2020-01-05 21:23:34 +00:00
  • 814c0aa4c2 Send enabled_labs over rageshake as comma delimited list Michael Telatynski 2020-01-05 20:52:54 +00:00
  • 4118faa834 When looking at a MemberInfo, clicking on MemberList should close not switch Michael Telatynski 2020-01-05 20:31:07 +00:00
  • fb754b795c Fix right panel buttons highlighting Michael Telatynski 2020-01-05 20:30:01 +00:00
  • 2ccc8caa69 Fix indent Will Hunt 2020-01-05 15:50:06 +00:00
  • 50fe3109c0 Add feature_bridge_state Will Hunt 2020-01-05 15:47:14 +00:00
  • d7607df1b1 Add feature_bridge_state to config Will Hunt 2020-01-05 15:42:09 +00:00
  • 295dcbfe48 Fix ability to remove avatars Michael Telatynski 2020-01-04 13:34:05 +00:00
  • 8b4c1e3dec Support searching in the user directory for invite targets Travis Ralston 2020-01-03 21:17:48 -07:00
  • df25a98810 Implement basic filtering for invite targets Travis Ralston 2020-01-03 20:35:30 -07:00
  • 250222726d Merge branch 'travis/ftue/user-lists/2-suggestions' into travis/ftue/user-lists/3-filtering Travis Ralston 2020-01-03 20:34:00 -07:00
  • 31d5617c97 Add suggestions for which users to invite to chat Travis Ralston 2020-01-03 19:41:06 -07:00
  • 206d4c78d2 Fix references to 'this' in Avatar and Unread Travis Ralston 2020-01-03 12:32:29 -07:00
  • 9edc361afc Use new imports for js-sdk's ContentRepo Travis Ralston 2020-01-03 12:29:22 -07:00
  • 6aab061fb9 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-03 17:32:30 +00:00
  • 65954b1e1b Merge pull request #3792 from matrix-org/travis/ftue/user-lists/1-initial Travis Ralston 2020-01-03 10:32:24 -07:00
  • 23e9c16ced Merge branch 'origin/develop' into Weblate. Weblate 2020-01-03 17:30:38 +00:00
  • 024c019c5b Merge pull request #11758 from vector-im/travis/ftue/user-lists/1-initial Travis Ralston 2020-01-03 10:30:32 -07:00
  • 514e9b754a Add FTUE User Lists to develop config Travis Ralston 2020-01-03 10:25:09 -07:00
  • 752482964a Purify the components Travis Ralston 2020-01-03 10:24:07 -07:00
  • b97736f058 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-03 16:32:09 +00:00
  • 76f3a08909 Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s J. Ryan Stinnett 2020-01-03 16:32:02 +00:00
  • 21fb15d76a Merge branch 'origin/develop' into Weblate. Weblate 2020-01-03 16:04:07 +00:00
  • 9bf5449f33 Merge pull request #3798 from matrix-org/dbkr/dont_fail_if_logs_empty David Baker 2020-01-03 16:04:02 +00:00
  • 5096696f4b Merge branch 'origin/develop' into Weblate. Weblate 2020-01-03 16:04:01 +00:00
  • 33d35c83ba Translated using Weblate (Bulgarian) Slavi Pantaleev 2020-01-03 15:42:11 +00:00
  • e9fa6032af Merge pull request #3799 from matrix-org/dbkr/comment_remaining_non_cross_signing_components David Baker 2020-01-03 16:03:53 +00:00
  • e12ed04da8 Remove unused import J. Ryan Stinnett 2020-01-03 15:59:14 +00:00
  • 2125bcf5a6 Comment remaining non-cross-signing-compliant components David Baker 2020-01-03 15:38:59 +00:00
  • b8683462e8 Update backup creation paths for SSSS J. Ryan Stinnett 2020-01-03 15:34:03 +00:00
  • b79e1d47c4 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-03 15:24:03 +00:00
  • 731279ab2d Translated using Weblate (Bulgarian) Slavi Pantaleev 2020-01-03 14:53:05 +00:00
  • f9216ea590 Merge pull request #3797 from matrix-org/dbkr/remove_unverify David Baker 2020-01-03 15:23:52 +00:00
  • 2970a9faaf Don't fail if logs exists and is an empty dir David Baker 2020-01-03 15:16:02 +00:00
  • 5faae1d2f2 i18n David Baker 2020-01-03 15:05:41 +00:00