PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
9708 commits 1 branch 0 tags 338 MiB
Commit graph

9708 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson
8b2eb2c400 make history work again 2018-05-08 01:54:06 +01:00
Matthew Hodgson
ff42ef4a58 make it work for MD mode (modulo history) 2018-05-06 22:08:36 +01:00
Matthew Hodgson
190f6d9483 make slate actually work as a textarea 2018-05-06 15:27:27 +01:00
Matthew Hodgson
a2233a48c2 stub out yet more 2018-05-06 01:18:26 +01:00
Matthew Hodgson
05eba3fa32 stub out more until it loads... 2018-05-06 00:18:11 +01:00
Matthew Hodgson
f4ed820b6f fix stubbing 2018-05-05 23:38:14 +01:00
Matthew Hodgson
e62e43def6 comment out more draft stuff 2018-05-05 23:25:04 +01:00
Matthew Hodgson
02947063d3 Merge branch 'develop' into matthew/slate 2018-05-05 22:45:44 +01:00
Matthew Hodgson
af5be5c36c appease the fascist linter 2018-05-05 22:28:09 +01:00
Matthew Hodgson
ccd99f4a49 increase max-warnings temporarily 2018-05-05 22:27:54 +01:00
Matthew Hodgson
14bcfdd5c6 fix NPE 2018-05-05 22:08:37 +01:00
Luke Barnard
aa370b3b67
Merge pull request #1877 from matrix-org/luke/test-room-list 
Add tests for RoomList
 2018-05-04 13:57:57 +01:00
Luke Barnard
b08abd3d8b
Merge pull request #1874 from matrix-org/luke/fix-analytics-crash 
Fix crash when browser doesn't report page change measurement
 2018-05-03 18:46:20 +01:00
Luke Barnard
3ba51ba695 Null check before accessing _paq 2018-05-03 18:25:00 +01:00
Luke Barnard
fecbac0b34
Merge pull request #1875 from matrix-org/t3chguy/m.relates_to 
fix thinko when changing from ClientPeg to context in static method (DUH)
 2018-05-03 18:14:17 +01:00
Luke Barnard
c06a04af97 Fix unrelated linting issue 2018-05-03 18:11:32 +01:00
Luke Barnard
e15b39092d Add tests for testing room tile updates when tags (groups in LLP) are selected 2018-05-03 18:04:01 +01:00
Luke Barnard
80d251b622 Add tests for optimistic updates of moving room tiles 2018-05-03 15:41:35 +01:00
Luke Barnard
8fcb530e6f Install lolex for clock mocking in tests 2018-05-03 15:25:14 +01:00
Luke Barnard
3e55a45601 Mock getGroups on MatrixClient for RoomList _makeGroupInviteTiles 2018-05-03 15:24:41 +01:00
Michael Telatynski
97d344483e
fix thinko when changing from ClientPeg to context in static method (DUH 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-03 14:32:13 +01:00
Luke Barnard
22f2d6f292 Fix crash when browser doesn't report page change measurement 2018-05-03 14:08:10 +01:00
Luke Barnard
7d0af02373
Merge pull request #1873 from matrix-org/t3chguy/m.relates_to 
Fix Replies :D
 2018-05-03 13:22:41 +01:00
Michael Telatynski
4892694e77
use more explicit reply fallback closing tag construct to fix 6657 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-03 11:24:10 +01:00
Michael Telatynski
71a12b6bbb
fix getDefaultProps mixup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-03 11:23:41 +01:00
Luke Barnard
5cc6127221
Merge pull request #1871 from matrix-org/dbkr/update_eslint_plugin_react 
Update eslint-plugin-react
 2018-05-03 10:39:53 +01:00
Matthew Hodgson
ebfcea8b78
Merge pull request #1872 from matrix-org/matthew/lint-changes 
relax lint for jsx-curly-spacing and arrow-parens
 2018-05-02 23:33:04 +01:00
Matthew Hodgson
09dcfb0a00 relax lint for jsx-curly-spacing and arrow-parens 2018-05-02 23:27:19 +01:00
David Baker
2475295a24 Up the max warning count :( 2018-05-02 17:42:23 +01:00
David Baker
59299cf16d Merge remote-tracking branch 'origin/develop' into dbkr/update_eslint_plugin_react 2018-05-02 17:37:00 +01:00
David Baker
adf3e2f376 Change jsx-no-bind to warn 2018-05-02 17:36:29 +01:00
David Baker
bf8612f864 Update eslint-plugin-react 
Enables jsx-no-bind checking (although we may have to stop erroring
on this as we currently break this rule in a few places)
 2018-05-02 17:30:37 +01:00
David Baker
9f8202c8a9 Remove directories if they exist 2018-05-02 16:49:08 +01:00
David Baker
82349ec933 Fix sed 2018-05-02 16:43:51 +01:00
David Baker
183947615f Fux up jenkins origin/ branches 2018-05-02 16:39:10 +01:00
Luke Barnard
cc16730c23
Merge pull request #1870 from matrix-org/dbkr/use_develop_js_sdk 
Use develop js-sdk in jenkins build
 2018-05-02 16:30:37 +01:00
David Baker
0040ea0d9f Use develop js-sdk in travis build 2018-05-02 15:53:38 +01:00
Luke Barnard
6bf1eb105a
Merge pull request #1741 from matrix-org/t3chguy/m.relates_to 
Replies
 2018-05-02 13:38:42 +01:00
Michael Telatynski
4c3f811050
switch RoomView:uploadFile to async to clean up then/catch handling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-02 13:14:47 +01:00
Michael Telatynski
f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-05-02 13:08:38 +01:00
Luke Barnard
33e67a8f42
Merge pull request #1869 from matrix-org/dbkr/use_correct_js_sdk_branch 
Use the right js-sdk branch when testing
 2018-05-02 11:39:35 +01:00
David Baker
9bccecf449 Get symlink right 
Also No need to cd into the symlink, can just go straight there
 2018-05-02 11:23:57 +01:00
Luke Barnard
dc20f32ad7 Move waitForUpdate to test-utils 2018-05-02 11:19:01 +01:00
David Baker
825d610938 Bah, no pushd. 
Also this npm install should now be unnecessary
 2018-05-02 11:13:16 +01:00
David Baker
c54198464b npm install the js-sdk 2018-05-02 11:09:28 +01:00
David Baker
b44582777b Would if I added the script 2018-05-02 11:03:40 +01:00
David Baker
730512bc3f Use the right js-sdk branch when testing 
On the react-sdk tests not just riot-web
 2018-05-02 10:58:43 +01:00
David Baker
3d478c3c3a
Merge pull request #1867 from matrix-org/luke/fix-group-request-concurrency 
Prevent error responses wedging group request concurrency limit
 2018-05-02 10:45:12 +01:00
Luke Barnard
2dfb3146b0 Simplify concurrent request error handling 2018-05-02 10:39:15 +01:00
Michael Telatynski
ec4ec4717d
clean up EventTile:onWidgetLoad optional/required mess 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-01 18:15:12 +01:00