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 |
|
Will Hunt
|
67d39a40d3
|
Sneaky ,
|
2018-10-16 11:26:04 +01:00 |
|
Will Hunt
|
fcce61bf14
|
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
|
2018-10-16 11:21:15 +01:00 |
|
Weblate
|
2a80d33a89
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-16 10:12:26 +00:00 |
|
David Baker
|
2202ff1ccd
|
update deps
|
2018-10-16 11:12:13 +01:00 |
|
Weblate
|
a138a9c6ec
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-16 10:10:09 +00:00 |
|
David Baker
|
3d8d66547f
|
Merge branch 'master' into develop
|
2018-10-16 11:09:55 +01:00 |
|
David Baker
|
17e84bf815
|
Merge branch 'release-v0.17.0'
|
2018-10-16 11:09:33 +01:00 |
|
David Baker
|
41540842eb
|
v0.17.0
v0.17.0
|
2018-10-16 11:00:39 +01:00 |
|
David Baker
|
65cc3000ee
|
Prepare changelog for v0.17.0
|
2018-10-16 11:00:39 +01:00 |
|
David Baker
|
1fc8592ef6
|
v0.17.0
|
2018-10-16 10:59:18 +01:00 |
|
David Baker
|
4afb5caa4e
|
Released js-sdk & react-sdk
|
2018-10-16 10:58:29 +01:00 |
|
Bruno Windels
|
ee137ce44c
|
Merge branch 'develop' into bwindels/redesign
|
2018-10-16 11:58:15 +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 |
|
Bruno Windels
|
9830ab3aad
|
Merge pull request #7503 from vector-im/dbkr/ll_phased_rollout
Phased rollout of lazyloading
|
2018-10-16 11:44:49 +02:00 |
|
David Baker
|
005e4aa1bd
|
Phased rollout of lazyloading
|
2018-10-16 10:43:15 +01:00 |
|
David Baker
|
de7d3ba701
|
Change electron build script paths
Because electron builder has decided to output the mac assets to
somewhere else today.
|
2018-10-16 10:26:04 +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 |
|
David Baker
|
05884ba279
|
Merge pull request #7501 from vector-im/dbkr/update_electron_builder_relbranch
Update to latest electron builder
|
2018-10-16 09:40:30 +01:00 |
|
David Baker
|
a0e067510c
|
Update to latest electron builder
Tested auto update on both windows (ia32) and mac, seems to work!
|
2018-10-16 09:39:30 +01:00 |
|
Weblate
|
2784d1b31c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-16 08:37:33 +00:00 |
|
Tom Van Eyck
|
8e9d7d97f6
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (37 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
|
2018-10-16 08:37:31 +00:00 |
|
David Baker
|
f483fd3916
|
Merge pull request #7498 from vector-im/dbkr/update_electron_builder
Update to latest electron builder
|
2018-10-16 09:37:27 +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 |
|
Will Hunt
|
5a72a5863f
|
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
|
2018-10-15 19:20:55 +01:00 |
|
David Baker
|
4e65b5f73b
|
Update to latest electron builder
Tested auto update on both windows (ia32) and mac, seems to work!
|
2018-10-15 18:13:47 +01: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 |
|