Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,672 Commits 206 Branches 552 Tags 519 MiB
f68036a4fb
Commit Graph

9672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Telatynski
f68036a4fb
Replies: un-break click-to-mention on SenderProfile for reply&preview 
Fixes #6670

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-06 19:18: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
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
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
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
Michael Telatynski
db55f87699
avoid .done and .then anti-pattern 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-01 18:14:35 +01:00
Luke Barnard
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
Michael Telatynski
11ae0805b0
re-order ReplyThread methods for readability 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-01 17:42:58 +01:00
David Baker
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
Luke Barnard
bd703b17e5 Update documentation for GroupStore.registerListener 2018-05-01 16:57:28 +01:00
Luke Barnard
56ec7713bb Refresh group rooms and members when selecting a tag 2018-05-01 16:54:14 +01:00
Luke Barnard
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
Luke Barnard
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
Michael Telatynski
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
Luke Barnard
e3a07be127 Remove GroupStore logging 2018-05-01 13:14:01 +01:00
Luke Barnard
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
Luke Barnard
25690336c3 Prevent user getting trapped in group settings when an error occurs 2018-05-01 11:52:02 +01:00
Luke Barnard
38d7a5d394 Remove GroupStore listener when unmounting GroupPublicityToggle 2018-05-01 11:50:14 +01:00
Luke Barnard
28e8ce967f Correctly unregister group store listener when unmounting RoomList 2018-05-01 11:38:57 +01:00
Luke Barnard
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
Michael Telatynski
bbce6eea5b
update comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-30 23:28:55 +01:00
Matthew Hodgson
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
Luke Barnard
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
80c67ba35d
Merge pull request #1863 from matrix-org/dbkr/bug_report_dialog_basedialog 
Fix UX issues with bug report dialog
 2018-04-30 17:56:19 +01:00
Eric Newport
e037cf0063 namespace CSS better and fix bug 2018-04-30 12:22:16 -04:00
David Baker
5bacf50001
Merge pull request #1865 from matrix-org/matthew/image_errors 
fix ugly img errors and correctly render SVG thumbnails
 2018-04-30 17:12:40 +01:00
David Baker
025bffb4e9 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog 2018-04-30 16:20:12 +01:00
David Baker
d743e6afe2 Merge branch 'dbkr/bug_report_dialog_basedialog' of github.com:matrix-org/matrix-react-sdk into dbkr/bug_report_dialog_basedialog 2018-04-30 14:41:43 +01:00
David Baker
e28a927da9 lint 2018-04-30 14:34:14 +01:00
David Baker
c3420c37fd Indentation 2018-04-30 14:25:42 +01:00
David Baker
54cccab0c7 Factor out clearStorageButton 2018-04-30 14:22:18 +01:00
David Baker
5d46efc3e8 Get docs right on hasCancel 2018-04-30 14:17:21 +01:00
David Baker
dcaacfd204 Merge remote-tracking branch 'origin/develop' into dbkr/fix_session_restore_fail_dialog_ux 2018-04-30 14:06:32 +01:00
David Baker
a9b6db3f2e Lint 2018-04-30 13:41:04 +01:00
David Baker
37cb8abf13 Fix UX issues with bug report dialog 
* Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' &
   escape to cancel works)
 * Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous
   about submitting logs.
 * Continued campaign against 'Click here' links.

Fixes https://github.com/vector-im/riot-web/issues/6622
 2018-04-30 13:39:46 +01:00
David Baker
fc136607f1 UI fixes in SessionRestoreErrorDialog 
* Make the 'delete my data' button not the default
 * Make it red
 * Give it a confirmation dialog
 * Remove the 'cancel' button: what does it mean to cancel an error?
   In this case, it tried again and almost certainly got the same error.
 * Remove the top-right 'x' and don't cancel on esc for the same reason.
 * Move 'send bug report' to a button rather than a 'click here' link
 * Add a 'refresh' button which, even if it's no more likely to work,
   will at least look like it's doing something (it's mostly so if you
   don't have a bug report endpoint, there's still a button other
   than the one that deletes all your data).
 2018-04-30 13:39:46 +01:00
Luke Barnard
fba8a7d7d6
Merge pull request #1859 from matrix-org/dbkr/fix_session_restore_error_handling 
Fix error handling on session restore
 2018-04-30 13:37:25 +01:00
Michael Telatynski
41af9f7a96
fix changed method name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 08:23:35 +01:00
Matthew Hodgson
db5fc53853 final comment 2018-04-29 04:53:32 +01:00
Matthew Hodgson
45c0c0eddd add CSS destroyed by stickerpacks 
fixing mangling from 9fc7435ea2 (diff-be2f1d72c9704840ceddf019c825e825)
and 38efebb8d3 (diff-be2f1d72c9704840ceddf019c825e825)

also fixes https://github.com/vector-im/riot-web/issues/6492
 2018-04-29 04:50:44 +01:00