PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
16800 commits 1 branch 0 tags 338 MiB
Commit graph

16800 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
2471f92331
Merge pull request #3218 from matrix-org/travis/check-when-dead 
Check for liveliness on submission when the server was previously dead
 2019-07-15 14:46:55 -06:00
Travis Ralston
2bc0e8e151 Don't rely on React being fast 2019-07-15 10:51:08 -06: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
Bruno Windels
5c1c1f64b6 fix lint 2019-07-15 18:25:22 +02: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
Bruno Windels
57abbc4273 remove unnessary manual focussing of composer 
now that composer is focused automatically when no other shortcuts
apply, remove the manual focusing we have in place where it's not needed
 2019-07-15 18:21:10 +02: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
Bruno Windels
4adea67eb3 focus the composer in the body keydown handler if not other shortcuts apply 
this allows the user to start typing a message even if the composer is not focused.
 2019-07-15 18:12:45 +02:00
Travis Ralston
d08cb70fa6
Merge pull request #3219 from matrix-org/travis/fix-delay 
Fix autocomplete delay text field not accepting text
 2019-07-15 09:30:33 -06:00
Travis Ralston
3fcbd46939
Merge pull request #3220 from matrix-org/travis/kick-reason 
Don't show a reason if there's no reason for a kick/ban
 2019-07-15 09:30:19 -06:00
Bruno Windels
141352b158
Merge pull request #3221 from matrix-org/bwindels/read-receipt-ignore-no-tile-fix 
Take adjacent invisible events into account for read receipt, even if any but first should be ignored.
 2019-07-15 15:07:17 +00:00
Bruno Windels
7e25e1b2fc remove unneeded else 2019-07-15 14:02:41 +02:00
Bruno Windels
034883dc7e improve comments 2019-07-15 14:01:28 +02:00
Bruno Windels
8ac54661be take adjacent no-tile events in combination with ignored events into account when determining the last displayed event 2019-07-15 12:53:39 +02:00
Travis Ralston
31339aa11f Don't show a reason if there's no reason for a kick/ban 
Fixes https://github.com/vector-im/riot-web/issues/9677
 2019-07-14 23:31:38 -06:00
Travis Ralston
345dbce6e4 Fix autocomplete delay text field not accepting text 
SettingsStore.setValue is async (fire&forget) however getValueAt is cached. Theory was supposed to be that getValueAt local echos, however the animation loop of React is probably just too fast to actually make the local echo happen.

Fixes https://github.com/vector-im/riot-web/issues/9907
 2019-07-14 23:28:23 -06:00
Travis Ralston
c6a18b11f0 Check for liveliness on submission when the server was previously dead 
Fixes https://github.com/vector-im/riot-web/issues/10017

Specifically the `return` at the end of the diff fixes the problem, but it seems worthwhile to check for liveliness when we know the server has been dead in previous attempts.
 2019-07-14 23:23:48 -06:00
J. Ryan Stinnett
d57a0dec64 Use URL to parse IM origins 
This allows the configuration for `integrations_ui_url` to be more flexible. In
particular, it no longer matters whether you include a trailing slash after the
port, for example.
 2019-07-12 19:18:34 +01:00
J. Ryan Stinnett
dc9b5fa996 Log when integration manager origin is invalid 2019-07-12 19:04:20 +01:00
Bruno Windels
380639516b
Merge pull request #3216 from matrix-org/bwindels/fix-powerlevels-crash 
Check content and content.users in power levels
 2019-07-12 16:59:16 +00:00
Bruno Windels
5c7e9812a1 also check content and content.users before proceeding 2019-07-12 18:50:13 +02: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
Travis Ralston
78ba22d12e
Merge pull request #3206 from matrix-org/travis/tombstone-autojoin 
Autojoin rooms when clicking the tombstone
 2019-07-12 08:14:42 -06:00
Travis Ralston
187e656bfa
Merge pull request #3209 from matrix-org/travis/ci-i18n 
Verify i18n in CI
 2019-07-12 08:14:31 -06:00
Travis Ralston
ff0c4c0571
Merge pull request #3211 from matrix-org/travis/send-proper-uia 
Send the correct UIA alongside the wrong UIA for backwards comaptibility
 2019-07-12 08:14:01 -06:00
Travis Ralston
5f98e4ea61
Merge pull request #3213 from matrix-org/travis/remove-is-flag 
Remove unused identityEnabled property from ValidatedServerConfig
 2019-07-12 08:11:55 -06:00
David Baker
28c3578b02
Merge pull request #3205 from matrix-org/travis/soft-logout-copy 
Remove misleading text about admins logging people out from soft logout
 2019-07-12 12:32:24 +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