OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
25,910 Commits
226 Branches
563 Tags
473 MiB
Commit Graph

25910 Commits (198958dcdd360baa20fe7459f5b0535edf7a3286)

Author SHA1 Message Date
Weblate 806f10a89f Merge branch 'origin/develop' into Weblate. 2020-06-17 01:21:52 +00:00
Michael Telatynski f08efc632f
Merge pull request #4777 from matrix-org/t3chguy/notifications0 
Improve Field ts definitions some more
 2020-06-17 02:21:47 +01:00
Michael Telatynski 3dcf525382 Improve Field ts definitions some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-17 02:14:20 +01:00
Weblate caa7dd7dd8 Merge branch 'origin/develop' into Weblate. 2020-06-17 00:58:22 +00:00
Travis Ralston e410a70b2c
Merge pull request #4776 from matrix-org/travis/room-list/menu-align 
Fix alignment of checkboxes in new room list's context menu
 2020-06-16 18:58:17 -06:00
Travis Ralston aab7e0cc14 Fix alignment of checkboxes in new room list's context menu 
At somepoint the checkbox lost its padding, so we don't need to counteract it.
 2020-06-16 18:56:56 -06:00
Weblate cf199b2aac Merge branch 'origin/develop' into Weblate. 2020-06-17 00:14:59 +00:00
Michael Telatynski 9a85b82007
Merge pull request #4775 from matrix-org/t3chguy/notifications0 
Fix Field ts def, fix LocalEchoWrapper and NotificationsEnabledController
 2020-06-17 01:14:54 +01:00
Michael Telatynski 3472fcdec5 Fix NotificationsEnabledController inverse understanding of master push rule 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-17 01:05:24 +01:00
Weblate 4591928af7 Merge branch 'origin/develop' into Weblate. 2020-06-17 00:05:21 +00:00
J. A. Durieux a07918fef9 Translated using Weblate (Dutch) 
Currently translated at 88.9% (2034 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-06-17 00:05:21 +00:00
Michael Telatynski 1628fc668c Fix LocalEchoWrapper cache on falsey room ids 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-17 01:05:19 +01:00
Travis Ralston 25e353f7e5
Merge pull request #4774 from matrix-org/travis/room-list/presence-globes 
Add presence indicators and globes to new room list
 2020-06-16 18:05:14 -06:00
Michael Telatynski b225324c49 improve Field typescript definition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-17 01:05:10 +01:00
Travis Ralston 9878c1dc34 and another 2020-06-16 17:42:26 -06:00
Travis Ralston 7a71ef9b6b Fix another space 2020-06-16 17:40:25 -06:00
Travis Ralston daa552e250 Refactor listener usage 2020-06-16 17:35:56 -06:00
Travis Ralston b69a5a525d Fix spaces 2020-06-16 17:29:36 -06:00
Jovan Gerodetti af1c2f9b29 fix requested changes from #3991 
Signed-off-by: Jovan Gerodetti <jovan.gerodetti@titannano.de>
 2020-06-16 23:11:32 +02:00
Dale Harvey 049e3fc08c Add some media queries to improve UI on mobile 2020-06-16 23:11:32 +02:00
Travis Ralston e4a51a7c01 Add presence icons; Convert to generic icon component 
For https://github.com/vector-im/riot-web/issues/14039
 2020-06-16 14:44:37 -06:00
Weblate 1d8fd4bc68 Merge branch 'origin/develop' into Weblate. 2020-06-16 19:56:17 +00:00
Travis Ralston bd5a81e599
Merge pull request #4772 from matrix-org/travis/room-list/search-own 
Include the sticky room when filtering in the new room list
 2020-06-16 13:56:11 -06:00
Travis Ralston bcebef7e56 Add a globe icon to public rooms 
For https://github.com/vector-im/riot-web/issues/14039
 2020-06-16 12:13:12 -06:00
Jorik Schellekens a250bf6a97 Fix whitespace 2020-06-16 18:08:49 +01:00
Jorik Schellekens 2d6077f2c8 Fix radio circle color 2020-06-16 18:02:34 +01:00
Travis Ralston 17f1fdaf6d Include the sticky room when filtering in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14050
 2020-06-16 10:59:42 -06:00
Jorik Schellekens 2192332968 Add layout options to the appearance tab 2020-06-16 17:55:19 +01:00
Weblate 2af110d495 Merge branch 'origin/develop' into Weblate. 2020-06-16 16:14:28 +00:00
Tuomas Hietala 37672d4386 Translated using Weblate (Finnish) 
Currently translated at 95.4% (2182 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-06-16 16:14:28 +00:00
Travis Ralston 36d911529d
Merge pull request #4771 from matrix-org/travis/room-list/home 
Add a home button to the new room list menu when available
 2020-06-16 10:14:20 -06:00
Jorik Schellekens b27334f448 Use lower case import 2020-06-16 15:52:35 +01:00
Travis Ralston 8f45e06844 Add a home button to the new room list menu when available 2020-06-16 08:46:48 -06:00
Jorik Schellekens 17dbb1ac8b Message preview for font slider 2020-06-16 15:41:10 +01:00
Travis Ralston bc0281ebdd Match fuzzy filtering a bit more reliably in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14054
 2020-06-16 08:36:10 -06:00
David Baker 89a72b7685 Take the last request (ie. the most recent) 2020-06-16 14:53:13 +01:00
Weblate 39d9e8933a Merge branch 'origin/develop' into Weblate. 2020-06-16 13:31:14 +00:00
Michael Telatynski c11bc766a5
Merge pull request #4764 from matrix-org/t3chguy/regression/search_timestamp 
use group layout for search results
 2020-06-16 14:31:08 +01:00
Michael Telatynski ef80a0b0b4
avoid negatives 2020-06-16 14:06:42 +01:00
Weblate 0fa345aa3e Merge branch 'origin/develop' into Weblate. 2020-06-16 12:47:09 +00:00
Michael Telatynski 36c1b823ab
Merge pull request #4757 from matrix-org/t3chguy/m.id.phone 
Fix m.id.phone spec compliance
 2020-06-16 13:47:03 +01:00
Weblate d945285984 Merge branch 'origin/develop' into Weblate. 2020-06-16 12:46:04 +00:00
Michael Telatynski 2d7726c623
Merge pull request #4759 from matrix-org/t3chguy/admin-tools-pl-defaults 
User Info default power levels for ban/kick/redact to 50 as per spec
 2020-06-16 13:45:58 +01:00
Weblate b3d306b354 Merge branch 'origin/develop' into Weblate. 2020-06-16 10:50:55 +00:00
Kévin C f7baf3a331 Translated using Weblate (French) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-16 10:50:55 +00:00
Priit Jõerüüt de7d7802de Translated using Weblate (Estonian) 
Currently translated at 61.4% (1405 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-16 10:50:51 +00:00
RiotRobot 6f6793bc85 Reset matrix-js-sdk back to develop branch 2020-06-16 11:45:28 +01:00
RiotRobot 8047bace91 Merge branch 'master' into develop 2020-06-16 11:44:27 +01:00
RiotRobot 0f6a0bb3ae v2.7.2 2020-06-16 11:35:29 +01:00
RiotRobot d658c0403d Prepare changelog for v2.7.2 2020-06-16 11:35:28 +01:00