mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2018-06-08 15:41:18 +00:00
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",
"require-json": "0.0.1",
"rimraf": "^2.4.3",
"sinon": "^1.17.3",
"sinon": "^5.0.7",
"source-map-loader": "^0.2.3",
"walk": "^2.3.9",
"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
// more requests.
client.paginateEventTimeline.reset();
client.paginateEventTimeline.resetHistory();
panel.forceUpdate();
expect(messagePanel.props.backPaginating).toBe(false);
setTimeout(() => {