OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-06-08 15:41:18 +00:00
parent 62978b7a2b 3983535536
commit 6c7b8f619b
3 changed files with 1210 additions and 1147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2353
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -134,7 +134,7 @@
"react-addons-test-utils": "^15.4.0", "react-addons-test-utils": "^15.4.0",
"require-json": "0.0.1", "require-json": "0.0.1",
"rimraf": "^2.4.3", "rimraf": "^2.4.3",
"sinon": "^1.17.3", "sinon": "^5.0.7",
"source-map-loader": "^0.2.3", "source-map-loader": "^0.2.3",
"walk": "^2.3.9", "walk": "^2.3.9",
"webpack": "^1.12.14" "webpack": "^1.12.14"

2
test/components/structures/TimelinePanel-test.js
View File

@ -235,7 +235,7 @@ describe('TimelinePanel', function() {
// now, if we update the events, there shouldn't be any // now, if we update the events, there shouldn't be any
// more requests. // more requests.
client.paginateEventTimeline.reset(); client.paginateEventTimeline.resetHistory();
panel.forceUpdate(); panel.forceUpdate();
expect(messagePanel.props.backPaginating).toBe(false); expect(messagePanel.props.backPaginating).toBe(false);
setTimeout(() => { setTimeout(() => {