mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
26650 commits 214 branches 561 tags 414 MiB
Commit graph

26650 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jorik Schellekens
d794e17d4d Fix handlebar interaction 2020-07-16 16:16:41 +01:00
Jorik Schellekens
1f94986c88 add horizontal handlebars 2020-07-15 00:20:39 +01:00
Travis Ralston
cc22be4f1d Update attribution 2020-07-14 15:51:34 -06:00
Travis Ralston
556da7fe5c Swap out Modular for EMS 2020-07-14 15:47:03 -06:00
David Baker
b2e5bc3fa1 Merge branch 'dbkr/fix_show_less_broken' into 'element' 
Fix bug where 'show more' sometimes did nothing

See merge request new-vector/element/element-web/matrix-react-sdk!23
 2020-07-14 21:04:58 +00:00
Travis Ralston
322d58ba0c Merge branch 'develop' into element 2020-07-14 15:04:17 -06:00
Jorik Schellekens
87069a9856
Merge pull request #4899 from matrix-org/joriks/delabs-font-scaling 
De labs font-scaling
 2020-07-14 22:01:34 +01:00
David Baker
839851c90f Fix bug where 'show more' sometimes did nothing 
a3a1e2e01f added the padding
to maxTilesPx which was confusing the calculation of whether we
should be showing the 'show more' button or the 'show less' button.

Hopefully this fixes the issue without undoing fixes from
https://github.com/matrix-org/matrix-react-sdk/pull/4964 or the
above commit by adding the padding in all cased in `get padding()`.
 2020-07-14 21:49:51 +01:00
Travis Ralston
76fbb7c1b0 Merge branch 'develop' into joriks/delabs-font-scaling 2020-07-14 14:48:21 -06:00
Jorik Schellekens
3eac852ad0 Change font slider values 2020-07-14 21:27:01 +01:00
Travis Ralston
c77c9495d1 Merge branch 'travis/EL/userinfo-color' into 'element' 
Fix user info section headers on the dark theme

See merge request new-vector/element/element-web/matrix-react-sdk!22
 2020-07-14 20:20:17 +00:00
Travis Ralston
54a060cbb1 Fix user info section headers on the dark theme 2020-07-14 14:15:24 -06:00
Travis Ralston
945dab6b1f Revert "Turn previews on for DMs and ensure they get rendered" 
This reverts commit b19ae3ac93.
 2020-07-14 13:36:28 -06:00
J. Ryan Stinnett
9d094a793c Merge branch 'bwindel/polish' into 'element' 
More polish

See merge request new-vector/element/element-web/matrix-react-sdk!21
 2020-07-14 19:35:41 +00:00
Travis Ralston
f6b9d44e4b Invert logging 2020-07-14 13:18:06 -06:00
Bruno Windels
936f24eb15 change look of right panel header buttons 2020-07-14 21:09:18 +02:00
Travis Ralston
7a1635e7bc Merge branch 'travis/EL-room-list/fixes1' into 'element' 
Misc fixes to room list

See merge request new-vector/element/element-web/matrix-react-sdk!20
 2020-07-14 18:53:09 +00:00
Travis Ralston
b19ae3ac93 Turn previews on for DMs and ensure they get rendered 2020-07-14 12:49:29 -06:00
Bruno Windels
2da7d17a5d change color of who is typing text to composer icons color 
as requested by Nad
 2020-07-14 20:45:14 +02:00
Travis Ralston
d74e803fa9 Remove potential source of room duplication issues 
This is an estimated fix as the problem cannot be easily identified. We don't appear to need these lines, unlike what the comment implies.
 2020-07-14 12:40:48 -06:00
Bruno Windels
38549ecf4c change accent color 2020-07-14 20:36:27 +02:00
Bruno Windels
01e7d9c4e4 Merge branch 'bwindels/restyle-blurry-login-box' into 'element' 
change bg color to that of the room list

See merge request new-vector/element/element-web/matrix-react-sdk!19
 2020-07-14 18:22:52 +00:00
Bruno Windels
d39974b590 change bg color to that of the room list 2020-07-14 20:17:31 +02:00
J. Ryan Stinnett
225c31e043 Merge branch 'nadonomy/quick-wins' into 'element' 
Make message previews more legible

See merge request new-vector/element/element-web/matrix-react-sdk!18
 2020-07-14 18:10:30 +00:00
Nad Chishtie
1f9657c7fb Make message previews more legible 2020-07-14 19:05:49 +01:00
Travis Ralston
e955feb12d Revert "Merge pull request #4972 from matrix-org/travis/room-list/prelaunch/3-remove-debug" 
This reverts commit e1b34acdc8.
 2020-07-14 12:02:40 -06:00
