Merge remote-tracking branch 'origin/develop' into dbkr/allow_forget_ban
This commit is contained in:
commit
6aa5266029
2 changed files with 10 additions and 7 deletions
|
@ -2,37 +2,37 @@
|
||||||
"name": "Riot",
|
"name": "Riot",
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "\/icons\/android-chrome-36x36.png",
|
"src": "android-chrome-36x36.png",
|
||||||
"sizes": "36x36",
|
"sizes": "36x36",
|
||||||
"type": "image\/png",
|
"type": "image\/png",
|
||||||
"density": "0.75"
|
"density": "0.75"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "\/icons\/android-chrome-48x48.png",
|
"src": "android-chrome-48x48.png",
|
||||||
"sizes": "48x48",
|
"sizes": "48x48",
|
||||||
"type": "image\/png",
|
"type": "image\/png",
|
||||||
"density": "1.0"
|
"density": "1.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "\/icons\/android-chrome-72x72.png",
|
"src": "android-chrome-72x72.png",
|
||||||
"sizes": "72x72",
|
"sizes": "72x72",
|
||||||
"type": "image\/png",
|
"type": "image\/png",
|
||||||
"density": "1.5"
|
"density": "1.5"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "\/icons\/android-chrome-96x96.png",
|
"src": "android-chrome-96x96.png",
|
||||||
"sizes": "96x96",
|
"sizes": "96x96",
|
||||||
"type": "image\/png",
|
"type": "image\/png",
|
||||||
"density": "2.0"
|
"density": "2.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "\/icons\/android-chrome-144x144.png",
|
"src": "android-chrome-144x144.png",
|
||||||
"sizes": "144x144",
|
"sizes": "144x144",
|
||||||
"type": "image\/png",
|
"type": "image\/png",
|
||||||
"density": "3.0"
|
"density": "3.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "\/icons\/android-chrome-192x192.png",
|
"src": "android-chrome-192x192.png",
|
||||||
"sizes": "192x192",
|
"sizes": "192x192",
|
||||||
"type": "image\/png",
|
"type": "image\/png",
|
||||||
"density": "4.0"
|
"density": "4.0"
|
||||||
|
|
|
@ -95,7 +95,10 @@ describe('joining a room', function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
var roomView;
|
var roomView;
|
||||||
httpBackend.flush().then(() => {
|
// wait for /sync to happen
|
||||||
|
return q.delay(1).then(() => {
|
||||||
|
return httpBackend.flush();
|
||||||
|
}).then(() => {
|
||||||
var roomDir = ReactTestUtils.findRenderedComponentWithType(
|
var roomDir = ReactTestUtils.findRenderedComponentWithType(
|
||||||
matrixChat, RoomDirectory);
|
matrixChat, RoomDirectory);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue