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

Commit Graph

  • 415244438f Merge branch 'origin/develop' into Weblate. Weblate 2019-10-08 22:23:02 +00:00
  • 4423b94185 Translated using Weblate (Hungarian) Szimszon 2019-10-08 18:44:31 +00:00
  • e81df88ec2 Merge pull request #3532 from matrix-org/jryans/join-soft-crash J. Ryan Stinnett 2019-10-08 23:22:57 +01:00
  • 4a56aa16b8 Merge remote-tracking branch 'origin/develop' into dbkr/add_threepid_ui_auth David Baker 2019-10-08 19:11:00 +01:00
  • f4a2d216c3 Support UI auth on adding phone numbers David Baker 2019-10-08 19:07:39 +01:00
  • 0b334c0bbc Support UI Auth on adding email address David Baker 2019-10-08 18:56:13 +01:00
  • db71e90d3e Merge branch 'origin/develop' into Weblate. Weblate 2019-10-08 16:49:55 +00:00
  • 051fd0fd92 Merge pull request #3528 from matrix-org/bwindels/addemailerror Bruno Windels 2019-10-08 16:49:51 +00:00
  • 8c8b1430e4 fix spelling Bruno Windels 2019-10-08 18:39:35 +02:00
  • ac06a97206 Merge branch 'origin/develop' into Weblate. Weblate 2019-10-08 16:36:10 +00:00
  • 2d0d11d747 Translated using Weblate (French) Kévin C 2019-10-08 15:39:22 +00:00
  • 14bbaae585 Merge pull request #3509 from matrix-org/bwindels/createroomenter Bruno Windels 2019-10-08 16:36:05 +00:00
  • 2880ade45c Unmount React components before stopping the client J. Ryan Stinnett 2019-10-08 17:06:12 +01:00
  • 1dc2ae007f Fix soft crash on room join J. Ryan Stinnett 2019-10-08 15:43:57 +01:00
  • 73c3e28dc5 Merge branch 'origin/develop' into Weblate. Weblate 2019-10-08 13:41:04 +00:00
  • f384d4e5c1 Merge pull request #3531 from matrix-org/jryans/cyclic-rageshake J. Ryan Stinnett 2019-10-08 14:41:00 +01:00
  • 538c3795d8 Allow cyclic objects in console logs J. Ryan Stinnett 2019-10-08 14:29:03 +01:00
  • d41a7a7fa0 Merge branch 'origin/develop' into Weblate. Weblate 2019-10-08 12:54:08 +00:00
  • a766043a27 Translated using Weblate (Korean) 송태섭 2019-10-08 12:35:20 +00:00
  • 78e9803631 Translated using Weblate (Italian) random 2019-10-08 08:39:09 +00:00
  • 9a1b6faabf Translated using Weblate (Hungarian) Szimszon 2019-10-08 09:47:31 +00:00
  • 103e08c500 Translated using Weblate (Dutch) Nathan Follens 2019-10-08 10:41:47 +00:00
  • c37fa307c5 Translated using Weblate (Danish) Claus Conrad 2019-10-08 07:18:37 +00:00
  • 5bcb4b0fb6 Merge pull request #3530 from matrix-org/bwindels/watchemoticonsetting Bruno Windels 2019-10-08 12:53:54 +00:00
  • 91d593cb71 watch emoticon autoreplace setting Bruno Windels 2019-10-08 14:11:11 +02:00
  • 4c82496bca export ToggleSwitch Michael Telatynski 2019-10-08 12:22:22 +01:00
  • a03e9e7a4f tidy ToggleSwitch Michael Telatynski 2019-10-08 12:18:44 +01:00
  • a782baf510 React error/warning cleanup Michael Telatynski 2019-10-08 12:10:37 +01:00
  • fa8ad70880 run i18n Michael Telatynski 2019-10-08 11:16:27 +01:00
  • 37b122aa16 delint Michael Telatynski 2019-10-08 10:50:37 +01:00
  • b5ef83986a Merge branch 'origin/develop' into Weblate. Weblate 2019-10-08 06:58:27 +00:00
  • e08d8c01b3 Translated using Weblate (French) Kévin C 2019-10-08 05:08:40 +00:00
  • 599c3df63f Translated using Weblate (Danish) Claus Conrad 2019-10-08 05:08:49 +00:00
  • fff47c49a1 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-10-08 05:52:18 +00:00
  • 15e7559d5b Merge pull request #3508 from matrix-org/bwindels/redact-all-more-robust Bruno Windels 2019-10-08 06:58:21 +00:00
  • cbeb45abd3 update i18n Bruno Windels 2019-10-08 08:56:34 +02:00
  • 1ab19be46c also show dialog here Bruno Windels 2019-10-08 08:50:17 +02:00
  • 978866ea96 dont assume id server when verifying phone numbers either Bruno Windels 2019-10-08 08:43:40 +02:00
  • 040bc5e157 show dialog when server says e-mail hasn't been verified yet Bruno Windels 2019-10-07 17:43:51 +02:00
  • 48b8044937 don't try to get id server domain when not asked to bind Bruno Windels 2019-10-07 17:43:17 +02:00
  • 6bb303c381 add singular translation string Bruno Windels 2019-10-07 17:11:21 +02:00
  • 80ec77a144 dont rely on timeline linkage to find events to redact Bruno Windels 2019-10-02 09:59:37 +02:00
  • d8424f089c Merge branch 'origin/develop' into Weblate. Weblate 2019-10-07 16:48:56 +00:00
  • 3860e59596 Translated using Weblate (Hungarian) Szimszon 2019-10-07 12:38:37 +00:00
  • c97d1d5b05 Merge pull request #3527 from matrix-org/dbkr/label_submit_button David Baker 2019-10-07 17:48:51 +01:00
  • df02eb8e92 Add UserInfo panel (consolidation of MemberInfo & GroupMemberInfo) Labs Michael Telatynski 2019-10-07 16:52:50 +01:00
  • 57e597ec13 Merge pull request #9919 from vector-im/bwindels/settings-config-doc Bruno Windels 2019-10-07 14:10:51 +00:00
  • 259ca06f73 add example default setting Bruno Windels 2019-10-07 14:46:50 +02:00
  • 1dec534493 Label submit button in UI auth password prompt David Baker 2019-10-07 13:13:30 +01:00
  • b8c11e3a27 Merge branch 'origin/develop' into Weblate. Weblate 2019-10-07 12:05:56 +00:00
  • 9200c55ce0 Merge pull request #3526 from matrix-org/travis/recaptcha-fix Travis Ralston 2019-10-07 13:05:52 +01:00
  • 495513028c Appease the linter Travis Ralston 2019-10-07 12:46:14 +01:00
  • bec184db35 Merge branch 'origin/develop' into Weblate. Weblate 2019-10-07 11:45:26 +00:00
  • c547367b62 Merge pull request #3513 from matrix-org/travis/mask-eye Travis Ralston 2019-10-07 12:45:22 +01:00
  • afaaa6774e Update i18n Travis Ralston 2019-10-07 12:43:30 +01:00
  • e841bd5442 Update src/components/views/auth/InteractiveAuthEntryComponents.js Travis Ralston 2019-10-07 12:43:07 +01:00
  • 082ebe636e Null-guard the recaptcha setup Travis Ralston 2019-10-07 12:36:07 +01:00
  • 173f48c8b1 Merge branch 'origin/develop' into Weblate. Weblate 2019-10-07 11:06:36 +00:00
  • 7d96517139 Merge pull request #3523 from matrix-org/dbkr/rageshake_limit_once David Baker 2019-10-07 12:06:30 +01:00
  • c0a148c018 Merge pull request #11062 from MichaelKohler/fix-readme-config-mention Travis Ralston 2019-10-06 09:55:15 -06:00
  • 6b82ff5fd8 Merge branch 'origin/develop' into Weblate. Weblate 2019-10-06 15:44:23 +00:00
  • b091cf1f6d Merge pull request #3525 from MichaelKohler/fix-constant-name Travis Ralston 2019-10-06 09:44:16 -06:00
  • 8eb07197cc Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style Michael Kohler 2019-10-06 13:08:46 +02:00
  • 9e27cb713f Add config.json copy instruction to 'Development' as well Michael Kohler 2019-10-06 13:04:20 +02:00
  • 76ad627083 Translated using Weblate (Korean) 송태섭 2019-10-04 12:56:59 +00:00
  • f6434c244f Translated using Weblate (Italian) random 2019-10-04 12:23:41 +00:00
  • 6eeaa4b49d Translated using Weblate (Hungarian) Szimszon 2019-10-04 10:30:22 +00:00
  • 03d9ce9f83 Translated using Weblate (French) Kévin C 2019-10-04 11:15:35 +00:00
  • 2649b026ad Translated using Weblate (Finnish) Tuomas Hietala 2019-10-04 17:02:13 +00:00
  • 94157b69a6 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-10-04 13:31:56 +00:00
  • 1e8a338e66 Merge pull request #3524 from matrix-org/revert-3521-dbkr/yarn_upgrade_20191004 David Baker 2019-10-04 16:28:41 +01:00
  • 40969c60a9 Revert "Run yarn upgrade" David Baker 2019-10-04 16:28:13 +01:00
  • 644a46bdfd Merge pull request #11055 from vector-im/revert-11050-dbkr/yarn_upgrade_20191004 David Baker 2019-10-04 16:20:33 +01:00
  • b99bdbcd4e Revert "Run yarn upgrade" David Baker 2019-10-04 16:19:29 +01:00
  • e0c2131869 Merge pull request #11050 from vector-im/dbkr/yarn_upgrade_20191004 David Baker 2019-10-04 15:08:26 +01:00
  • 07bf5e6f56 Merge pull request #3521 from matrix-org/dbkr/yarn_upgrade_20191004 David Baker 2019-10-04 15:08:14 +01:00
  • 9981f897a4 Merge pull request #11052 from vector-im/dbkr/persist_storage_on_desktop David Baker 2019-10-04 15:01:50 +01:00
  • a15c8fd476 Only limit the rageshake log size in one place David Baker 2019-10-04 14:56:46 +01:00
  • 57672ad384 Request persistent storage on Electron David Baker 2019-10-04 12:17:01 +01:00
  • b1b4139163 Merge pull request #3522 from matrix-org/t3chguy/backspace_cider_focus Michael Telatynski 2019-10-04 11:57:06 +01:00
  • 1ec0bb284a Limit Backspace-consuming workaround to just Slate, tidy Keyboard :) Michael Telatynski 2019-10-04 11:47:33 +01:00
  • 26cbd16b40 Merge pull request #11047 from vector-im/travis/enable-cider Bruno Windels 2019-10-04 10:24:57 +00:00
  • 64a961ec00 Run yarn upgrade David Baker 2019-10-04 11:13:03 +01:00
  • eda8434444 run yarn upgrade David Baker 2019-10-04 11:09:46 +01:00
  • af57c9e321 js-sdk & react-sdk develop David Baker 2019-10-04 11:08:08 +01:00
  • dc9018dc11 js-sdk develop David Baker 2019-10-04 11:07:22 +01:00
  • fba646d2c5 Merge pull request #3519 from matrix-org/travis/enable-cider Michael Telatynski 2019-10-04 10:50:28 +01:00
  • 685d913171 v1.4.2 v1.4.2 RiotRobot 2019-10-04 10:41:06 +01:00
  • b41452162c Prepare changelog for v1.4.2 RiotRobot 2019-10-04 10:41:06 +01:00
  • ef473f930a v1.4.2 RiotRobot 2019-10-04 10:40:15 +01:00
  • b333058b57 released react-sdk RiotRobot 2019-10-04 10:39:29 +01:00
  • 227c9d0e8c Merge branch 'master' into develop RiotRobot 2019-10-04 10:38:41 +01:00
  • 1a2add1f08 v1.6.2 RiotRobot 2019-10-04 10:37:46 +01:00
  • e7d0ae1b43 Prepare changelog for v1.6.2 RiotRobot 2019-10-04 10:37:45 +01:00
  • 5b71cf5d8d use correct css class for cider composer Bruno Windels 2019-10-04 11:33:45 +02:00
  • ddfcd6cd4e Merge pull request #3520 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2019-10-04 10:24:41 +01:00
  • 7df140c164 electron version bump David Baker 2019-10-04 10:21:27 +01:00
  • 374212f2a2 Merge branch 'origin/develop' into Weblate. Weblate 2019-10-04 09:20:38 +00:00
  • 9351389049 Translated using Weblate (Korean) 송태섭 2019-10-04 02:03:39 +00:00
  • 06c612ba3d Merge pull request #3516 from matrix-org/t3chguy/clean_out_useless_errors Michael Telatynski 2019-10-04 10:20:34 +01:00