OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
25,948 Commits
198 Branches
547 Tags
420 MiB
Commit Graph

25948 Commits (08fa7912b3158ee77ac3364ed147876379d6fb37)

Author SHA1 Message Date
Weblate 9a92a5e21e Merge branch 'origin/develop' into Weblate. 2020-06-25 14:43:56 +00:00
Michael Telatynski 7683f2fe1a
Merge pull request #4834 from matrix-org/t3chguy/notifications0 
Hide app badge count for hidden upgraded rooms (non-highlight)
 2020-06-25 15:43:50 +01:00
Michael Telatynski 61618d5162 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 15:02:52 +01:00
Weblate c1c22c4818 Merge branch 'origin/develop' into Weblate. 2020-06-25 13:38:24 +00:00
XoseM 4b952737dc Translated using Weblate (Galician) 
Currently translated at 93.7% (2147 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:38:24 +00:00
Jorik Schellekens a2d53229ea
Merge pull request #4822 from matrix-org/joriks/appearance-tab-compact-to-advanced 
Move compact modern layout checkbox to 'advanced'
 2020-06-25 14:38:18 +01:00
Jorik Schellekens 41c59cc75e Fix deactivated checked checkbox styling 2020-06-25 14:21:08 +01:00
Weblate 81b889783a Merge branch 'origin/develop' into Weblate. 2020-06-25 13:18:32 +00:00
XoseM d5cf4bcfa2 Translated using Weblate (Galician) 
Currently translated at 93.7% (2146 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:18:32 +00:00
Travis Ralston 4d47dcaabd
Merge pull request #4825 from matrix-org/travis/room-list/default-lists 
Allow the user to resize the new sublists to 1 tile
 2020-06-25 07:18:26 -06:00
Weblate c7fc4cacda Merge branch 'origin/develop' into Weblate. 2020-06-25 13:18:03 +00:00
XoseM 5045c0b135 Translated using Weblate (Galician) 
Currently translated at 93.6% (2145 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:18:03 +00:00
Travis Ralston 92f0f1a5d8
Merge pull request #4832 from matrix-org/travis/react-can-shush 
Make LoggedInView a real component because it uses shouldComponentUpdate
 2020-06-25 07:17:56 -06:00
Travis Ralston a3b38a2b5f Make LoggedInView a real component because it uses shouldComponentUpdate 
React demands this.
 2020-06-25 07:14:02 -06:00
Weblate 149d518394 Merge branch 'origin/develop' into Weblate. 2020-06-25 13:11:39 +00:00
ziriSut 2ef2f76de9 Translated using Weblate (Kabyle) 
Currently translated at 20.1% (460 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-25 13:11:38 +00:00
Michael Albert fa3cc28dcc Translated using Weblate (German) 
Currently translated at 99.9% (2289 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-25 13:11:37 +00:00
XoseM aaff3e0bec Translated using Weblate (Galician) 
Currently translated at 92.9% (2128 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:11:36 +00:00
Michael Telatynski 98fc23acb3
Merge pull request #4829 from matrix-org/t3chguy/notifications0 
Small tweaks in preparation for Notifications rework
 2020-06-25 14:11:24 +01:00
Michael Telatynski 8743af56ad Bring notification utils into this century to simplify ongoing Notifications work 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 09:00:13 +01:00
Michael Telatynski d4eebd5202 Fix alwaysShowBadgeCounts settings defn 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 08:58:54 +01:00
Michael Telatynski edd09f66d1 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-25 08:45:32 +01:00
Michael Telatynski dbe575d523 Remove DEBUG 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 08:44:24 +01:00
Michael Telatynski dc099efb19 make Notifier getSoundForRoom synchronous 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 08:43:35 +01:00
Weblate 2fe3780b2a Merge branch 'origin/develop' into Weblate. 2020-06-25 02:26:37 +00:00
Travis Ralston 223c26b033
Merge pull request #4826 from matrix-org/travis/room-list/cleanup 
Remove extraneous debug from the new left panel
 2020-06-24 20:26:32 -06:00
Travis Ralston 90ff4585d5 Remove extraneous debug from the new left panel 2020-06-24 20:14:01 -06:00
Travis Ralston 37a415693f Allow the user to resize the new sublists to 1 tile 
For dogfooding https://github.com/vector-im/riot-web/issues/14137

To change the default: `localStorage.setItem("mx_dogfood_rl_defTiles", 4);`
 2020-06-24 20:08:26 -06:00
Travis Ralston 752b2acc56 Move MessagePreviewStore into the room list namespace 2020-06-24 19:51:55 -06:00
Weblate fc9e4484d9 Merge branch 'origin/develop' into Weblate. 2020-06-25 01:48:59 +00:00
Travis Ralston 7dc2fc0751
Merge pull request #4824 from matrix-org/travis/room-list/fix-icons 
Fix icons in the new user menu not showing up
 2020-06-24 19:48:53 -06:00
Travis Ralston 291914492f Fix icons in the new user menu not showing up 2020-06-24 19:20:43 -06:00
Weblate f20b87a038 Merge branch 'origin/develop' into Weblate. 2020-06-24 16:55:20 +00:00
Travis Ralston bb9999a414
Merge pull request #4817 from matrix-org/travis/room-list/sticky-room-fixes 
Fix sticky room disappearing/jumping in search results
 2020-06-24 10:55:14 -06:00
Travis Ralston c047a76f1d Update the filtering for the right tag 2020-06-24 10:36:43 -06:00
Weblate 9b4b6ba785 Merge branch 'origin/develop' into Weblate. 2020-06-24 16:35:30 +00:00
J. Ryan Stinnett 767090dd78
Merge pull request #4821 from matrix-org/jryans/more-reset-paths 
Show cross-signing / secret storage reset button in more cases
 2020-06-24 17:35:24 +01:00
Weblate ce1bcda4ac Merge branch 'origin/develop' into Weblate. 2020-06-24 16:34:52 +00:00
random b4ab15f91f Translated using Weblate (Italian) 
Currently translated at 99.9% (2290 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-24 16:34:52 +00:00
XoseM 1aef7cdfea Translated using Weblate (Galician) 
Currently translated at 91.4% (2095 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-24 16:34:51 +00:00
Travis Ralston 906b72082e
Merge pull request #4819 from matrix-org/travis/room-list/icon-masks 
Use theme-capable icons in the user menu
 2020-06-24 10:34:29 -06:00
Jorik Schellekens 0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
J. Ryan Stinnett b01015f5c5 Show cross-signing / secret storage reset button in more cases 
This exposes the cross-signing / secret storage reset button in more cases to
hopefully give people a better chance of trying again in case something failed
halfway through set up. In particular, any combination of keys existing now
reveals the reset button.

Fixes https://github.com/vector-im/riot-web/issues/13993
 2020-06-24 14:30:12 +01:00
Weblate 7ee06ce975 Merge branch 'origin/develop' into Weblate. 2020-06-24 13:15:47 +00:00
Bruno Windels fc61145c11
Merge pull request #4814 from matrix-org/bwindels/custom-theme-font 
Font support in custom themes
 2020-06-24 13:15:42 +00:00
Weblate 08b86952a0 Merge branch 'origin/develop' into Weblate. 2020-06-24 13:05:52 +00:00
Travis Ralston 5e07052f9e
Merge pull request #4816 from matrix-org/travis/room-list/tweak/sublisting 
Decrease margin between new sublists
 2020-06-24 07:05:46 -06:00
Weblate 7518fca98b Merge branch 'origin/develop' into Weblate. 2020-06-24 13:04:57 +00:00
Travis Ralston 3b24f42def
Merge pull request #4818 from matrix-org/travis/room-list/user-menu-polish 
Update profile information in User Menu and truncate where needed
 2020-06-24 07:04:49 -06:00
Travis Ralston 256636ccf8 Use display:block over absolute positioning 2020-06-24 07:04:19 -06:00