OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
20,755 Commits
219 Branches
563 Tags
479 MiB
Commit Graph

20755 Commits (8218962c37308c472989372e5343fb1f63e113f2)

Author SHA1 Message Date
Weblate c06952c032 Merge branch 'origin/develop' into Weblate. 2020-01-06 19:32:33 +00:00
Travis Ralston fb867fc05b
Merge pull request #3801 from matrix-org/travis/ftue/user-lists/2-suggestions 
Add suggestions for which users to invite to chat
 2020-01-06 12:32:27 -07:00
Travis Ralston 6c410e6027 Fix comment style 2020-01-06 12:23:35 -07:00
Travis Ralston bef824e84e Remove harmful html entities encoding and other style nits 
React will take care of this for us. It's harmful because simple characters get converted to something illegible.
 2020-01-06 12:22:17 -07:00
Michael Telatynski bdef54622b delint and add copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 14:52:08 +00:00
Michael Telatynski f1de6d060a Add a regression test for editing events and url previews 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 14:38:21 +00:00
RiotRobot 0df16631c2 v1.7.6-rc.1 2020-01-06 14:01:54 +00:00
RiotRobot 623799ebdc Prepare changelog for v1.7.6-rc.1 2020-01-06 14:01:54 +00:00
RiotRobot 6b8f6239c5 js-sdk 3.0.0-rc.1 2020-01-06 13:58:43 +00:00
RiotRobot 93c4439045 js-sdk rc.1 2020-01-06 13:30:56 +00:00
Michael Telatynski c551f2983a Add TextualBody-test.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 13:28:29 +00:00
Weblate d4645542f9 Merge branch 'origin/develop' into Weblate. 2020-01-06 13:10:34 +00:00
Michael Telatynski ffd09e42bd
Merge pull request #3806 from matrix-org/t3chguy/dedup_recent_emoji 
Deduplicate recent emoji
 2020-01-06 13:10:28 +00:00
Weblate a5d5749420 Merge branch 'origin/develop' into Weblate. 2020-01-06 13:10:18 +00:00
Michael Telatynski 4c40266938
Merge pull request #3803 from matrix-org/t3chguy/fix_avatar_remove 
Fix ability to remove avatars
 2020-01-06 13:10:13 +00:00
Michael Telatynski d5eb4ff310
Update src/components/views/settings/ProfileSettings.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-06 13:02:32 +00:00
Michael Telatynski 9c500e3544 Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody 
 Conflicts:
	src/components/views/messages/TextualBody.js
 2020-01-06 11:51:35 +00:00
Weblate b24268a6fb Merge branch 'origin/develop' into Weblate. 2020-01-06 11:34:54 +00:00
David Baker 6b6d0dd866
Merge pull request #3810 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-01-06 11:34:47 +00:00
Weblate 5e2b48acff Merge branch 'origin/develop' into Weblate. 2020-01-06 11:26:01 +00:00
Michael Telatynski 6a1f4c41ce
Merge pull request #3788 from matrix-org/t3chguy/user_info_non-historical 
User Info fetch latest RoomMember instead of showing historical data
 2020-01-06 11:25:54 +00:00
Weblate e6be00a97a Merge branch 'origin/develop' into Weblate. 2020-01-06 11:15:30 +00:00
Michael Telatynski f371034ef8
Merge pull request #3808 from matrix-org/t3chguy/remove_slate 
Remove all usages of slate in favour of CIDER
 2020-01-06 11:15:24 +00:00
Szimszon 393c610b5a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2014 of 2014 strings)

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

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-06 10:26:54 +00:00
Jeff Huang 51a1507f47 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-06 10:26:54 +00:00
Osoitz 3b91b31534 Translated using Weblate (Basque) 
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-01-06 10:26:53 +00:00
Besnik Bleta 2af4cdf532 Translated using Weblate (Albanian) 
Currently translated at 99.1% (1995 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-01-06 10:26:51 +00:00
Michael Telatynski bd0a96f2b2 Merge branches 'develop' and 't3chguy/fix_react_complaining' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_react_complaining 
 Conflicts:
	src/components/views/elements/Pill.js
 2020-01-06 09:35:59 +00:00
Michael Telatynski ac1d9b03bf undo one of the "fixes" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 09:35:14 +00:00
Weblate 2f257c2dc7 Merge branch 'origin/develop' into Weblate. 2020-01-06 05:18:26 +00:00
Travis Ralston 4ab7b9ba92
Merge pull request #3809 from aaronraimist/pinned-msg-display-name 
Use display name when pinned messages are changed
 2020-01-05 22:18:21 -07:00
Aaron Raimist 98ede6437e Use display name when pinned messages are changed 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-01-05 23:04:46 -06:00
Michael Telatynski c802f9a302 remove unused stale Test Suite 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:23:19 +00:00
Michael Telatynski 64754a3f88 Add comment and delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:18:24 +00:00
Michael Telatynski d31c863563 Remove all usages of slate in favour of CIDER 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:15:48 +00:00
Weblate 58271e840c Merge branch 'origin/develop' into Weblate. 2020-01-06 00:08:43 +00:00
Travis Ralston 92fb6fcdc2
Merge pull request #3790 from justin-sleep/fix-dark-diff-highlighting 
Fix inverted diff line highlighting in dark theme
 2020-01-05 17:08:38 -07:00
Weblate 0cad813071 Merge branch 'origin/develop' into Weblate. 2020-01-06 00:03:22 +00:00
Travis Ralston 781b69f4e3
Merge pull request #3693 from matrix-org/hs/bridge-info 
Bridge info settings tab
 2020-01-05 17:03:15 -07:00
Justin Sleep 8ec8a7c015 Comment rationale for swapping dark theme colors 
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
 2020-01-05 17:58:07 -06:00
Justin Sleep dcdf68d7e1 Explicitly define diff colors in light theme 
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
 2020-01-05 17:35:39 -06:00
Will Hunt 7f0ed05ee1
Update BridgeSettingsTab.js 2020-01-05 23:32:49 +00:00
Michael Telatynski 4bea87f00d Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description 
 Conflicts:
	package.json
 2020-01-05 22:23:03 +00:00
Michael Telatynski 378a82e6fb Use html-entities instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 22:22:09 +00:00
Michael Telatynski 4a836349ab regenerate i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 22:01:59 +00:00
Michael Telatynski b6098ddb47 Delegate all room alias validation to the RoomAliasField validator 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 21:58:36 +00:00
Weblate 95cc08e5d7 Merge branch 'origin/develop' into Weblate. 2020-01-05 21:46:48 +00:00
catborise a231419a77 Translated using Weblate (Turkish) 
Currently translated at 53.2% (1067 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-05 21:46:48 +00:00
Szimszon 8128b97f35 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-05 21:46:45 +00:00