PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

[WEBLATE] merge develop

Browse source
This commit is contained in:
RiotTranslate 2017-06-08 17:49:39 +00:00
commit c5fa3a7df6
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -76,6 +76,7 @@
"react-dom": "^15.4.0", "react-dom": "^15.4.0",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef", "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
"sanitize-html": "^1.11.1", "sanitize-html": "^1.11.1",
"text-encoding-utf-8": "^1.0.1",
"ua-parser-js": "^0.7.10", "ua-parser-js": "^0.7.10",
"url": "^0.11.0", "url": "^0.11.0",
"velocity-vector": "vector-im/velocity#059e3b2" "velocity-vector": "vector-im/velocity#059e3b2"

2
src/components/structures/HomePage.js
View file

@ -18,8 +18,6 @@ limitations under the License.
'use strict'; 'use strict';
import React from 'react'; import React from 'react';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import sdk from 'matrix-react-sdk';
import GeminiScrollbar from 'react-gemini-scrollbar'; import GeminiScrollbar from 'react-gemini-scrollbar';
import request from 'browser-request'; import request from 'browser-request';
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';

1
src/components/views/rooms/DNDRoomTile.js
View file

@ -20,7 +20,6 @@ import React from 'react';
import {DragSource} from 'react-dnd'; import {DragSource} from 'react-dnd';
import {DropTarget} from 'react-dnd'; import {DropTarget} from 'react-dnd';
import dis from 'matrix-react-sdk/lib/dispatcher';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import sdk from 'matrix-react-sdk'; import sdk from 'matrix-react-sdk';
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';

4
test/app-tests/joining.js
View file

@ -158,7 +158,7 @@ describe('joining a room', function () {
ReactTestUtils.Simulate.click(joinLink); ReactTestUtils.Simulate.click(joinLink);
httpBackend.when('POST', '/join/'+encodeURIComponent(ROOM_ID)) httpBackend.when('POST', '/join/'+encodeURIComponent(ROOM_ALIAS))
.respond(200, {room_id: ROOM_ID}); .respond(200, {room_id: ROOM_ID});
}).then(() => { }).then(() => {
// wait for the join request to be made // wait for the join request to be made
@ -180,7 +180,7 @@ describe('joining a room', function () {
roomView, "mx_Spinner"); roomView, "mx_Spinner");
// flush it through // flush it through
return httpBackend.flush('/join/'+encodeURIComponent(ROOM_ID)); return httpBackend.flush('/join/'+encodeURIComponent(ROOM_ALIAS));
}).then(() => { }).then(() => {
httpBackend.verifyNoOutstandingExpectation(); httpBackend.verifyNoOutstandingExpectation();