OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
20,561 Commits
211 Branches
549 Tags
664 MiB
Commit Graph

20561 Commits (2d8477aaa69ac35c451c8a47691a0372cb635175)

Author SHA1 Message Date
Michael Telatynski 9c686bf501 Fix right panel buttons highlighting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-13 12:15:54 +00:00
Zoe 878c5b5b52 removed unnecessary lint rule 2020-01-13 12:11:19 +00:00
J. Ryan Stinnett 2168e7ec0c Add feature flag around the presence indicator in room list 
This adds a feature flag (disabled by default for now) around the room list
presence indicator, as it still needs some tweaking before it's ready for
production use.

Part of https://github.com/vector-im/riot-web/issues/11799
 2020-01-13 11:48:55 +00:00
Zoe 422d4cd73a small simplification in code as `.getContent()` will always return an object 2020-01-13 11:18:24 +00:00
David Baker 3105a7c96a
Merge pull request #3830 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-01-13 09:43:34 +00:00
catborise b3d3f3b09f Translated using Weblate (Turkish) 
Currently translated at 64.2% (1285 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-13 09:40:10 +00:00
Alexey Murz Korepov 0065895b9c Translated using Weblate (Russian) 
Currently translated at 90.0% (1799 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-01-13 09:40:03 +00:00
Slavi Pantaleev e1cb7b4f08 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-13 09:40:03 +00:00
Osoitz 6266f21a08 Translated using Weblate (Basque) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-01-13 09:40:02 +00:00
Christopher c370b28694 #11378. Added cut/copy and pasting user pills from editor. 2020-01-12 16:19:24 +00:00
Zoe 54c69b4630 this is what we call fast iteration 2020-01-10 17:47:39 +00:00
Z. E. Cat 1b75909cad
Update src/components/views/rooms/RoomTile.js 
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-10 17:36:33 +00:00
Zoe fbabe79647 use getContent() instead 2020-01-10 17:35:57 +00:00
Z. E. Cat fb587cc62c
Update src/components/views/rooms/RoomTile.js 
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-10 17:33:37 +00:00
Zoe bebfd60daf Very fastidiously check for null/undefined 2020-01-10 17:22:09 +00:00
Travis Ralston e66f2a6c3f Revert ES6ification of end-to-end tests and add instructions for Windows 
Because the tests are run directly by node, we have to use the CommonJS module syntax. We could run the thing through babel, but then we just have another babel.

Windows instructions are from experience and may not be optimized.
 2020-01-10 10:13:41 -07:00
Zoe df1fd4db72 suppress private icon if the room is a DM 2020-01-10 16:49:07 +00:00
Zoe 808785c2f8 lint 2020-01-10 16:43:36 +00:00
Zoe 5551b207c1 Actually, this task was about join rules, not encryption ones. Oops. 2020-01-10 16:33:08 +00:00
Zoe cb250c9b10 Use existing available props data to determine whether a room is encrypted, thereby allowing a state update to properly rerender the tile 2020-01-10 13:09:16 +00:00
Weblate 1222e10c89 Merge branch 'origin/develop' into Weblate. 2020-01-10 11:25:47 +00:00
MamasLT 7f116c1bed Translated using Weblate (Lithuanian) 
Currently translated at 47.2% (944 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-01-10 11:25:47 +00:00
Szimszon abf4a88c66 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-10 11:25:44 +00:00
Kévin C a02ecca775 Translated using Weblate (French) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-10 11:25:43 +00:00
Jeff Huang 8f292eb6a4 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-10 11:25:43 +00:00
David Baker 4a78faae4c
Merge pull request #3826 from matrix-org/dbkr/roomview_listener_leak 
Fix listener leak on RoomView
 2020-01-10 11:25:36 +00:00
David Baker 63942d5200 Fix listener leak on RoomView 
It looks like this was causing entire detached DOM trees to leak
in memory by react's internal fibers holding onto them from the
component.
 2020-01-10 11:12:52 +00:00
Aaron Raimist 6cf5b3f1a2 Emoji verification: Change name of 🔒 to lock 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-01-09 21:56:28 -06:00
Travis Ralston 9f04f94c65 Enable e2e and Riot tests, removing Karma 2020-01-09 17:55:57 -07:00
Travis Ralston 3591f802a8
Merge pull request #3824 from matrix-org/travis/sm-misc 
Regenerate i18n for sourcemaps branch
 2020-01-09 17:47:32 -07:00
Travis Ralston 4b65cdf3f2 Regenerate i18n 
Apparently we need to do this.
 2020-01-09 17:40:57 -07:00
Travis Ralston 4c3703a5ea
Merge pull request #3823 from matrix-org/travis/sm-fix-tests 
Fix tests for sourcemaps branch
 2020-01-09 17:38:21 -07:00
Travis Ralston d7dd67f69e Remove subtly irrelevant package 2020-01-09 17:28:32 -07:00
Travis Ralston aa38946166 Actually define some tests in TextualBody's test 
Jest really wants you to do things the right way.
 2020-01-09 17:24:13 -07:00
Travis Ralston 4bc5ada50e Fix test bootstrap for new skinning approach 2020-01-09 17:23:46 -07:00
Travis Ralston 54f3288dea Fix imports for tests 
This doesn't fix the fact that someone called it "peg".
 2020-01-09 17:23:27 -07:00
Travis Ralston 4dfbce3108 Fix languageHandler's use of $webapp languages.json for Jest 2020-01-09 17:22:50 -07:00
Travis Ralston ffd037dfa8 Fix resolution of files for Jest 2020-01-09 17:22:21 -07:00
Travis Ralston 0e8af15b9c Add webcrypto dep back 
Probably accidentally merge-conflicted out
 2020-01-09 17:15:13 -07:00
Travis Ralston 5f51432987 Convert babel config to a different babel config 
This is needed because of https://github.com/facebook/jest/issues/6229
 2020-01-09 17:14:50 -07:00
Travis Ralston 23eb6cbeb3 Upgrade Jest and babel-jest to match js-sdk 
This also magically gets rid of a ton of errors
 2020-01-09 16:17:27 -07:00
Travis Ralston a8c8406ac4 Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps 2020-01-09 16:06:46 -07:00
Travis Ralston a27f2d8379
Merge pull request #3817 from matrix-org/travis/sourcemaps-develop 
Sourcemaps: develop -> feature branch
 2020-01-09 14:59:22 -07:00
Travis Ralston 135c84251c Fix more imports post-merge 2020-01-09 14:19:19 -07:00
Travis Ralston dc914774fb Delete files that were conflicting in the merge and deleted on develop 2020-01-09 14:19:19 -07:00
Travis Ralston a6376461d0 Use yarn's updated lockfile 
Didn't manually handle this conflict, just let yarn do its thing.
 2020-01-09 14:19:19 -07:00
Travis Ralston 19f78d4d97 Fix class construction in MemberList 2020-01-09 14:17:33 -07:00
Travis Ralston 727ce892de Fix remaining RoomView conflict 
RoomContext was pulled out to its own file.
 2020-01-09 14:17:33 -07:00
Travis Ralston 3e5cc9550b Fix import merge conflicts, removing any that aren't needed anymore 
Many imports were removed as part of refactoring work, so here we are.
 2020-01-09 14:17:33 -07:00
Travis Ralston a0da13200f Fix conflicts in package.json 
We removed the emojistrip script
 2020-01-09 14:15:16 -07:00