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

12056 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
49bd5441d1
Merge pull request #2214 from matrix-org/travis/fix-default-tint 
Apply the user's tint once the MatrixClientPeg is moderately ready
 2018-10-16 08:08:02 -06:00
Bruno Windels
30003d8f91 turn resizer into class to make programmatic interaction/cleanup easier 2018-10-16 15:16:10 +02:00
Bruno Windels
c095e30ae4 provide collapsed callback to also collapse on react side of things 2018-10-16 14:56:49 +02:00
Bruno Windels
529845d8fc group collapsed styles 2018-10-16 14:55:35 +02:00
Bruno Windels
8fa22d620a align badge and make it non-flex when collapsed 2018-10-16 14:54:30 +02:00
Bruno Windels
cc29dd08da don't always show badge (leftover) 2018-10-16 14:54:14 +02:00
Bruno Windels
99bf6b0e32 put dm icon back in it's correct location 2018-10-16 14:53:44 +02:00
Bruno Windels
c56975d93d dont base collapse toggle size on min-width, as it's not available in collapsed state 2018-10-16 12:26:08 +02:00
Weblate
6453cd7b17 Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 09:58:02 +00:00
Bruno Windels
01471abdc5 Merge branch 'bwindels/redesign' into bwindels/resizehandles 2018-10-16 11:57:59 +02:00
Bruno Windels
6878ce3c6a Merge branch 'develop' into bwindels/redesign 2018-10-16 11:57:44 +02:00
David Baker
8015bdfed7 Update deps 
or, apparently, mostly just add 'github' prefixes
 2018-10-16 10:57:32 +01:00
Weblate
127b5a972f Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 09:55:33 +00:00
David Baker
4d7b88a914 Merge branch 'master' into develop 2018-10-16 10:55:12 +01:00
David Baker
cbb117552f v0.14.0 2018-10-16 10:54:19 +01:00
David Baker
0e69490b6a Prepare changelog for v0.14.0 2018-10-16 10:53:43 +01:00
David Baker
cbe642f569 released js-sdk 2018-10-16 10:50:02 +01:00
David Baker
e2a126c26c
Merge pull request #2222 from matrix-org/bwindels/phasedrollout 
Phased rollout of lazy loading
 2018-10-16 10:15:10 +01:00
Weblate
1d4832a2a4 Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 08:45:53 +00:00
David Baker
589633d98f
Merge pull request #2217 from matrix-org/dbkr/rageshake_dont_use_all_the_memory 
Make rageshake use less memory
 2018-10-16 09:45:48 +01:00
Travis Ralston
d87ab8aac0 Support m.login.terms during registration 
Fixes https://github.com/vector-im/riot-web/issues/7168
Requires https://github.com/matrix-org/synapse/pull/4004
 2018-10-15 16:39:59 -06:00
Travis Ralston
6323d78b0c Move tinter init to MatrixChat 
This is a much better place for it to live
 2018-10-15 14:41:00 -06:00
Travis Ralston
f8fd0c34cb Merge branch 'develop' into travis/fix-default-tint 2018-10-15 14:37:34 -06:00
Travis Ralston
2d62fda862 Don't show the invite nag bar when peeking 2018-10-15 14:35:36 -06:00
Travis Ralston
94aac62f25 Move the login box from the left sidebar to where the composer is 
Fixes https://github.com/vector-im/riot-web/issues/4227

This includes removing the collapse button that isn't needed anymore.
 2018-10-15 14:26:24 -06:00
Weblate
0ce0ccc2dd Merge remote-tracking branch 'origin/develop' into develop 2018-10-15 15:27:34 +00:00
Bruno Windels
0912b8dcc2
Merge pull request #2218 from matrix-org/bwindels/phasedrollout 
Phased rollout of lazy loading
 2018-10-15 17:27:28 +02:00
Bruno Windels
63f1c41d18 fix test lint 2018-10-15 17:15:22 +02:00
Bruno Windels
f9f7abb0d1 fix lint 2018-10-15 17:01:30 +02:00
Bruno Windels
478c06c32e this file starts in 2018 2018-10-15 16:43:52 +02:00
Bruno Windels
ef204b6e99 check if phased rollout has expired before trying to enable LL 2018-10-15 16:41:24 +02:00
Bruno Windels
f717c5697b tests for phased rollout function 2018-10-15 16:41:04 +02:00
Bruno Windels
2ac9b26257 phased rollout expired function 2018-10-15 16:40:51 +02:00
David Baker
259d3608ee Make rageshake use less memory 
If an individual log is larger than the max size, ignore the rest
of it. Also build the string as we go rather than joining it all
together at the end, that way we only need the whole string + one
chunk in memory at once, rather than the whole string x 2.
 2018-10-15 15:23:44 +01:00
Bruno Windels
127fcf58a9 add missing sticker translation 2018-10-15 13:57:06 +02:00
Weblate
94b147d90c Merge remote-tracking branch 'origin/develop' into develop 2018-10-15 10:34:11 +00:00
Karol Kosek
b813e3b714 Translated using Weblate (Polish) 
Currently translated at 89.9% (1140 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-15 10:34:11 +00:00
David Baker
bd35825779
Merge pull request #2212 from matrix-org/dbkr/autocomplete 
Fix autocomplete
 2018-10-15 11:34:05 +01:00
Travis Ralston
ebcc65dc7e Apply the user's tint once the MatrixClientPeg is moderately ready 
Any earlier and we risk getting NPEs from the peg not existing.

Fixes https://github.com/vector-im/riot-web/issues/6424
 2018-10-12 13:52:58 -06:00
Travis Ralston
5085fd17a0
Merge pull request #2211 from matrix-org/travis/feature-docs 
Explain feature states in a lot more detail
 2018-10-12 07:50:45 -06:00
David Baker
52eb263c2c
Merge pull request #2213 from aaronraimist/lint 
Fix various lint errors
 2018-10-12 09:31:12 +01:00
Aaron Raimist
8c13b12018
Regenerate .eslintignore.errorfiles 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 23:00:01 -05:00
Aaron Raimist
9f1b1d2028
Fix more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:50:24 -05:00
Aaron Raimist
a66dbccef8
Fix lint errors in MessageComposerInput.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:46:55 -05:00
Aaron Raimist
1287d9c49b
Fix lint errors in Notifications.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:44:02 -05:00
Aaron Raimist
d452dd2b74
Fix lint error in LazyLoadingResyncDialog.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:32:25 -05:00
Aaron Raimist
752d816780
Fix some more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:06:01 -05:00
Aaron Raimist
954d49f22e
Fix lint errors in ContentRules.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:04:56 -05:00
Aaron Raimist
fb1deee387
Fix lint errors in NotificationUtils.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:01:49 -05:00
Aaron Raimist
6b5650dbb1
Fix lint errors in PushRuleVectorState.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:01:13 -05:00