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

Commit Graph

  • c325a6bd3b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-03 09:39:58 +00:00
  • 5cc6127221 Merge pull request #1871 from matrix-org/dbkr/update_eslint_plugin_react Luke Barnard 2018-05-03 10:39:53 +01:00
  • 347701c0eb Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-02 22:33:09 +00:00
  • ebfcea8b78 Merge pull request #1872 from matrix-org/matthew/lint-changes Matthew Hodgson 2018-05-02 23:33:04 +01:00
  • 09dcfb0a00 relax lint for jsx-curly-spacing and arrow-parens Matthew Hodgson 2018-05-02 23:27:19 +01:00
  • 7a74decb1c Translated using Weblate (French) Kévin C 2018-05-02 20:07:10 +00:00
  • 2475295a24 Up the max warning count :( David Baker 2018-05-02 17:42:23 +01:00
  • 59299cf16d Merge remote-tracking branch 'origin/develop' into dbkr/update_eslint_plugin_react David Baker 2018-05-02 17:37:00 +01:00
  • 24f1194fc8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-02 16:36:46 +00:00
  • adf3e2f376 Change jsx-no-bind to warn David Baker 2018-05-02 17:36:29 +01:00
  • bf8612f864 Update eslint-plugin-react David Baker 2018-05-02 17:30:37 +01:00
  • 9f5f083f9b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-02 15:49:29 +00:00
  • 9f8202c8a9 Remove directories if they exist David Baker 2018-05-02 16:49:08 +01:00
  • f889f2f5fc Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-02 15:44:06 +00:00
  • 82349ec933 Fix sed David Baker 2018-05-02 16:43:51 +01:00
  • 04206ec929 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-02 15:39:26 +00:00
  • 183947615f Fux up jenkins origin/ branches David Baker 2018-05-02 16:39:10 +01:00
  • fe65065545 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-02 15:30:41 +00:00
  • 621232db4a Translated using Weblate (Russian) Andrey 2018-05-02 13:34:58 +00:00
  • cc16730c23 Merge pull request #1870 from matrix-org/dbkr/use_develop_js_sdk Luke Barnard 2018-05-02 16:30:37 +01:00
  • 0040ea0d9f Use develop js-sdk in travis build David Baker 2018-05-02 15:53:38 +01:00
  • d0141840db Translated using Weblate (Hungarian) Szimszon 2018-05-02 13:05:56 +00:00
  • 6504201190 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-02 12:38:49 +00:00
  • 6bf1eb105a Merge pull request #1741 from matrix-org/t3chguy/m.relates_to Luke Barnard 2018-05-02 13:38:42 +01:00
  • 4c3f811050 switch RoomView:uploadFile to async to clean up then/catch handling Michael Telatynski 2018-05-02 13:14:47 +01:00
  • f2102e283c Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to Michael Telatynski 2018-05-02 13:08:38 +01:00
  • 1c7ea67de6 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-02 10:39:38 +00:00
  • 33e67a8f42 Merge pull request #1869 from matrix-org/dbkr/use_correct_js_sdk_branch Luke Barnard 2018-05-02 11:39:35 +01:00
  • 9bccecf449 Get symlink right David Baker 2018-05-02 11:23:57 +01:00
  • dc20f32ad7 Move waitForUpdate to test-utils Luke Barnard 2018-05-02 11:19:01 +01:00
  • 825d610938 Bah, no pushd. David Baker 2018-05-02 11:13:16 +01:00
  • c54198464b npm install the js-sdk David Baker 2018-05-02 11:09:28 +01:00
  • b44582777b Would if I added the script David Baker 2018-05-02 11:03:40 +01:00
  • 730512bc3f Use the right js-sdk branch when testing David Baker 2018-05-02 10:58:43 +01:00
  • 023f96e817 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-02 09:45:18 +00:00
  • d87987e853 Translated using Weblate (Serbian) Марко М. Костић 2018-05-02 06:49:15 +00:00
  • cb1b64a5cd Translated using Weblate (Hindi) Lakshya A Agrawal 2018-05-02 06:12:52 +00:00
  • 3d478c3c3a Merge pull request #1867 from matrix-org/luke/fix-group-request-concurrency David Baker 2018-05-02 10:45:12 +01:00
  • 2dfb3146b0 Simplify concurrent request error handling Luke Barnard 2018-05-02 10:39:15 +01:00
  • 2553ec8d14 Translated using Weblate (Basque) Osoitz 2018-05-02 08:19:02 +00:00
  • 8326d057ec Translated using Weblate (Serbian) Марко М. Костић 2018-05-02 06:46:59 +00:00
  • ec4ec4717d clean up EventTile:onWidgetLoad optional/required mess Michael Telatynski 2018-05-01 18:15:12 +01:00
  • db55f87699 avoid .done and .then anti-pattern Michael Telatynski 2018-05-01 18:14:35 +01:00
  • 71c1198d12 Rewrite limitConcurrency to fix error catching Luke Barnard 2018-05-01 18:01:25 +01:00
  • 11ae0805b0 re-order ReplyThread methods for readability Michael Telatynski 2018-05-01 17:42:58 +01:00
  • da677e0fcb Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-01 16:38:58 +00:00
  • 1413890a9a Merge pull request #1868 from matrix-org/luke/feature-refresh-group-rooms David Baker 2018-05-01 17:38:53 +01:00
  • bd703b17e5 Update documentation for GroupStore.registerListener Luke Barnard 2018-05-01 16:57:28 +01:00
  • 56ec7713bb Refresh group rooms and members when selecting a tag Luke Barnard 2018-05-01 16:54:14 +01:00
  • 4d8394954c Only create one group store listener in RoomList Luke Barnard 2018-05-01 14:24:58 +01:00
  • da1a5616eb Prevent error responses wedging group request concurrency limit Luke Barnard 2018-05-01 14:04:13 +01:00
  • f0bd4a54e7 Refactor tests to understand sendMessage instead of send{Text,Html}Message Michael Telatynski 2018-05-01 13:26:24 +01:00
  • e3a07be127 Remove GroupStore logging Luke Barnard 2018-05-01 13:14:01 +01:00
  • 26a4b1f2bd Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-01 11:33:12 +00:00
  • 6ec9e5f670 Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor Luke Barnard 2018-05-01 12:33:06 +01:00
  • 25690336c3 Prevent user getting trapped in group settings when an error occurs Luke Barnard 2018-05-01 11:52:02 +01:00
  • 38d7a5d394 Remove GroupStore listener when unmounting GroupPublicityToggle Luke Barnard 2018-05-01 11:50:14 +01:00
  • 28e8ce967f Correctly unregister group store listener when unmounting RoomList Luke Barnard 2018-05-01 11:38:57 +01:00
  • 023daef4b7 Refactor GroupStores into one global GroupStore Luke Barnard 2018-05-01 11:18:45 +01:00
  • 1ea004fea8 Translated using Weblate (Hungarian) Szimszon 2018-05-01 08:27:18 +00:00
  • bbce6eea5b update comment Michael Telatynski 2018-04-30 23:28:55 +01:00
  • 556773e1d6 Translated using Weblate (Russian) Andrey 2018-04-30 18:13:26 +00:00
  • 83be444346 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-30 18:02:05 +00:00
  • 9e21543384 Translated using Weblate (French) Kévin C 2018-04-30 17:30:19 +00:00
  • 5749fbcff9 Merge pull request #1864 from matrix-org/matthew/blob_urls Matthew Hodgson 2018-04-30 19:01:58 +01:00
  • b926baf805 Translated using Weblate (French) Kévin C 2018-04-30 17:27:24 +00:00
  • be1c121e37 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-30 16:57:26 +00:00
  • 22047d7e72 Merge pull request #1845 from kethinov/hide_encryption_icons Luke Barnard 2018-04-30 17:57:22 +01:00
  • c2846a96d7 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-30 16:56:23 +00:00
  • 80c67ba35d Merge pull request #1863 from matrix-org/dbkr/bug_report_dialog_basedialog Luke Barnard 2018-04-30 17:56:19 +01:00
  • e037cf0063 namespace CSS better and fix bug Eric Newport 2018-04-30 12:22:16 -04:00
  • 51db7ddd89 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-30 16:12:45 +00:00
  • 79491764fe Translated using Weblate (German) Krombel 2018-04-30 15:14:24 +00:00
  • 5bacf50001 Merge pull request #1865 from matrix-org/matthew/image_errors David Baker 2018-04-30 17:12:40 +01:00
  • 025bffb4e9 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog David Baker 2018-04-30 16:20:12 +01:00
  • e69f7602ea Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-30 15:18:30 +00:00
  • d2e4d3bc1c Translated using Weblate (Persian) Goudarz Jafari 2018-04-28 20:18:44 +00:00
  • 0e2ee5f127 Merge pull request #6638 from vector-im/dbkr/disable_presence_for_matrix_org David Baker 2018-04-30 16:18:26 +01:00
  • 4d15392593 Translated using Weblate (German) Bamstam 2018-04-30 15:13:00 +00:00
  • dd7ae83226 No trailing / David Baker 2018-04-30 16:12:53 +01:00
  • 3b927a6b93 Translated using Weblate (German) zottel 2018-04-30 15:10:58 +00:00
  • 6ab30e8d88 Translated using Weblate (German) Krombel 2018-04-30 15:09:43 +00:00
  • 461beb6548 Translated using Weblate (German) Bamstam 2018-04-30 15:08:51 +00:00
  • 73b19dccf9 Translated using Weblate (German) Andreas Marek 2018-04-30 15:07:59 +00:00
  • 8c4a5b15ee Translated using Weblate (German) Bamstam 2018-04-30 15:07:41 +00:00
  • 005d3efaf9 Translated using Weblate (German) Krombel 2018-04-30 15:01:21 +00:00
  • f1e401bedf Translated using Weblate (German) Bamstam 2018-04-30 14:58:42 +00:00
  • 48a16464d5 Don't show presence on matrix.org David Baker 2018-04-30 16:00:17 +01:00
  • 485ea635cf Translated using Weblate (German) Krombel 2018-04-30 14:57:09 +00:00
  • 9f8abc68f7 Translated using Weblate (German) Klaus Marx 2018-04-30 14:54:38 +00:00
  • 60be988025 Translated using Weblate (German) Krombel 2018-04-30 14:53:37 +00:00
  • d743e6afe2 Merge branch 'dbkr/bug_report_dialog_basedialog' of github.com:matrix-org/matrix-react-sdk into dbkr/bug_report_dialog_basedialog David Baker 2018-04-30 14:41:43 +01:00
  • e28a927da9 lint David Baker 2018-04-30 14:34:14 +01:00
  • c3420c37fd Indentation David Baker 2018-04-30 14:25:42 +01:00
  • 54cccab0c7 Factor out clearStorageButton David Baker 2018-04-30 14:22:18 +01:00
  • 5d46efc3e8 Get docs right on hasCancel David Baker 2018-04-30 14:17:21 +01:00
  • dcaacfd204 Merge remote-tracking branch 'origin/develop' into dbkr/fix_session_restore_fail_dialog_ux David Baker 2018-04-30 14:06:32 +01:00
  • 76d4a4f3fe v0.14.2 v0.14.2 David Baker 2018-04-30 13:44:23 +01:00
  • 8afdbab9d5 Prepare changelog for v0.14.2 David Baker 2018-04-30 13:44:23 +01:00
  • 9235c0dcfa v0.14.2 David Baker 2018-04-30 13:43:04 +01:00