6323d78b0c
Move tinter init to MatrixChat
...
This is a much better place for it to live
2018-10-15 14:41:00 -06:00
f8fd0c34cb
Merge branch 'develop' into travis/fix-default-tint
2018-10-15 14:37:34 -06:00
2d62fda862
Don't show the invite nag bar when peeking
2018-10-15 14:35:36 -06:00
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
5a72a5863f
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
2018-10-15 19:20:55 +01:00
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
0ce0ccc2dd
Merge remote-tracking branch 'origin/develop' into develop
2018-10-15 15:27:34 +00:00
0912b8dcc2
Merge pull request #2218 from matrix-org/bwindels/phasedrollout
...
Phased rollout of lazy loading
2018-10-15 17:27:28 +02:00
63f1c41d18
fix test lint
2018-10-15 17:15:22 +02:00
f9f7abb0d1
fix lint
2018-10-15 17:01:30 +02:00
478c06c32e
this file starts in 2018
2018-10-15 16:43:52 +02:00
ef204b6e99
check if phased rollout has expired before trying to enable LL
2018-10-15 16:41:24 +02:00
f717c5697b
tests for phased rollout function
2018-10-15 16:41:04 +02:00
2ac9b26257
phased rollout expired function
2018-10-15 16:40:51 +02:00
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
0d7093fe76
Merge branch 'bwindels/redesign' into experimental
2018-10-15 14:13:11 +02:00
127fcf58a9
add missing sticker translation
2018-10-15 13:57:06 +02:00
94b147d90c
Merge remote-tracking branch 'origin/develop' into develop
2018-10-15 10:34:11 +00:00
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
bd35825779
Merge pull request #2212 from matrix-org/dbkr/autocomplete
...
Fix autocomplete
2018-10-15 11:34:05 +01:00
3d8f0adf56
Move pinned rooms check to the RoomListStore
2018-10-12 14:35:54 -06:00
103ed71eb5
Merge branch 'develop' into travis/pinned-room-list
2018-10-12 14:09:52 -06:00
47ade14e07
Merge pull request #6831 from MTRNord/patch-8
...
Fix Tinter.setTheme to not fire using Firefox
2018-10-12 13:55:43 -06:00
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
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
52eb263c2c
Merge pull request #2213 from aaronraimist/lint
...
Fix various lint errors
2018-10-12 09:31:12 +01:00
8c13b12018
Regenerate .eslintignore.errorfiles
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 23:00:01 -05:00
9f1b1d2028
Fix more lint errors
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 22:50:24 -05:00
a66dbccef8
Fix lint errors in MessageComposerInput.js
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 22:46:55 -05:00
1287d9c49b
Fix lint errors in Notifications.js
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 22:44:02 -05:00
d452dd2b74
Fix lint error in LazyLoadingResyncDialog.js
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 22:32:25 -05:00
752d816780
Fix some more lint errors
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 22:06:01 -05:00
954d49f22e
Fix lint errors in ContentRules.js
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 22:04:56 -05:00
fb1deee387
Fix lint errors in NotificationUtils.js
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 22:01:49 -05:00
6b5650dbb1
Fix lint errors in PushRuleVectorState.js
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 22:01:13 -05:00
6d8649855a
Fix lint errors in VectorPushRulesDefinitions.js
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 21:59:20 -05:00
c83521bb31
Fix lint errors in rageshake.js
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 21:58:22 -05:00
58488c076e
Fix more lint errors
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 21:54:55 -05:00
a2944c9faa
Fix lint errors in VectorConferenceHandler.js
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-11 21:54:25 -05:00
a58de9e189
Also test the two options while we're at it
2018-10-11 21:04:50 +01:00
53e13be047
Add some unit tests for QueryMatcher
...
Which 1) has a fairly complex interface with lots of subtleties and
2) is really trivial to unit test.
2018-10-11 20:50:48 +01:00
9c8c84485a
Fix user autocompleting
...
This rewrites quite a lot of QueryMatcher.
* Remove FuzzyMatcher which was a whole file of commented out code
that just deferred to QueryMatcher
* Simplify & remove some cruft from QueryMatcher, eg. most of the
KeyMap stuff was completely unused.
* Don't rely on object iteration order, which fixes a bug where
users whose display names were entirely numeric would always
appear first...
* Add options.funcs to QueryMatcher to allow for indexing by things
other than keys on the objects
* Use above to index users by username minus the leading '@'
* Don't include the '@' in the query when autocomple is triggered
by typing '@'.
Fixes https://github.com/vector-im/riot-web/issues/6782
2018-10-11 18:34:01 +01:00
7515a3124a
Explain feature states in a lot more detail
2018-10-11 10:22:28 -06:00
5ad9d2094a
v0.17.0-rc.1
2018-10-11 16:03:53 +01:00
848bd8f553
Prepare changelog for v0.17.0-rc.1
2018-10-11 16:03:52 +01:00
74f2266d89
v0.17.0-rc.1
2018-10-11 16:02:48 +01:00
03323bc294
Merge remote-tracking branch 'origin/develop' into release-v0.17.0
2018-10-11 16:02:20 +01:00
df1eb9f5cb
Merge pull request #7483 from vector-im/revert-7429-bwindels/alsocommitlockfile
...
Revert "also commit the lock file when bumping version as it is now committed to the repo"
2018-10-11 16:02:09 +01:00
aaa9c82758
Revert "also commit the lock file when bumping version as it is now committed to the repo"
2018-10-11 16:01:56 +01:00
ba51c0721e
js-sdk & react-sdk rc.1
2018-10-11 15:42:30 +01:00
Travis Ralston
Will Hunt
David Baker
Weblate
Bruno Windels
Bruno Windels
Karol Kosek
David Baker
Aaron Raimist