Commit Graph

11999 Commits (c300514bc7b306124e186f3a9bc44dfc210f7bf6)

Author SHA1 Message Date
Weblate c300514bc7 Merge remote-tracking branch 'origin/develop' into develop 2018-11-02 00:24:09 +00:00
Suetsugu Kawamura 6c908a3e08 Translated using Weblate (Japanese)
Currently translated at 34.3% (437 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2018-11-02 00:24:09 +00:00
Travis Ralston 151b4cc7fa
Merge pull request #2265 from matrix-org/travis/fix-pinned-rooms
Improve performance of room list and fix timestamp ordering when pinning rooms
2018-11-01 18:24:04 -06:00
Travis Ralston 3960ae2fcd Add more commentary around how the roomCache works 2018-11-01 17:17:01 -06:00
Travis Ralston a713cc5c52 Compare the right types of events 2018-11-01 17:07:05 -06:00
Travis Ralston 122868e32f Removing timing/performance tracking on room list store
This was used to verify the fix was actually making improvements and can be safely taken out.
2018-11-01 16:30:48 -06:00
Travis Ralston 0c7aadb92b Improve room list sort performance by caching common variables
This won't help much if the user is in a ton of highly active rooms, but for the most part this will help those in thousands of rooms, many of which are likely to be quiet. 

Fixes https://github.com/vector-im/riot-web/issues/7646
Fixes https://github.com/vector-im/riot-web/issues/7645 (due to timestamp ordering)
2018-11-01 16:28:13 -06:00
Travis Ralston 272acfa2f5 Appease the linter 2018-11-01 14:46:39 -06:00
Travis Ralston 5558b7a3b2 Avoid hitting the SettingsStore thousands of times when generating room lists
Should fix https://github.com/vector-im/riot-web/issues/7646 to some degree
2018-11-01 14:43:15 -06:00
Weblate c818a360e8 Merge remote-tracking branch 'origin/develop' into develop 2018-11-01 14:04:20 +00:00
Karol Kosek 2589ce6a77 Translated using Weblate (Polish)
Currently translated at 93.8% (1194 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-11-01 14:04:19 +00:00
Moo 4fbfc7cb4d Translated using Weblate (Lithuanian)
Currently translated at 69.3% (882 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2018-11-01 14:04:19 +00:00
Suetsugu Kawamura c6854c0811 Translated using Weblate (Japanese)
Currently translated at 29.9% (381 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2018-11-01 14:04:19 +00:00
Travis Ralston 57b99893e5
Merge pull request #1936 from turt2live/travis/pinned-room-list
Add options to pin unread/mentioned rooms to the top of the room list
2018-11-01 08:04:12 -06:00
Weblate 0cb7d89665 Merge remote-tracking branch 'origin/develop' into develop 2018-10-31 15:13:05 +00:00
Bruno Windels cf31f01c85
Merge pull request #2261 from matrix-org/bwindels/e2eonlyondevelop
only run e2e tests on PRs targeted on develop
2018-10-31 15:12:57 +00:00
Bruno Windels 8a08180187 only run e2e tests on prs targeted on develop 2018-10-31 15:39:45 +01:00
Weblate 3f7e74142b Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 15:55:18 +00:00
David Baker 33e2fc28b7
Merge pull request #2254 from matrix-org/travis/permalink-routing-2
Fix and test matrix.to alias permalinks
2018-10-29 15:55:11 +00:00
Weblate 6205e64c37 Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 14:10:48 +00:00
David Baker 507bfb4b69 Merge branch 'master' into develop 2018-10-29 14:10:28 +00:00
David Baker c5004ffbe3 v0.14.2 2018-10-29 14:07:03 +00:00
David Baker 2077678088 Prepare changelog for v0.14.2 2018-10-29 14:06:41 +00:00
David Baker eb22b9141a released js-sdk 2018-10-29 14:03:19 +00:00
David Baker 69a8b3bd95
Merge pull request #2258 from matrix-org/dbkr/fix_ascii_smiley_emojification_2
Fix autoreplacement of ascii emoji
2018-10-29 13:57:09 +00:00
David Baker 9933a3cc63 Fix autoreplacement of ascii emoji
More slate API updates in code paths I didn't test

Fixes https://github.com/vector-im/riot-web/issues/7509
2018-10-29 13:55:41 +00:00
Weblate 9d155fcbc9 Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 11:38:02 +00:00
David Baker 04ed61ec4e
Merge pull request #2257 from matrix-org/t3chguy/view_community_context_menu
click-through svg on tag tile context menu to make it less weird
2018-10-29 11:37:56 +00:00
Weblate 52ae11deff Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 05:22:47 +00:00
Travis Ralston fcbc16337e
Merge pull request #2256 from matrix-org/t3chguy/hide_timetravel
Hide Matthew's Time Machine
2018-10-28 23:22:43 -06:00
Weblate b57fc50620 Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 05:21:47 +00:00
పవి 8fc8c5e780 Translated using Weblate (Telugu)
Currently translated at 22.7% (290 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/
2018-10-29 05:21:47 +00:00
Karol Kosek ac669e824b Translated using Weblate (Polish)
Currently translated at 93.4% (1189 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-10-29 05:21:46 +00:00
Travis Ralston c2b7df763d
Merge pull request #2255 from aaronraimist/lint
Update babel-eslint to 8.1.1
2018-10-28 23:21:39 -06:00
Michael Telatynski 8a3824b9ca click-through svg on tag tile context menu to make it less weird
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-10-27 11:27:43 +01:00
Michael Telatynski d54bf13fab Hide all the time travel.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-10-27 11:06:52 +01:00
Aaron Raimist e61e7f2626
Fix eslint --fix
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 23:04:00 -05:00
Aaron Raimist 5f3b03c85a
Fix a few no-useless-escape lint errors
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 23:00:54 -05:00
Aaron Raimist 49ce4ef117
eslint --fix src/
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:50:38 -05:00
Aaron Raimist 952bdba979
Update more eslint related packages
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:48:18 -05:00
Aaron Raimist 790ecbcbb0
Update babel-eslint to 8.1.1
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:07:30 -05:00
Travis Ralston 0cdc44a205 Appease the linter 2018-10-26 20:49:01 -06:00
Travis Ralston 5b22d157a7 Fix candidate server encoding 2018-10-26 20:34:06 -06:00
Travis Ralston 3bc5e2beb3 Fix and test matrix.to alias permalinks
Fixes https://github.com/vector-im/riot-web/issues/7614
Regression of https://github.com/matrix-org/matrix-react-sdk/pull/2250
2018-10-26 19:47:53 -06:00
Weblate 18f4edcd7a Merge remote-tracking branch 'origin/develop' into develop 2018-10-26 20:23:35 +00:00
Travis Ralston 0bd1d6b778
Merge pull request #2250 from matrix-org/travis/permalink-routing
Support routing matrix.to links to joinable rooms
2018-10-26 14:23:30 -06:00
Travis Ralston 0857e2c5e9 Clarify why we pick popular servers over the one that created the room 2018-10-26 12:21:27 -06:00
Travis Ralston 3734c8ab91 Don't mention that matrix.org is likely to be popular
This is untrue for quite a few real scenarios, including private federations and a ton of rooms.
2018-10-26 12:21:02 -06:00
Weblate a58e1c04fd Merge remote-tracking branch 'origin/develop' into develop 2018-10-26 16:46:34 +00:00
David Baker 3b6a0f9132
Merge pull request #2253 from matrix-org/dbkr/fix_ascii_smiley_emojification
Fix autoreplacement of ascii emoji
2018-10-26 17:46:29 +01:00