Travis Ralston
4903ce55bb Merge branch 'travis/EL/appearance-tab' into 'element' 
Fix appearance tab saying the wrong theme is selected

See merge request new-vector/element/element-web/matrix-react-sdk!17
 2020-07-14 18:00:59 +00:00
Bruno Windels
37776447d4 Merge branch 'element-update-icons' into 'element' 
change icon on invite button

See merge request new-vector/element/element-web/matrix-react-sdk!16
 2020-07-14 17:54:07 +00:00
Travis Ralston
3a8b3e26ac Fix appearance tab saying the wrong theme is selected 
Fixes https://github.com/vector-im/riot-web/issues/14275
 2020-07-14 11:53:10 -06:00
Travis Ralston
941186dbc1 Merge branch 'travis/EL/communities-touchups' into 'element' 
Minor padding fixes to communities

See merge request new-vector/element/element-web/matrix-react-sdk!11
 2020-07-14 17:50:40 +00:00
Bruno Windels
aeadf64ccf change icon on invite button 2020-07-14 19:40:17 +02:00
Bruno Windels
9b94bf13c8 Merge branch 'element-darktheme-improvements' into 'element' 
Element dark theme improvements

See merge request new-vector/element/element-web/matrix-react-sdk!15
 2020-07-14 17:25:17 +00:00
Bruno Windels
0c3501e317 make field border less bright 2020-07-14 19:19:27 +02:00
Bruno Windels
4d14a1d6b3 change right panel/event tile hover bg color 2020-07-14 19:19:07 +02:00
Bruno Windels
c2456d9b81 change room header/timeline/composer bg 2020-07-14 19:18:42 +02:00
J. Ryan Stinnett
f452abf822 Merge branch 'jryans/font-text' into 'element' 
Fix font input branding

See merge request new-vector/element/element-web/matrix-react-sdk!14
 2020-07-14 17:08:20 +00:00
J. Ryan Stinnett
c0a552bfb0 Fix font input branding 2020-07-14 18:04:29 +01:00
Bruno Windels
41b7c8639c Merge branch 'element-rename-theme' into 'element' 
Rename element theme

See merge request new-vector/element/element-web/matrix-react-sdk!13
 2020-07-14 16:46:40 +00:00
Bruno Windels
b1444146e6 rename traces of element(-dark) theme in code 2020-07-14 18:40:32 +02:00
Bruno Windels
25d3257d80 rename element(-dark) to light/dark so old prefs apply 2020-07-14 18:39:14 +02:00
Bruno Windels
cad4029b1c Merge branch 'revert-d13ade6f' into 'element' 
Revert "Merge branch 'nadonomy/use-element-theme' into 'element'"

See merge request new-vector/element/element-web/matrix-react-sdk!12
 2020-07-14 16:23:37 +00:00
Bruno Windels
f47268ce74 Revert "Merge branch 'nadonomy/use-element-theme' into 'element'" 
This reverts merge request !9
 2020-07-14 16:23:06 +00:00
Travis Ralston
a5c8485e23 Minor padding fixes to communities 2020-07-14 10:16:00 -06:00
J. Ryan Stinnett
ea511faafe Merge remote-tracking branch 'origin/develop' into element 2020-07-14 16:57:00 +01:00
Travis Ralston
e1b34acdc8
Merge pull request #4972 from matrix-org/travis/room-list/prelaunch/3-remove-debug 
Remove debug logging from new room list
 2020-07-14 09:56:17 -06:00
Travis Ralston
00ee670077 Merge branch 'travis/room-list/EL-tagpanel-scroll' into 'element' 
Remove extraneous scrollbar on TagPanel when few communities are shown

See merge request new-vector/element/element-web/matrix-react-sdk!10
 2020-07-14 15:16:51 +00:00
Travis Ralston
d7e8dbbab5 Remove extraneous scrollbar on TagPanel when few communities are shown 2020-07-14 09:08:07 -06:00
Bruno Windels
ebbcbe231a Merge branch 'nadonomy/ui-tweaks-part-deux' into 'element' 
UI tweaks - part deux

See merge request new-vector/element/element-web/matrix-react-sdk!8
 2020-07-14 13:47:10 +00:00
J. Ryan Stinnett
5294349dc3 Remove base domain from instance name 2020-07-14 14:32:52 +01:00
Bruno Windels
d13ade6f89 Merge branch 'nadonomy/use-element-theme' into 'element' 
Use element theme by default

See merge request new-vector/element/element-web/matrix-react-sdk!9
 2020-07-14 13:25:41 +00:00