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

Commit Graph

  • f1cac4e268 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-16 13:16:33 +00:00
  • d16ac4d80c Merge pull request #1890 from matrix-org/matthew/slate David Baker 2018-07-16 14:16:25 +01:00
  • f76d9a7a97 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-16 12:33:19 +00:00
  • 33b6d0ab5f Translated using Weblate (Spanish) Markel 2018-07-13 23:18:05 +00:00
  • a17483971a Translated using Weblate (Korean) Kyf Lee 2018-07-14 11:10:54 +00:00
  • 88d688e56f Translated using Weblate (French) Hugues De Keyzer 2018-07-13 20:20:24 +00:00
  • c857bf400c Translated using Weblate (Esperanto) Hugues De Keyzer 2018-07-13 20:40:15 +00:00
  • 415eef5aec Merge pull request #2055 from matrix-org/bwindels/stop-peeking-fix David Baker 2018-07-16 13:33:13 +01:00
  • eb497d442b Merge pull request #2049 from matrix-org/t3chguy/slate_cont2 David Baker 2018-07-16 13:25:27 +01:00
  • 4c6419a3c5 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo David Baker 2018-07-16 13:24:13 +01:00
  • 0f32c3a018 PR feedback David Baker 2018-07-16 13:18:10 +01:00
  • d7ff7cd4ed stupid thinkotypo Matthew Hodgson 2018-07-16 12:00:15 +01:00
  • ff96537048 lint David Baker 2018-07-16 11:49:53 +01:00
  • 29d48e5dad guests trying to join communities should fire the ILAG flow. Michael Telatynski 2018-07-15 22:48:25 +01:00
  • ffe0b35504 while logging out ignore Session.logged_out as it is intentional Michael Telatynski 2018-07-15 22:33:00 +01:00
  • 59a14f2c0b re-hydrate Values which have been serialized into LocalStorage Michael Telatynski 2018-07-15 20:28:41 +01:00
  • e42f8c0c77 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-13 13:47:50 +00:00
  • b450d5be65 Translated using Weblate (Bulgarian) Slavi Pantaleev 2018-07-13 11:32:18 +00:00
  • ac1f130f1e Merge pull request #2057 from matrix-org/t3chguy/null-guard-stickerpicker Matthew Hodgson 2018-07-13 14:47:45 +01:00
  • 4850387ae0 add null-guard for stickerpickerWidget in StickerPicker Michael Telatynski 2018-07-13 14:24:29 +01:00
  • f76ddbc718 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-13 10:14:43 +00:00
  • 903bac3f45 Translated using Weblate (Russian) Andrey 2018-07-11 14:27:59 +00:00
  • a463b6d8bb Translated using Weblate (Azerbaijani) Aziz Ibrahimov 2018-07-12 17:29:00 +00:00
  • 7bbb967ddd Merge pull request #2053 from matrix-org/dbkr/jitsi_always_on_screen Bruno Windels 2018-07-13 11:14:37 +01:00
  • ac8d9a4f20 Translated using Weblate (German) Bamstam 2018-07-04 11:06:49 +00:00
  • e56feea9ec Put always-on-screen widgets in top left David Baker 2018-07-12 18:43:49 +01:00
  • 60a25b5263 Translated using Weblate (Azerbaijani) Aziz Ibrahimov 2018-07-12 17:27:50 +00:00
  • 5a5e967262 Fix avatars vanishing on hover David Baker 2018-07-12 17:48:49 +01:00
  • 7405c5eff2 specify alternate history storage key to prevent conflicts with draft Michael Telatynski 2018-07-12 16:35:42 +01:00
  • b412b9e84d Fix stopPeeking not being called at the right time Bruno Windels 2018-07-12 15:19:25 +02:00
  • f0dbd161b3 Obviously didn't mean to commit that change David Baker 2018-07-11 18:11:28 +01:00
  • 8f10ee01c6 Implement always-on-screen capability for widgets David Baker 2018-07-11 18:07:32 +01:00
  • b4bc09c335 null-guard savedState since now we're accessing its props Michael Telatynski 2018-07-11 17:13:33 +01:00
  • 3e05bf19c5 hide autocomplete when moving caret to match existing behaviour Michael Telatynski 2018-07-11 16:30:45 +01:00
  • 95909de446 fix MessageComposer not marking translatable strings. run gen-i18n Michael Telatynski 2018-07-11 11:39:55 +01:00
  • c3aef6e3a0 workaround for tommoor/slate-md-serializer#14 Michael Telatynski 2018-07-11 10:29:14 +01:00
  • fd4f9679df convert md<->rt if the stored editorState was in a different state Michael Telatynski 2018-07-11 09:39:14 +01:00
  • 3c39c53797 Translated using Weblate (French) Kévin C 2018-07-05 07:50:07 +00:00
  • 88c74bae1f Translated using Weblate (Hungarian) Szimszon 2018-07-04 16:36:01 +00:00
  • 716d7ad85d Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-11 08:12:53 +00:00
  • 3e14cd2190 Merge pull request #2024 from matrix-org/t3chguy/improve_eventtile_error_handling Bruno Windels 2018-07-11 09:12:49 +01:00
  • d8d7ff223f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-11 08:10:33 +00:00
  • 4231c08951 Merge pull request #2051 from matrix-org/dbkr/fix_stickerpicker_persistedelement_usage Bruno Windels 2018-07-11 09:10:27 +01:00
  • 9a2d32e642 accept terms when joining Bruno Windels 2018-07-10 19:26:47 +02:00
  • abbb69dc36 fix fn call, fixes usage of SlashCommands Michael Telatynski 2018-07-10 17:35:13 +01:00
  • 25e453badd Fix stickerpicker PersistedElement usage David Baker 2018-07-10 17:29:39 +01:00
  • f2e3e30af8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-10 15:12:51 +00:00
  • b482a4cdd3 Merge pull request #2042 from matrix-org/matthew/encrypt-for-invited-users Matthew Hodgson 2018-07-10 16:12:45 +01:00
  • ab625d489b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-10 14:18:27 +00:00
  • 02c6f3d168 fix typo Matthew Hodgson 2018-07-10 15:18:07 +01:00
  • 100ecfe7ce remove trailing spaces to make linter happy (no-trailing-spaces) Michael Telatynski 2018-07-10 10:29:52 +01:00
  • 58301e5dd4 navigateHistory only when at edges of document, to prevent Firefox bug Michael Telatynski 2018-07-10 10:28:17 +01:00
  • 51591a4d62 fix lint Matthew Hodgson 2018-07-09 20:11:17 +01:00
  • 8bcb987f50 delint Michael Telatynski 2018-07-09 20:14:37 +01:00
  • 2018523bdb Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-09 19:11:29 +00:00
  • ffec1b5a95 fix lint Matthew Hodgson 2018-07-09 20:11:17 +01:00
  • 0d0934add7 unbreak modifier+space (e.g. emoji insert on macOS) Matthew Hodgson 2018-07-09 00:58:35 +01:00
  • 021409aafe apply review feedback from @lukebarnard1 Matthew Hodgson 2018-07-09 00:52:27 +01:00
  • 83f2614919 add guide to slate's data formats and how we convert Matthew Hodgson 2018-07-09 00:51:48 +01:00
  • 8665f10f27 pin slate to 0.33.4 to avoid https://github.com/ianstormtaylor/slate/pull/1958 Matthew Hodgson 2018-07-08 23:08:02 +01:00
  • 5bd4104c96 modify ComposerHistoryManager Michael Telatynski 2018-07-04 12:16:11 +01:00
  • 5b74c615ae add missing import Michael Telatynski 2018-07-04 10:54:38 +01:00
  • 43204ea177 fix Control-Backspace after select-all Michael Telatynski 2018-07-04 10:17:05 +01:00
  • faf17f06c6 remove debugger statement Michael Telatynski 2018-07-04 00:15:36 +01:00
  • 483116fb03 add rule to slate-md-serializer: make underlined and removed work for CM Michael Telatynski 2018-07-04 00:04:56 +01:00
  • 372fa29ad3 take edge into consideration when moving focus region on arrow keys fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities) Michael Telatynski 2018-07-03 23:36:59 +01:00
  • c6837af398 import-type Change from slate Michael Telatynski 2018-07-03 21:36:31 +01:00
  • efdc5430d7 merge develop Matthew Hodgson 2018-07-09 17:50:07 +01:00
  • 9c5e43a693 cleanup Bruno Windels 2018-07-09 18:40:25 +02:00
  • d4682eb5e6 apply code style Bruno Windels 2018-07-09 18:35:47 +02:00
  • 838563f0a6 add note to README Bruno Windels 2018-07-09 18:21:43 +02:00
  • 400327a0f1 add test for joining preexisting room Bruno Windels 2018-07-09 18:21:05 +02:00
  • 5c4f92952f move tests to separate file Bruno Windels 2018-07-09 17:51:02 +02:00
  • b76c3a1842 don't use jest and just run test code sequentially Bruno Windels 2018-07-09 17:43:21 +02:00
  • 61ac989847 add code style Bruno Windels 2018-07-09 17:08:02 +02:00
  • 473af6ff62 add ignore file Bruno Windels 2018-07-09 17:07:03 +02:00
  • 5429bfde11 move helpers to other module Bruno Windels 2018-07-09 17:06:17 +02:00
  • 9921573076 add license and copyright notice Bruno Windels 2018-07-09 16:50:49 +02:00
  • 1ee4a7ec63 Merge branch 'master' into develop David Baker 2018-07-09 13:23:58 +01:00
  • 7e03b25030 v0.15.7 v0.15.7 David Baker 2018-07-09 13:20:29 +01:00
  • c68623ddb0 Prepare changelog for v0.15.7 David Baker 2018-07-09 13:20:28 +01:00
  • 847df2f75b v0.15.7 David Baker 2018-07-09 13:19:14 +01:00
  • 73be5005c2 Released react-sdk & js-sdk David Baker 2018-07-09 13:16:42 +01:00
  • 288d95121f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-09 12:15:10 +00:00
  • e90837f10b Merge branch 'master' into develop David Baker 2018-07-09 13:14:49 +01:00
  • 487e3cb988 v0.12.9 David Baker 2018-07-09 13:11:02 +01:00
  • 788955aa34 Prepare changelog for v0.12.9 David Baker 2018-07-09 13:11:01 +01:00
  • 6245d78584 Released js-sdk David Baker 2018-07-09 13:08:28 +01:00
  • f43d53c020 Update roadmap Bruno Windels 2018-07-09 12:41:24 +02:00
  • 42b77bfc48 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-09 10:17:20 +00:00
  • e61317284b Merge pull request #2031 from matrix-org/t3chguy/notif_nag_bar Bruno Windels 2018-07-09 11:17:15 +01:00
  • 2847a5355c Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-09 09:17:14 +00:00
  • 1646c3180c Merge pull request #2041 from matrix-org/t3chguy/improve_devtools_perf David Baker 2018-07-09 10:17:05 +01:00
  • 0f1ae2b48d Translated using Weblate (Basque) Osoitz 2018-07-08 08:54:48 +00:00
  • 51dc8d9528 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-06 19:28:14 +00:00
  • 83a7f126f9 Merge pull request #2047 from matrix-org/hs/fix-server-acl-renderer Michael Telatynski 2018-07-06 20:28:07 +01:00
  • 6e1f62d16a Fix stuff Will Hunt 2018-07-06 20:22:37 +01:00
  • 86dc444e37 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-07-06 18:17:35 +00:00
  • aa9208d6b4 Merge pull request #2046 from Half-Shot/hs/show-server-bans Matthew Hodgson 2018-07-06 19:17:30 +01:00
  • 4044185cdd add space after commas Matthew Hodgson 2018-07-06 19:17:01 +01:00