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

1948 commits

Author SHA1 Message Date
Travis Ralston
d3dba0ba3a
Merge pull request #5125 from matrix-org/travis/spec-i18n 
Use matrix-doc for SAS emoji translations
 2020-08-18 11:41:42 -06:00
Michael Telatynski
d55cb4266a Update copy 2020-08-18 17:38:10 +01:00
Michael Telatynski
8cff59f123 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-18 17:36:04 +01:00
Travis Ralston
d9e7253561 Use matrix-doc for SAS emoji translations 
This is done through the js-sdk's new SASEmojiV1 class.
 2020-08-17 15:37:36 -06:00
Michael Telatynski
e20b375433 Add filter results count and explore prompt 2020-08-17 18:20:00 +01:00
Michael Telatynski
21cdf5073c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617 2020-08-14 18:58:26 +01:00
Michael Telatynski
be1d390a93
Merge pull request #5106 from matrix-org/t3chguy/room-list/14608 
Switch out the globe icon and colour it depending on theme
 2020-08-14 18:10:29 +01:00
Michael Telatynski
228d1af6dc i18n 2020-08-14 11:01:03 +01:00
Michael Telatynski
e7bd656a19 i18n 2020-08-13 16:41:25 +01:00
Michael Telatynski
b8a260bb84 Change add room action for rooms to context menu 2020-08-13 16:18:26 +01:00
Michael Telatynski
df980dbf92 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-12 22:48:03 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting 
Quick win session 24/07/2020
 2020-08-12 15:21:06 +01:00
J. Ryan Stinnett
9e429ee669 Remove rebranding toast 
It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.

Fixes https://github.com/vector-im/element-web/issues/14931
 2020-08-11 14:27:53 +01:00
Michael Telatynski
4799f0ee43
Merge pull request #5085 from matrix-org/t3chguy/notifications11 
Factor out Iconized Context menu for reusability
 2020-08-08 11:41:28 +01:00
J. Ryan Stinnett
4c1956a3c2 Show master key cache status in Settings 2020-08-06 15:25:33 +01:00
Michael Telatynski
ab0b688bf2 i18n 2020-08-04 21:46:07 +01:00
Jorik Schellekens
271eeeabee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting 2020-08-04 15:04:56 +01:00
Jorik Schellekens
4bebbad365 fix i18n 2020-08-03 19:29:18 +01:00
Jorik Schellekens
5426d9f105 Use accessible button for copy icon. 2020-08-03 19:21:24 +01:00
J. Ryan Stinnett
ce226ab534 Replace Riot with Element in docs and comments 
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.

Part of https://github.com/vector-im/element-web/issues/14864
 2020-08-03 18:33:36 +01:00
Bruno Windels
fba1158700
Merge pull request #5079 from matrix-org/bwindels/alert-file-panel-empty-state 
Add title and icon to empty state of file and notification panel
 2020-08-03 12:58:13 +00:00
Michael Telatynski
0a700bc8e4 Iterate copy on download logs button 2020-08-03 13:21:04 +01:00
Michael Telatynski
cbcac9dd49 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 
 Conflicts:
	package.json
 2020-08-03 12:54:06 +01:00
Bruno Windels
5a3bda7eea Add title and icon to empty state of file and notification panel 2020-08-03 13:30:56 +02:00
Travis Ralston
968fbd5cba Merge branch 'develop' into travis/echo/audit 2020-07-30 10:18:30 -06:00
Travis Ralston
7522380763 Update copy 2020-07-30 10:17:47 -06:00
Bruno Windels
a281c617be string order changed 2020-07-30 10:42:46 +02:00
Travis Ralston
c5574219bb Implement dialog for resending local echo transactions 2020-07-29 20:36:04 -06:00
Travis Ralston
14b0def143 Fix echo handling and show a barebones toast on error 
The EchoTransaction was wrongly assuming that it knew better than the caller for when the success condition was met, so the echo marking has been left an exercise for the caller. In this case, we mark when we finally receive the sync with the updated rules.

We also have to cancel previous transactions otherwise if the user mashes buttons we could forever show the toast, and that would be bad.
 2020-07-29 19:11:24 -06:00
Travis Ralston
0f1b9937a9 Connect RoomTile's notification volume to local echo 
This presumes success as we don't yet have a UI for failures.
 2020-07-29 16:54:33 -06:00
Bruno Windels
d8baad31da provide nicer error for no known servers error when accepting an invite 2020-07-29 16:51:37 +02:00
Jorik Schellekens
d55699211e Update copy icon on pre block and share dialogues 2020-07-27 15:13:02 +01:00
Michael Telatynski
60a6b13f4b
Merge pull request #5026 from matrix-org/t3chguy/room-list/14440 
Put low priority xor toggle back in the room list context menu
 2020-07-24 00:02:50 +01:00
Michael Telatynski
6bb9be56cd
Merge pull request #5025 from matrix-org/t3chguy/room-list/14662 
Update message previews
 2020-07-22 10:03:30 +01:00
Michael Telatynski
c4fc70b9be Post-merge fix 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 22:28:36 +01:00
Michael Telatynski
aaad18c9c2 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 09:55:22 +01:00
Michael Telatynski
fe0c660fac Put low priority xor toggle back in the room list context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 09:50:20 +01:00
Michael Telatynski
193a0d89af Prefix message previews for emotes with a * 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 09:31:22 +01:00
Travis Ralston
de35e0dfcd Update i18n 2020-07-20 16:56:41 -06:00
Travis Ralston
e03978a7ba Update i18n 2020-07-17 16:29:11 -06:00
Travis Ralston
3c047cecfd Remove core structures for the old room list 2020-07-17 14:17:11 -06:00
Travis Ralston
06336a88b3 Remove setting for old room list 2020-07-17 14:06:30 -06:00
David Baker
5db5bc657c
Merge pull request #4833 from matrix-org/dbkr/weird_cancel_dialog 
Hopefully make cancel dialog a bit less weird
 2020-07-17 17:03:43 +01:00
Travis Ralston
c29da883db Convert room list log setting to a real setting 
To debug https://github.com/vector-im/riot-web/issues/14554 and https://github.com/vector-im/riot-web/issues/14508
 2020-07-16 14:43:43 -06:00
Michael Telatynski
d5f2d43429 Improve Tooltip font/layout consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:15:00 +01:00
Michael Telatynski
f2104b59f0 Simplify room sublist context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:38:04 +01:00
Michael Telatynski
78da0c863a Update copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 16:52:10 +01:00
Michael Telatynski
ae17cd3ec6 Add tooltip to Room Tile Icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 16:46:39 +01:00
Travis Ralston
556da7fe5c Swap out Modular for EMS 2020-07-14 15:47:03 -06:00
Travis Ralston
322d58ba0c Merge branch 'develop' into element 2020-07-14 15:04:17 -06:00