OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
12,406 Commits
212 Branches
549 Tags
667 MiB
Commit Graph

12406 Commits (510cec1ebfaadefa25e11399de78474a3e50efa0)

Author SHA1 Message Date
Bruno Windels 7f72d5145a fix lint 2018-10-31 15:26:18 +01:00
Bruno Windels b4dd739771 Merge branch 'experimental' into bwindels/rightpanelbelowheader 2018-10-31 14:57:16 +01:00
Bruno Windels ba83166661 Merge branch 'develop' into experimental 2018-10-31 14:54:22 +01:00
Bruno Windels bd9c0dc6cf fix lint 2018-10-31 12:20:10 +01:00
Bruno Windels 1948e9bc17 only detach if created before 2018-10-31 12:17:13 +01:00
Bruno Windels ff383b4aa0 remove right panel from loggedinview 
this breaks user view for now but this is not available
through any UI as it is, and we don't know yet what this will
look like in the new design, even if it will be a feature at all.
 2018-10-31 12:09:53 +01:00
Bruno Windels 870280c6c7 move rightpanel into group view 2018-10-31 12:09:24 +01:00
Bruno Windels d535f60bf6 only create resizer in MainSplit when ref becomes available 2018-10-31 12:08:41 +01:00
Bruno Windels a40f1933f2 put RightPanel as sibling of .mx_RoomView_body instead of RoomView 2018-10-30 18:13:17 +01:00
Bruno Windels 790299f2d2 introduce MainSplit, to split between room/group body and right panel 2018-10-30 18:12:21 +01:00
Bruno Windels e80a1c5051 move room/group panel header buttons into room/group header 2018-10-30 17:15:19 +01:00
David Baker 76587d4ef8 retest 2018-10-30 12:37:44 +00:00
Bruno Windels 4972b1ba7c move aux panel into room body 
to put a resize handle between the body and the right panel later on
 2018-10-30 13:25:06 +01:00
David Baker 8ac62f8c12 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-29 16:20:45 +00: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
David Baker de366fa0e8 Add cancel button to error stage 2018-10-26 17:55:59 +01: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
Travis Ralston d802ee0fa2 Move the max candidates constant out of the function 2018-10-26 10:25:23 -06:00
Travis Ralston c389540522 Appease the linter 2018-10-26 10:22:18 -06:00