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
3ba51ba695
Null check before accessing _paq
2018-05-03 18:25:00 +01:00
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
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
22f2d6f292
Fix crash when browser doesn't report page change measurement
2018-05-03 14:08:10 +01:00
7d0af02373
Merge pull request #1873 from matrix-org/t3chguy/m.relates_to
...
Fix Replies :D
2018-05-03 13:22:41 +01:00
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
71a12b6bbb
fix getDefaultProps mixup
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 11:23:41 +01:00
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
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
09dcfb0a00
relax lint for jsx-curly-spacing and arrow-parens
2018-05-02 23:27:19 +01:00
2475295a24
Up the max warning count :(
2018-05-02 17:42:23 +01:00
59299cf16d
Merge remote-tracking branch 'origin/develop' into dbkr/update_eslint_plugin_react
2018-05-02 17:37:00 +01:00
adf3e2f376
Change jsx-no-bind to warn
2018-05-02 17:36:29 +01:00
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
9f8202c8a9
Remove directories if they exist
2018-05-02 16:49:08 +01:00
82349ec933
Fix sed
2018-05-02 16:43:51 +01:00
183947615f
Fux up jenkins origin/ branches
2018-05-02 16:39:10 +01:00
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
0040ea0d9f
Use develop js-sdk in travis build
2018-05-02 15:53:38 +01:00
6bf1eb105a
Merge pull request #1741 from matrix-org/t3chguy/m.relates_to
...
Replies
2018-05-02 13:38:42 +01:00
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
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
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
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
825d610938
Bah, no pushd.
...
Also this npm install should now be unnecessary
2018-05-02 11:13:16 +01:00
c54198464b
npm install the js-sdk
2018-05-02 11:09:28 +01:00
b44582777b
Would if I added the script
2018-05-02 11:03:40 +01:00
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
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
2dfb3146b0
Simplify concurrent request error handling
2018-05-02 10:39:15 +01:00
ec4ec4717d
clean up EventTile:onWidgetLoad optional/required mess
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 18:15:12 +01:00
db55f87699
avoid `.done` and `.then` anti-pattern
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 18:14:35 +01:00
71c1198d12
Rewrite limitConcurrency to fix error catching
...
Make sure that we only catch errors that are a result of
calling fn()
2018-05-01 18:01:25 +01:00
11ae0805b0
re-order ReplyThread methods for readability
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 17:42:58 +01:00
1413890a9a
Merge pull request #1868 from matrix-org/luke/feature-refresh-group-rooms
...
Refresh group rooms and members when selecting a tag
2018-05-01 17:38:53 +01:00
bd703b17e5
Update documentation for GroupStore.registerListener
2018-05-01 16:57:28 +01:00
56ec7713bb
Refresh group rooms and members when selecting a tag
2018-05-01 16:54:14 +01:00
4d8394954c
Only create one group store listener in RoomList
...
Instead of creating several and destroying the reference to the one
created before.
2018-05-01 14:24:58 +01:00
da1a5616eb
Prevent error responses wedging group request concurrency limit
...
Fixes https://github.com/vector-im/riot-web/issues/6592
2018-05-01 14:04:13 +01:00
f0bd4a54e7
Refactor tests to understand sendMessage instead of send{Text,Html}Message
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 13:26:24 +01:00
e3a07be127
Remove GroupStore logging
2018-05-01 13:14:01 +01:00
6ec9e5f670
Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor
...
Refactor GroupStores into one global GroupStore
2018-05-01 12:33:06 +01:00
25690336c3
Prevent user getting trapped in group settings when an error occurs
2018-05-01 11:52:02 +01:00
38d7a5d394
Remove GroupStore listener when unmounting GroupPublicityToggle
2018-05-01 11:50:14 +01:00
28e8ce967f
Correctly unregister group store listener when unmounting RoomList
2018-05-01 11:38:57 +01:00
023daef4b7
Refactor GroupStores into one global GroupStore
...
Take a step closer to a flux-like architecture for group data, for
the purposes of providing features that require it.
Now the app has a single GroupStore that can be poked to fetch
updates for a particular group.
2018-05-01 11:24:17 +01:00
bbce6eea5b
update comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-30 23:28:55 +01:00
5749fbcff9
Merge pull request #1864 from matrix-org/matthew/blob_urls
...
Switch back to using blob URLs for rendering e2e attachments
2018-04-30 19:01:58 +01:00
22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons
...
Hide inline encryption icons except when hovering over a message
2018-04-30 17:57:22 +01:00
Luke Barnard