OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
16,716 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

16716 Commits (2be9696a27ffdc62e7e5a54b61b53b42684f0c72)

Author SHA1 Message Date
J. Ryan Stinnett 2be9696a27 Add a previous event safe area around action bar 
This adds a previous event safe area so that you can't accidentally hover the
previous event while trying to mouse into the action bar or from the react
button to its tooltip.

Part of https://github.com/vector-im/riot-web/issues/10185
Fixes https://github.com/vector-im/riot-web/issues/9650
 2019-07-17 14:57:42 +01:00
RiotRobot 008903470a v1.4.0-rc.3 2019-07-15 17:28:48 +01:00
RiotRobot 415f88dd9a Prepare changelog for v1.4.0-rc.3 2019-07-15 17:28:47 +01:00
David Baker 3809134d73
Merge pull request #3223 from matrix-org/dbkr/fix-powerlevels-crash-2 
Check content and content.users in power levels
 2019-07-15 17:23:43 +01:00
David Baker a8ccd6dfd7
Merge pull request #3222 from matrix-org/dbkr/read-receipt-ignore-no-tile-fix-2 
Take adjacent invisible events into account for read receipt, even if any but first should be ignored.
 2019-07-15 17:20:32 +01:00
Bruno Windels 02ec96cff1 also check content and content.users before proceeding 2019-07-15 17:17:20 +01:00
Bruno Windels f901c8c4fe remove unneeded else 2019-07-15 17:14:03 +01:00
Bruno Windels d39a86b126 improve comments 2019-07-15 17:13:58 +01:00
Bruno Windels e66ebec083 take adjacent no-tile events in combination with ignored events into account when determining the last displayed event 2019-07-15 17:13:52 +01:00
RiotRobot f05a7b2195 v1.4.0-rc.2 2019-07-12 17:33:21 +01:00
RiotRobot c600947cfd Prepare changelog for v1.4.0-rc.2 2019-07-12 17:33:21 +01:00
RiotRobot 6a6108f496 Upgrade to JS SDK 2.2.0-rc.2 2019-07-12 17:29:36 +01:00
J. Ryan Stinnett 64f52cac73
Merge pull request #3215 from matrix-org/jryans/v1.4.0/logout-text 
Remove misleading text about admins logging people out from soft logout
 2019-07-12 16:50:02 +01:00
Travis Ralston 178427c2e4 Remove misleading text about admins logging people out from soft logout 2019-07-12 16:42:09 +01:00
RiotRobot a0dc4db234 v1.4.0-rc.1 2019-07-12 11:28:50 +01:00
RiotRobot c071f5af8e Prepare changelog for v1.4.0-rc.1 2019-07-12 11:28:49 +01:00
RiotRobot 34c642ce9a Upgrade JS SDK to 2.2.0-rc.1 2019-07-12 11:23:01 +01:00
J. Ryan Stinnett 0ac167ede6
Merge pull request #3214 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-07-12 10:53:16 +01:00
Kévin C 7773722202 Translated using Weblate (French) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-12 09:51:25 +00:00
Weblate 7afb0e9019 Merge branch 'origin/develop' into Weblate. 2019-07-12 08:42:39 +00:00
J. Ryan Stinnett b27c1a45e4 Adjust spelling on debug log screen 2019-07-12 09:42:02 +01:00
Weblate 36946dbb4d Merge branch 'origin/develop' into Weblate. 2019-07-12 08:25:11 +00:00
Kévin C 1ab99c89fe Translated using Weblate (French) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-12 08:25:11 +00:00
Bruno Windels 7fc19e61a9
Merge pull request #3210 from matrix-org/bwindels/prevent-autocomplete-on-paste 
Prevent autocomplete on paste, and verserev-ing text before and after :
 2019-07-12 08:25:06 +00:00
Bruno Windels ee9dd8ce81 adjust jsdoc 2019-07-12 10:06:38 +02:00
Weblate 0a108b3de4 Merge branch 'origin/develop' into Weblate. 2019-07-11 22:03:33 +00:00
Szimszon 30002b48f9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-07-11 22:03:33 +00:00
Travis Ralston 5daf2741a0
Merge pull request #3212 from matrix-org/travis/close-settings 
Close settings after deactivating
 2019-07-11 16:03:27 -06:00
Travis Ralston 733401652b Close settings after deactivating 
Fixes https://github.com/vector-im/riot-web/issues/9566
 2019-07-11 14:54:49 -06:00
Weblate 3c1935e9a7 Merge branch 'origin/develop' into Weblate. 2019-07-11 19:01:42 +00:00
Travis Ralston 0950037ca3
Merge pull request #3207 from matrix-org/travis/rageshake-required 
Require an issue URL (or notes) on rageshakes
 2019-07-11 13:01:38 -06:00
Travis Ralston c89a864a82 update copy 2019-07-11 12:54:26 -06:00
Bruno Windels dedf978948 prevent inserting parts at index -1 for empty documents 2019-07-11 18:46:56 +02:00
Bruno Windels 06fb892df9 prevent autocomplete when doing bulk insertion (paste, drop text) 2019-07-11 18:46:56 +02:00
Bruno Windels 507b89fc61 manually attach input event handler, as React doesn't pass inputType 2019-07-11 18:46:56 +02:00
Travis Ralston 5f9a123a80 Require an issue URL (or notes) on rageshakes 
Fixes https://github.com/vector-im/riot-web/issues/8155
 2019-07-11 09:14:31 -06:00
Weblate d0c98f67fd Merge branch 'origin/develop' into Weblate. 2019-07-11 14:20:13 +00:00
Osoitz 7c9c94eb27 Translated using Weblate (Basque) 
Currently translated at 99.5% (1679 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-07-11 14:20:13 +00:00
Travis Ralston 111b28971a
Merge pull request #3202 from matrix-org/travis/stably-use-stable-apis 
Use r0 media endpoints for group tests
 2019-07-11 08:20:08 -06:00
Weblate 16201b820a Merge branch 'origin/develop' into Weblate. 2019-07-11 13:48:01 +00:00
J. Ryan Stinnett 9cb2ebaf07
Merge pull request #3204 from matrix-org/jryans/field-styling-regression 
Fix field styling regression
 2019-07-11 14:47:56 +01:00
Weblate a8056a34aa Merge branch 'origin/develop' into Weblate. 2019-07-11 12:16:55 +00:00
J. Ryan Stinnett 97f9054f9d
Merge pull request #3203 from matrix-org/jryans/upgrade-deps-2 
Upgrade dependencies
 2019-07-11 13:16:52 +01:00
J. Ryan Stinnett 5ab958cc9f Fix field styling regression 
The extra comma in the selectors caused this rule set to be ignored.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3200
Fixes https://github.com/vector-im/riot-web/issues/10311
 2019-07-11 13:14:20 +01:00
J. Ryan Stinnett c9eac27079 Upgrade dependencies 2019-07-11 11:47:31 +01:00
Weblate 49853a18f9 Merge branch 'origin/develop' into Weblate. 2019-07-11 10:33:57 +00:00
Michael Telatynski 56b1775209
Merge pull request #3198 from matrix-org/t3chguy/kick 
Show anything other than ban/invite -> leave as a kick
 2019-07-11 11:33:53 +01:00
Weblate 8753c860a8 Merge branch 'origin/develop' into Weblate. 2019-07-11 10:04:51 +00:00
Szimszon b3b776e028 Translated using Weblate (Hungarian) 
Currently translated at 99.0% (1670 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-07-11 10:04:51 +00:00
RiotRobot bb1762d265 Merge branch 'master' into develop 2019-07-11 11:04:36 +01:00