Commit Graph

62531 Commits

Author SHA1 Message Date
Jordan Moran Meyers fb69ac33a0 update gitignore to allow .idea directory to exist in subdirs 2017-08-05 15:50:47 -05:00
Michael Telatynski c4803c6d89 suppressOnHover for member entity tiles which have no onClick
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-05 13:01:19 +01:00
Richard Lewis 25d1d785ba Updated icons 2017-08-05 00:23:55 +01:00
Richard Lewis 1973b2bbe7 Switch app drawer icons 2017-08-05 00:00:19 +01:00
Richard Lewis 41afbb117d Add show and hide icons 2017-08-04 23:44:52 +01:00
Michael Telatynski ffdffb643d allow hiding of avatar/display name changes 2017-08-04 17:22:01 +01:00
Luke Barnard 91c96c1c27 Update draft-js-export-* deps to be compatible with draft-js >0.10.0 2017-08-04 15:08:03 +01:00
David Baker 234a88c098 WIP group member list/tiles 2017-08-04 15:00:34 +01:00
David Baker fb8d6c962d Use npm 6 2017-08-04 11:28:42 +01:00
David Baker b06922b6fc Merge pull request #1270 from matrix-org/luke/fix-md-unescaped-tokens
MD-escape URLs/alises/user IDs prior to parsing markdown
2017-08-04 10:30:30 +01:00
Luke Barnard ee18ddb700 MD-escape URLs/alises/user IDs prior to parsing markdown
So that MD characters in them do not result in formatting being applied.

Fixes https://github.com/vector-im/riot-web/issues/3428
Fixes https://github.com/vector-im/riot-web/issues/4674
2017-08-04 10:02:22 +01:00
Weblate 8b1650c382 Merge remote-tracking branch 'origin/develop' into develop 2017-08-03 14:56:03 +00:00
David Baker 4b5febadb7 Merge pull request #4740 from vector-im/luke/upgrade-dep-draft-js-0.11.0-alpha
Update draft-js from 0.10.1 to 0.11.0-alpha
2017-08-03 15:55:57 +01:00
David Baker ee5fc12cb0 Merge pull request #1269 from matrix-org/luke/upgrade-dep-draft-js-0.11.0
Upgrade draft-js to 0.11.0-alpha
2017-08-03 15:55:52 +01:00
Luke Barnard 8ca2af0fe7 Update draft-js from 0.10.1 to 0.11.0-alpha (see https://github.com/matrix-org/matrix-react-sdk/pull/1269) 2017-08-03 15:22:52 +01:00
Weblate 03228d945d Merge remote-tracking branch 'origin/develop' into develop 2017-08-03 14:21:40 +00:00
yuurii 3e845bc37c Translated using Weblate (Japanese)
Currently translated at 28.5% (59 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2017-08-03 14:21:39 +00:00
Osoitz 531f1e52eb Translated using Weblate (Basque)
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
2017-08-03 14:21:38 +00:00
David Baker f5e5bb8720 Merge pull request #4739 from vector-im/t3chguy/mouse_forward_back-windows
electron support for mouse forward/back buttons in Windows
2017-08-03 15:21:33 +01:00
Luke Barnard a27eefd893 Fix a couple of more errors due to API changes 2017-08-03 15:20:44 +01:00
Michael Telatynski a6d5158830 electron support for mouse forward/back buttons in Windows
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-03 15:03:50 +01:00
daniel tygel dfa1ce8d77 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
2017-08-03 13:46:44 +00:00
Luke Barnard 901cbf495d Update decorator strategy API in accordance with recent changes to 0.11.0
See https://github.com/facebook/draft-js/commit/590cdc6c54b409be750f5ad88206873218c6c289, which is a change to the API not mentioned in the migration to v0.10 notes https://draftjs.org/docs/v0-10-api-migration.html
2017-08-03 12:02:29 +01:00
Luke Barnard 1d1cd5f691 Reflect API change for decorator strategy 2017-08-03 11:36:07 +01:00
Luke Barnard fb5dc295aa Reflect API change for getting an Entity 2017-08-03 11:29:26 +01:00
Luke Barnard 124795006c Reflect API change for creating an Entity 2017-08-03 11:18:56 +01:00
Luke Barnard 4f0cf7d6ec Update npm dep of draft-js to 0.11.0-alpha 2017-08-03 11:16:32 +01:00
yuurii 4835123256 Added translation using Weblate (Japanese) 2017-08-03 09:15:56 +00:00
David Baker fe19dbee02 Remove unused component 2017-08-03 09:26:41 +01:00
Osoitz 5872f2389f Translated using Weblate (Basque)
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-08-03 06:30:46 +00:00
Jeff Huang da2b3c067b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-08-03 06:11:15 +00:00
Jeff Huang 3ba4823fd7 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2017-08-03 00:43:45 +00:00
Michael Telatynski 1b004f170d make eslint happy 2017-08-03 01:10:32 +01:00
Michael Telatynski 9ab30b7b17 fix line-length and copyright header 2017-08-03 01:05:43 +01:00
Michael Telatynski 131d1c74c9 add room state explorer to devtools 2017-08-03 00:59:40 +01:00
Richard Lewis 5752345b80 Merge pull request #1263 from matrix-org/rxl881/warnings
Display warning if widget is mixed content
2017-08-02 17:30:46 +01:00
Richard Lewis 7599bde1f6 Fix logging line length. 2017-08-02 17:05:46 +01:00
Luke Barnard 700dd51584 Merge pull request #1267 from matrix-org/luke/fix-complete-after-blocks
Account for `\n` after each block
2017-08-02 16:41:47 +01:00
Kegan Dougal c914f1607b scalar-develop is a scalar URL 2017-08-02 14:35:14 +01:00
yuurii b9ff6c873c Added translation using Weblate (Japanese) 2017-08-02 13:32:57 +00:00
Michael Telatynski 29f43f8fe8 add styling for TextInputWithCheckboxDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-02 14:01:32 +01:00
Michael Telatynski 6e39e72849 fix m.federate always being false because value is a string. Y HTML...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-02 14:00:24 +01:00
Michael Telatynski e9afcec5b2 fix m.federate=false warning in room settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-02 13:42:24 +01:00
Michael Telatynski 4b4b730233 fix and i18n the impl
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-02 13:41:26 +01:00
Weblate 6653ccf9a1 Merge remote-tracking branch 'origin/develop' into develop 2017-08-02 12:06:35 +00:00
Luke Barnard 4b8764c070 Merge pull request #4730 from vector-im/luke/update-dep-draft-js
Update draft-js from 0.8.1 to 0.10.1
2017-08-02 13:06:31 +01:00
Michael Telatynski bf09c14e44 Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings 2017-08-02 12:24:15 +01:00
Michael Telatynski fd454b476a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings 2017-08-02 12:15:00 +01:00
Luke Barnard 2f99a4883f Update draft-js from 0.8.1 to 0.10.1
Hopefully to fix #4675 and friends
2017-08-02 11:52:47 +01:00
Michael Telatynski 27a1038e8d Merge branch 'master' of github.com:vector-im/riot-web into set_default_federate_by_settings 2017-08-02 11:48:20 +01:00