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

Commit Graph

  • a0da13200f Fix conflicts in package.json Travis Ralston 2020-01-07 15:52:46 -07:00
  • fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop Travis Ralston 2020-01-09 14:15:09 -07:00
  • 96125a6cbd Merge branch 'origin/develop' into Weblate. Weblate 2020-01-09 21:14:00 +00:00
  • d40091afc5 Merge pull request #3820 from matrix-org/travis/ftue/user-lists/4.5.5-paste Travis Ralston 2020-01-09 14:13:55 -07:00
  • 664c505c2f Merge branch 'origin/develop' into Weblate. Weblate 2020-01-09 21:13:37 +00:00
  • ad33a2322e Merge pull request #3819 from matrix-org/travis/ftue/user-lists/4.5-3pids Travis Ralston 2020-01-09 14:13:32 -07:00
  • 455b7ae347 Merge pull request #11802 from vector-im/travis/sourcemaps-dev Travis Ralston 2020-01-09 14:09:35 -07:00
  • 6ca9a7c998 Merge pull request #3766 from matrix-org/travis/babel7-wp-es6-fixes Travis Ralston 2020-01-09 14:00:59 -07:00
  • 57dd462807 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-09 20:57:32 +00:00
  • 5b1246324e Translated using Weblate (Turkish) catborise 2020-01-09 19:58:09 +00:00
  • 8a2efd77ed Translated using Weblate (Basque) Osoitz 2020-01-09 20:18:03 +00:00
  • ba73600cf0 Merge pull request #3815 from matrix-org/travis/ftue/user-lists/4-composer Travis Ralston 2020-01-09 13:57:22 -07:00
  • 4e4871c281 Move lang import to the top of the file Travis Ralston 2020-01-09 13:56:14 -07:00
  • 5019eff1e3 Don't allow upgrade from untrusted key backup. David Baker 2020-01-09 20:49:37 +00:00
  • d877187d5e Remove postinstall script now that it's not needed Travis Ralston 2020-01-08 19:19:54 -07:00
  • 9bf1c65971 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev Travis Ralston 2020-01-09 13:43:25 -07:00
  • 2caebef7a1 Make the SVG smaller Travis Ralston 2020-01-09 13:40:35 -07:00
  • cb9e4376b8 Fix flow comment Travis Ralston 2020-01-09 13:39:50 -07:00
  • 94e9c6ac9f Make the SVG smaller Travis Ralston 2020-01-09 13:38:47 -07:00
  • a91bab29ff Merge pull request #11801 from vector-im/travis/babel7-wp-scripts Travis Ralston 2020-01-09 13:34:09 -07:00
  • 929096b3f9 Merge pull request #11712 from vector-im/travis/babel7-wp-wp Travis Ralston 2020-01-09 13:32:46 -07:00
  • f452ea225a FlowJS is not Flow Travis Ralston 2020-01-09 12:31:16 -07:00
  • 5445f97998 Merge pull request #11810 from besendorf/patch-1 Travis Ralston 2020-01-09 09:50:11 -07:00
  • e9032a9f61 Move the lock icon within the feather-customised directory Zoe 2020-01-09 15:59:27 +00:00
  • 0a9d7f43c6 pass the correct phase params for consistency Michael Telatynski 2020-01-09 15:51:19 +00:00
  • 7dfc392a2b Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel Michael Telatynski 2020-01-09 15:48:06 +00:00
  • 5d22561815 Display a padlock icon beside encrypted rooms in the room list Zoe 2020-01-09 15:17:33 +00:00
  • a6015d46f4 Updates URL for Electron Command Line Switches besendorf 2020-01-09 15:48:12 +01:00
  • 3f5663071a Merge branch 'origin/develop' into Weblate. Weblate 2020-01-09 12:26:22 +00:00
  • e0d80fb8b2 Translated using Weblate (Swedish) Kenneth Larsson 2020-01-09 08:39:17 +00:00
  • 71b3005f1d Merge pull request #3711 from matrix-org/t3chguy/clean_up_TextualBody Michael Telatynski 2020-01-09 12:26:15 +00:00
  • f3f929207c Update yarn.lock Michael Telatynski 2020-01-09 12:18:14 +00:00
  • 245a68b3ba 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-09 12:17:21 +00:00
  • 8116ac74ce Update src/components/views/context_menus/MessageContextMenu.js Michael Telatynski 2020-01-09 12:10:44 +00:00
  • 9b8ce0de52 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-09 04:38:44 +00:00
  • 9cd364b0e2 Translated using Weblate (Swedish) Kenneth Larsson 2020-01-08 15:32:25 +00:00
  • 27468a4abc Translated using Weblate (Bulgarian) Slavi Pantaleev 2020-01-08 11:38:40 +00:00
  • 1d9d706b9c Merge pull request #3789 from matrix-org/t3chguy/render_html_entities_in_og-description Travis Ralston 2020-01-08 21:38:31 -07:00
  • 4ad4437f33 Support pasting a bunch of identifiers into the invite dialog Travis Ralston 2020-01-08 21:19:00 -07:00
  • 35b27bd231 Merge branch 'travis/ftue/user-lists/4.5-3pids' into travis/ftue/user-lists/4.5.5-paste Travis Ralston 2020-01-08 21:21:03 -07:00
  • 94e7587db7 Merge branch 'travis/ftue/user-lists/4-composer' into travis/ftue/user-lists/4.5.5-paste Travis Ralston 2020-01-08 21:20:57 -07:00
  • 6e5de1893b Bind handlers to this Travis Ralston 2020-01-08 21:01:53 -07:00
  • ab5d82b5ac Appease the linter Travis Ralston 2020-01-08 20:53:20 -07:00
  • 79ab69353c Support searching for 3PIDs from the invite dialog Travis Ralston 2020-01-08 20:49:29 -07:00
  • 110b63b816 Fix buildkite pipeline Travis Ralston 2020-01-08 16:14:01 -07:00
  • ec66069e96 Update build scripts for new process Travis Ralston 2020-01-08 16:09:26 -07:00
  • 4482cac9b4 Merge branch 'travis/babel7-wp-wp' into travis/babel7-wp-scripts Travis Ralston 2020-01-08 16:08:08 -07:00
  • 1cd9c4ff11 Move babel config out to its own file Travis Ralston 2020-01-08 16:01:28 -07:00
  • 203c9c8a7d Don't use so many extensions Travis Ralston 2020-01-08 15:11:23 -07:00
  • 37a83d469c Add giant comment about why we're runnign CSS through PostCSS Travis Ralston 2020-01-08 14:56:40 -07:00
  • e19d86e822 Merge branch 'travis/sourcemaps' into travis/babel7-wp-wp Travis Ralston 2020-01-08 14:44:01 -07:00
  • 36b7be920b Merge branch 'travis/sourcemaps' into travis/babel7-wp-es6-fixes Travis Ralston 2020-01-08 14:42:01 -07:00
  • 85c4c72bf3 Merge pull request #3767 from matrix-org/travis/babel7-wp-package Travis Ralston 2020-01-08 11:10:05 -07:00
  • 59f608ffd6 Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export Travis Ralston 2020-01-08 09:09:11 -07:00
  • 9aab1503a5 Merge pull request #3764 from matrix-org/travis/babel7-wp-es6-imports-2 Travis Ralston 2020-01-08 09:08:36 -07:00
  • f7637a0df7 v1.5.7-rc.2 v1.5.7-rc.2 RiotRobot 2020-01-08 11:25:06 +00:00
  • 275b0555bd Prepare changelog for v1.5.7-rc.2 RiotRobot 2020-01-08 11:25:05 +00:00
  • 5d636baae3 v1.5.7-rc.2 RiotRobot 2020-01-08 11:23:46 +00:00
  • a1b14751e5 bump to matrix-react-sdk rc.2 RiotRobot 2020-01-08 11:22:50 +00:00
  • a3fe5bbd8c v1.7.6-rc.2 RiotRobot 2020-01-08 11:20:29 +00:00
  • f03d55cfe1 Prepare changelog for v1.7.6-rc.2 RiotRobot 2020-01-08 11:20:29 +00:00
  • f65e2c8f7a Merge pull request #3818 from matrix-org/dbkr/heal_a_broken_heart_2 David Baker 2020-01-08 11:04:31 +00:00
  • 96cb1ddff5 Use a regex that actually works David Baker 2020-01-07 20:41:19 +00:00
  • bd336b0710 Use a regex because it's simpler and works David Baker 2020-01-07 19:57:17 +00:00
  • f31cc7dfee Strip all variation selectors on emoji David Baker 2020-01-07 18:48:55 +00:00
  • 9b5d774bf0 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-08 10:30:05 +00:00
  • 36e11c7581 Translated using Weblate (Turkish) catborise 2020-01-07 17:30:43 +00:00
  • 56152e4c60 Translated using Weblate (German) Hucki 2020-01-07 21:38:22 +00:00
  • 4e6bf3079a Merge pull request #3814 from matrix-org/dbkr/heal_a_broken_heart David Baker 2020-01-08 10:29:54 +00:00
  • 9213f88180 Re-add docs Travis Ralston 2020-01-07 15:13:42 -07:00
  • 284a69f0b2 Merge pull request #3763 from matrix-org/travis/babel7-wp-es6-js-sdk Travis Ralston 2020-01-07 14:27:19 -07:00
  • f11f8dbc59 Merge pull request #3762 from matrix-org/travis/babel7-wp-es6-imports Travis Ralston 2020-01-07 14:26:52 -07:00
  • 45ef57d86f Use a regex that actually works David Baker 2020-01-07 20:41:19 +00:00
  • 67a67e3cb2 Merge branch 'travis/ftue/user-lists/4-composer' into travis/ftue/user-lists/4.5-paste-and-3pids Travis Ralston 2020-01-07 13:04:36 -07:00
  • 2d410c91ac Use a regex because it's simpler and works David Baker 2020-01-07 19:57:17 +00:00
  • e7d48e00d2 Appease the scss linter too Travis Ralston 2020-01-07 12:25:22 -07:00
  • 4936e16a15 Remove unused ThreepidMember class for now Travis Ralston 2020-01-07 12:21:14 -07:00
  • 45a44b9102 Appease the linter Travis Ralston 2020-01-07 12:20:02 -07:00
  • 091bfdeaa0 Add checkmarks to selected individuals Travis Ralston 2020-01-07 12:12:31 -07:00
  • ffd40c2c40 Initial editor for user list selection Travis Ralston 2020-01-06 20:51:23 -07:00
  • 40b23d6aa4 Strip all variation selectors on emoji David Baker 2020-01-07 18:48:55 +00:00
  • a94dbd6231 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-07 16:50:17 +00:00
  • 8606bb9fba Translated using Weblate (Italian) random 2020-01-07 13:50:05 +00:00
  • 0381334f45 Translated using Weblate (French) Kévin C 2020-01-07 11:02:59 +00:00
  • 69dde64a7a Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-07 02:52:43 +00:00
  • 87a6791eb8 Merge pull request #3812 from matrix-org/t3chguy/fix_UserInfo Michael Telatynski 2020-01-07 16:50:10 +00:00
  • a62c260f79 Fix userinfo for users not in the room Michael Telatynski 2020-01-07 12:58:24 +00:00
  • 15982ae0b0 Updated blog url Yngve Levinsen 2020-01-07 13:33:39 +01:00
  • 7367c73a37 Searchbox Enter is to clear, tabbing to clear button doesn't work, remove it Michael Telatynski 2020-01-07 10:50:02 +00:00
  • 823ec19c69 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 23:58:55 +00:00
  • 6ba5dc61e2 Merge pull request #3811 from matrix-org/t3chguy/fix_e2e_tests Michael Telatynski 2020-01-06 23:58:51 +00:00
  • 7b91d2056b Attempt to fix e2e tests Michael Telatynski 2020-01-06 23:50:42 +00:00
  • 83dd6da9df Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 21:42:32 +00:00
  • 653f31b22d Merge pull request #3752 from matrix-org/t3chguy/fix_react_complaining Michael Telatynski 2020-01-06 21:42:27 +00:00
  • 0f92bfe721 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 21:26:07 +00:00
  • dac31dbe00 Translated using Weblate (Hungarian) Szimszon 2020-01-06 21:08:18 +00:00
  • 163df614f3 Merge pull request #3807 from matrix-org/t3chguy/fix_AliasSettings Michael Telatynski 2020-01-06 21:26:00 +00:00
  • 2eddf54c24 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 20:38:38 +00:00
  • b44e4ab45c Merge pull request #3802 from matrix-org/travis/ftue/user-lists/3-filtering Travis Ralston 2020-01-06 13:38:32 -07:00
  • c06952c032 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-06 19:32:33 +00:00