OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
12,248 Commits
215 Branches
561 Tags
470 MiB
Commit Graph

12248 Commits (5444a61e6fa7ad080ea4a11d40e96437bfb1e911)

Author SHA1 Message Date
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
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 3d8f0adf56 Move pinned rooms check to the RoomListStore 2018-10-12 14:35:54 -06:00
Travis Ralston 103ed71eb5 Merge branch 'develop' into travis/pinned-room-list 2018-10-12 14:09:52 -06: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
Aaron Raimist 6d8649855a
Fix lint errors in VectorPushRulesDefinitions.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:59:20 -05:00
Aaron Raimist c83521bb31
Fix lint errors in rageshake.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:58:22 -05:00
Aaron Raimist 58488c076e
Fix more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:54:55 -05:00
Aaron Raimist a2944c9faa
Fix lint errors in VectorConferenceHandler.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:54:25 -05:00
David Baker a58de9e189 Also test the two options while we're at it 2018-10-11 21:04:50 +01:00
David Baker 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
David Baker 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
Travis Ralston 7515a3124a
Explain feature states in a lot more detail 2018-10-11 10:22:28 -06:00
David Baker 15f3d996de v0.14.0-rc.1 2018-10-11 15:39:56 +01:00
David Baker 15f08ab0a1 Prepare changelog for v0.14.0-rc.1 2018-10-11 15:39:55 +01:00
David Baker ab35dac6e1 Prepare changelog for v0.14.0-rc.1 2018-10-11 15:37:17 +01:00
David Baker c5ff0b1d6b js-sdk rc.1 2018-10-11 15:34:40 +01:00
David Baker 6c3acdff82
Merge pull request #2209 from matrix-org/bwindels/turnllonbydefault 
turn LL on by default!
 2018-10-11 15:29:33 +01:00
Bruno Windels 6ed0777c96 turn it on! 2018-10-11 15:55:21 +02:00
David Baker 7ea623a349
Merge pull request #2207 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-10-11 11:25:30 +01:00
Tim Stahel 2c74d51a40 Translated using Weblate (English (United States)) 
Currently translated at 64.6% (819 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2018-10-11 10:18:05 +00:00
Weblate f64c274ef3 Merge remote-tracking branch 'origin/develop' into develop 2018-10-11 10:09:29 +00:00
David Baker 9c8e5119ba
Merge pull request #2206 from matrix-org/dbkr/slate_update_fix_quote 
Fix quote post slate update
 2018-10-11 11:09:25 +01:00
David Baker 3efc09586b More API changes 2018-10-11 10:47:36 +01:00
David Baker 4d1f2cdfa9 Fix quote post slate update 
Missed API update
 2018-10-11 10:29:55 +01:00