mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 00:31:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
12125 commits 219 branches 562 tags 474 MiB
Commit graph

12125 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
11a0437df1 Merge remote-tracking branch 'origin/develop' into develop 2018-10-23 02:18:12 +00:00
Travis Ralston
879ef7f52b
Merge pull request #2236 from aaronraimist/leave-room-button 
Change leave room button text, OK -> Leave
 2018-10-22 20:18:07 -06:00
FeiYang
6774fd7acc Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1271 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-10-23 02:02:24 +00:00
Aaron Raimist
41bd6e4366
Change leave room button text, OK -> Leave 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-22 20:55:24 -05:00
Travis Ralston
78f527cf95 Remove unused classes 2018-10-22 15:14:21 -06:00
Travis Ralston
f2cac45543 Merge branch 'develop' into travis/fix-group-members 2018-10-22 15:02:01 -06:00
Szimszon
2b9a646760 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1271 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-10-22 18:45:24 +00:00
Weblate
1fd6155163 Merge remote-tracking branch 'origin/develop' into develop 2018-10-22 18:34:37 +00:00
Victor Grousset
60b1b30c51 Translated using Weblate (Esperanto) 
Currently translated at 86.4% (1098 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-10-22 18:34:36 +00:00
J. Ryan Stinnett
4335dfea16 Translated using Weblate (English (United States)) 
Currently translated at 65.1% (828 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2018-10-22 18:34:36 +00:00
Bruno Windels
e8048930c4 align (+) button and aggregated badge on section header 2018-10-22 18:18:36 +02:00
Bruno Windels
59fe5ee91f make text on room tile with highlight or notifitications black 2018-10-22 18:18:08 +02:00
Bruno Windels
3d5395e784 tweak paddings and margins on room tile 2018-10-22 18:17:51 +02:00
Bruno Windels
521e035bf0 add vertical space above and below room section 2018-10-22 18:17:14 +02:00
Bruno Windels
91a2ee1779 tweak badges 2018-10-22 18:16:36 +02:00
Bruno Windels
7d0b8083b6 hardcode to to dharma to avoid weird mix 2018-10-22 16:33:46 +02:00
David Baker
9976c4eba5
Merge pull request #2231 from matrix-org/travis/dialog-buttons 
Move all dialog buttons to the right and fix their order
 2018-10-22 15:00:35 +01:00
Bruno Windels
a69463e7fa clear height flexbox properties when collapsing 
so item doesn't maintain height given by resizing
 2018-10-22 15:57:56 +02:00
Bruno Windels
4d53e13a28 make manual resizing follow cursor more accurately 
by clearing flex-grow that was set based on the list size,
you don't want it to grow anymore but be exactly the size
you are giving it.
 2018-10-22 15:56:39 +02:00
Bruno Windels
15059fe005 make sure the room list doesn't grow taller than viewport 
by setting the min-height to 0 at every flex level,
since by default it's auto which means grow as tall as you need
to make the content fit.
 2018-10-22 15:55:29 +02:00
Bruno Windels
e3a4ad778a not needed anymore 
also confuses resizer offset calculation,
which will need to be fixed regardlessly though
 2018-10-22 15:51:27 +02:00
David Baker
0992408930
Merge pull request #2229 from matrix-org/bwindels/roomsectionheadercleanup 
Redesign: room section header tidbits
 2018-10-22 14:49:53 +01:00
David Baker
bb3a03a9b8 Merge remote-tracking branch 'origin/experimental' into bwindels/roomsectionheadercleanup 2018-10-22 14:43:38 +01:00
David Baker
256bcb0963
Merge pull request #2228 from matrix-org/bwindels/addroomfromsublistheader 
Redesign: Add (+) button in room section header to add rooms
 2018-10-22 14:32:48 +01:00
David Baker
c677dd8a24
Merge pull request #2225 from matrix-org/travis/join-room-text 
Add a bit of text to explain the purpose of the RoomPreviewSpinner
 2018-10-22 13:11:09 +01:00
David Baker
b8153dcec7
Merge pull request #2219 from matrix-org/travis/login-register-composer 
Move the login box from the left sidebar to where the composer is
 2018-10-22 13:05:19 +01:00
Bruno Windels
d1bab6cc35 tweak resize handle in room list 
only show a 1 px line but with a 9px interaction target
apply darker color from design
 2018-10-22 11:19:42 +02:00
Bruno Windels
b728acc798 set accest color to new red 2018-10-22 11:18:53 +02:00
Bruno Windels
5c843acc10 fix room lists growing taller than screen height in FF 
sections with flex-basis don't seem to shrink smaller in FF,
so use flexGrow which is unitless/proportional but works as well
 2018-10-22 11:16:33 +02:00
Bruno Windels
f42ab32e05 Merge branch 'experimental' into bwindels/roomsectionheadercleanup 2018-10-22 10:31:07 +02:00
Weblate
21d426821a Merge remote-tracking branch 'origin/develop' into develop 2018-10-22 07:37:42 +00:00
sergio
e9a62bff2e Translated using Weblate (Russian) 
Currently translated at 95.9% (1219 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-10-22 07:37:42 +00:00
hamster
83ebe3752d Translated using Weblate (Polish) 
Currently translated at 91.8% (1166 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-22 07:37:42 +00:00
Victor Grousset
b3d5612746 Translated using Weblate (Esperanto) 
Currently translated at 86.4% (1098 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-10-22 07:37:41 +00:00
FeiYang
2ac10dd6b1 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1270 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-10-22 07:37:41 +00:00
Bruno Windels
8532828b46
Merge pull request #2230 from matrix-org/travis/fix-canonical-aliases 
Fix an error where React doesn't like value=null on a select
 2018-10-22 07:37:23 +00:00
Karol Kosek
2a6ae17e6a Translated using Weblate (Polish) 
Currently translated at 91.6% (1164 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-20 16:07:08 +00:00
Oliwer
51a03a700a Translated using Weblate (Polish) 
Currently translated at 91.6% (1164 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-20 15:31:16 +00:00
Travis Ralston
7ef08314b8 Redirect widgets to another location before deleting them 
This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.

Fixes https://github.com/vector-im/riot-web/issues/7351
 2018-10-19 16:23:19 -06:00
Weblate
b17bf05761 Merge remote-tracking branch 'origin/develop' into develop 2018-10-19 22:23:01 +00:00
Travis Ralston
c75beb0196 Revert "Redirect widgets to another location before deleting them" 
This reverts commit 275d88dd4f.
 2018-10-19 16:22:48 -06:00
Weblate
7df85725f7 Merge remote-tracking branch 'origin/develop' into develop 2018-10-19 22:22:35 +00:00
Travis Ralston
275d88dd4f Redirect widgets to another location before deleting them 
This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.

Fixes https://github.com/vector-im/riot-web/issues/7351
 2018-10-19 16:22:20 -06:00
Travis Ralston
9582c1e65a Move all dialog buttons to the right and fix their order 
Fixes https://github.com/vector-im/riot-web/issues/5689

Some dialogs had their own CSS that prevented the buttons from being placed in the right spot. This has been fixed by using a generic standard for the buttons. The only strange dialog that needed more CSS was the devtools dialog due to the header.

Not all dialogs have been checked - I spot-checked about half of them and verified the CSS manually on an established account. It's hard to get at all the dialogs without convoluted testing.
 2018-10-19 15:33:23 -06:00
Travis Ralston
49efefa630 Fix an error where React doesn't like value=null on a select 
This only happens when there are no canonical aliases for a room.
 2018-10-19 14:18:05 -06:00
Travis Ralston
7383133846 Support parsing matrix.to links in the timeline with ?via= in them 
This ends up being translated to ?server_name= in the matrix-js-sdk, although that has a bug at the time of writing. It converts `server_name: ['a', 'b']` to `?server_name=a,b` instead of `?server_name=a&server_name=b`

For reference: the `viaServers` option is routed through the 'join_room' action to RoomViewStore#_joinRoom which is passed directly to the js-sdk http-api#joinRoom function.

Next steps:
* Fix the js-sdk parsing
* Make the SDK generate matrix.to links with ?via=
 2018-10-19 13:31:18 -06:00
Bruno Windels
ebd3d34106 make sure no resize handle is put after last sublist 2018-10-19 18:35:27 +02:00
Bruno Windels
7c64d9637e hide resize handles next to collaped/empty sublists 2018-10-19 18:18:45 +02:00
Weblate
b0d84fe4c4 Merge remote-tracking branch 'origin/develop' into develop 2018-10-19 14:40:21 +00:00
Bruno Windels
2ec9745939 Merge branch 'master' into develop 2018-10-19 16:39:59 +02:00