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
|
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 |
|
Travis Ralston
|
7515a3124a
|
Explain feature states in a lot more detail
|
2018-10-11 10:22:28 -06: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 |
|
Weblate
|
99789a94c1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-10 16:35:41 +00:00 |
|
Bruno Windels
|
bba04a6820
|
Merge pull request #2205 from matrix-org/dbkr/lazy_load_check_before_sync
Handle InvalidStoreError from js-sdk
|
2018-10-10 18:35:36 +02:00 |
|
David Baker
|
655627209a
|
unused function
|
2018-10-10 17:25:32 +01:00 |
|
David Baker
|
0abcb5c78d
|
Handle InvalidStoreError from js-sdk
js-sdk now emits sync state ERROR with an InvalidStoreError if the
store needs to be cleared before it can be used.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/759
|
2018-10-10 17:07:17 +01:00 |
|
Weblate
|
ff7365ddef
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-10 14:59:06 +00:00 |
|
Bruno Windels
|
dfb4c594a8
|
Merge pull request #2204 from matrix-org/bwindels/rrfallbackavatars
Fall back to default avatar in RR when member isn't loaded yet
|
2018-10-10 16:58:59 +02:00 |
|
random
|
9c5691300b
|
Translated using Weblate (Italian)
Currently translated at 100.0% (1267 of 1267 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
|
2018-10-10 14:41:22 +00:00 |
|
Bruno Windels
|
f360b2db90
|
forward prop updates to children in Velociraptor with React.cloneElement
|
2018-10-10 16:15:50 +02:00 |
|
Bruno Windels
|
5128386160
|
allow read receipts without an existing member in MessagePanel
|
2018-10-10 16:15:20 +02:00 |
|
Bruno Windels
|
0767c278e7
|
put userId next to member in read receipt, fall back when member missing
|
2018-10-10 16:14:09 +02:00 |
|
Weblate
|
29c9e17afa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-10 10:10:25 +00:00 |
|
David Baker
|
97ed4ed0bb
|
Merge pull request #2202 from matrix-org/dbkr/update_slate
Update to new version of slate
|
2018-10-10 11:10:20 +01:00 |
|
Weblate
|
589d3feea7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-09 16:40:54 +00:00 |
|
David Baker
|
7a3df11854
|
Merge pull request #2203 from MTRNord/patch-5
Update karma to webpack 4
|
2018-10-09 17:40:49 +01:00 |
|
David Baker
|
6f9d673b79
|
Focus composer after closing room settings
For some reason the slate update means the composer doesn't
have the focus after closing the room settings, and the end to end
tests pick this up!
|
2018-10-09 17:35:40 +01:00 |
|
Marcel
|
a1dfc6bd25
|
Remove invalid object in karma webpack config
root is replaced with modules in webpack 4
|
2018-10-09 17:45:21 +02:00 |
|
Marcel
|
b143060b8c
|
Remove json-loader
json-loader is now included in webpack4
|
2018-10-09 17:44:00 +02:00 |
|
Marcel
|
f5012d87cf
|
Fix karma webpack config
|
2018-10-09 17:40:25 +02:00 |
|
Marcel
|
10a3f08ee2
|
Update karma config for webpack 4
|
2018-10-09 17:32:39 +02:00 |
|
Marcel
|
20ef16ad00
|
Update webpack dependencies used for karma
|
2018-10-09 17:28:24 +02:00 |
|
David Baker
|
4e1fabd140
|
Remove spurious ...atributes in the wrong place
We already have it above
|
2018-10-09 16:05:14 +01:00 |
|
Krombel
|
1ac7216ed7
|
Translated using Weblate (German)
Currently translated at 100.0% (1267 of 1267 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
|
2018-10-09 13:27:56 +00:00 |
|
Weblate
|
c349648714
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-09 10:04:55 +00:00 |
|
David Baker
|
41bc42e7d7
|
Merge pull request #2194 from pvagner/more_accessible_buttons
More accessible buttons - take 2
|
2018-10-09 11:04:50 +01:00 |
|