imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22430 commits 222 branches 563 tags 470 MiB
Commit graph

3847 commits

Author SHA1 Message Date
Matthew Hodgson
9f455fae4b
Merge branch 'develop' into matthew/fix_logging 2019-11-26 10:19:48 +00:00
Matthew Hodgson
9fd45d1f14 console.log doesn't take %s substitutions 2019-11-26 01:14:03 +00:00
Travis Ralston
1ff39f2524 Make the communities button behave more like a toggle 
Fixes https://github.com/vector-im/riot-web/issues/10771

Clicking the button should toggle between your last page (room in our case) and the communities stuff.
 2019-11-25 16:51:48 -07:00
Bruno Windels
694f2cb1dc make sure the toast container is always in the document 2019-11-25 13:20:20 +01:00
Bruno Windels
422ab81185 a11y adjustments for toasts 2019-11-25 12:31:57 +01:00
Bruno Windels
15b5ad7451
Merge pull request #3662 from matrix-org/bwindels/itsadoubledate 
Fix double date separator for room upgrade tiles
 2019-11-22 16:52:47 +00:00
Bruno Windels
4a684d01a4
Merge pull request #3661 from matrix-org/bwindels/verif-toasts 
Show incoming verification requests in in-app notifications
 2019-11-22 16:39:18 +00:00
Bruno Windels
32b6fccbfc fix double date separator 2019-11-22 17:26:14 +01:00
Bruno Windels
8cb362002b show a toast instead of dialog when feature flag is enabled 2019-11-22 16:08:27 +01:00
Bruno Windels
e86d2b616e add ToastContainer 2019-11-22 16:04:51 +01:00
David Baker
7df8ef2f91
Merge pull request #3655 from matrix-org/t3chguy/fix_m.room.create_upgrade_notice 
Show m.room.create event before the ELS on room upgrade
 2019-11-22 13:41:36 +00:00
David Baker
25ba4c5f71 Fix read markers 
init code needs to be a constructor or its run too late
 2019-11-22 13:11:36 +00:00
David Baker
3f5a8faf37 PropTypes should be static 2019-11-22 13:01:56 +00:00
David Baker
6d4abeef45 Convert MessagePanel to React class 
I was about to add the getDerivedStateFromProps function to change
how read markers worked, but doing that in an old style class
means the statics object, so let;s just convert the thing.
 2019-11-22 12:07:25 +00:00
Michael Telatynski
a02a285058 Show m.room.create event before the ELS on room upgrade 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-22 10:24:51 +00:00
Michael Telatynski
d3f872bf7a Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 2019-11-21 11:15:32 +00:00
David Baker
00241a8d0c
Merge pull request #3637 from matrix-org/dbkr/system_dark_mode 
Get theme automatically from system setting
 2019-11-20 16:32:37 +00:00
Michael Telatynski
6121420113
Merge branch 'develop' into t3chguy/remove_bluebird 2019-11-20 15:21:23 +00:00
Bruno Windels
d1554977a8
Merge pull request #3633 from matrix-org/bwindels/fix-roomstatus-e2e-icon 
use general warning icon instead of e2e one for room status
 2019-11-20 14:36:30 +00:00
David Baker
5a700b518a Get theme automatically from system setting 
Uses CSS `prefers-color-scheme` to get the user's preferred colour
scheme. Also bundles up some theme logic into its own class.
 2019-11-20 13:41:06 +00:00
Damir Jelić
44b212bc4c Merge branch 'poljar/seshat-pr' into develop 2019-11-20 13:33:03 +01:00
David Baker
80ee68a42f Use a settings watcher to set the theme 
Rather than listening for account data updates manually
 2019-11-19 22:36:55 +00:00
Bruno Windels
de0287213e use general warning icon instead of e2e one for room status 2019-11-19 15:06:09 +01:00
Bruno Windels
43884923e8 merge the feature_user_info_panel flag into feature_dm_verification 2019-11-19 14:18:12 +01:00
Damir Jelić
6017473caf EventIndex: Move the event listener registration into the EventIndex class. 2019-11-19 14:05:00 +01:00
Michael Telatynski
f9d1fed74a re-add missing case of codepath 2019-11-18 19:00:22 +00:00
J. Ryan Stinnett
d5d2f7f936
Merge pull request #3588 from matrix-org/jryans/identity-disco-opt 
Relax identity server discovery error handling
 2019-11-18 17:09:08 +00:00
Michael Telatynski
e144f1c368 remove Promise.config 2019-11-18 10:37:29 +00:00
Michael Telatynski
5c172a383d Merge branch 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 
 Conflicts:
	src/components/views/right_panel/UserInfo.js
 2019-11-18 10:36:43 +00:00
Michael Telatynski
d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Damir Jelić
5149164010 MatrixChat: Revert the unnecessary changes in the MatrixChat class. 2019-11-18 10:58:40 +01:00
Michael Telatynski
1ab9b82c25
Merge pull request #3618 from matrix-org/t3chguy/remove_bluebird_2 
Remove Bluebird: phase 2.1
 2019-11-18 09:29:04 +00:00
J. Ryan Stinnett
854b5a7af5
Merge pull request #3617 from matrix-org/jryans/login-server-details-when-dead 
Show server details on login for unreachable homeserver
 2019-11-14 20:29:32 +00:00
J. Ryan Stinnett
413b90328f Show server details on login for unreachable homeserver 
This fixes the login page to be more helpful when the current homeserver is
unreachable: it reveals the server change field, so you have some chance to
progress forward.

Fixes https://github.com/vector-im/riot-web/issues/11077
 2019-11-14 15:23:04 +00:00
Michael Telatynski
58d15acf19
Merge pull request #3612 from matrix-org/t3chguy/remove_bluebird_1 
Remove Bluebird: phase 1
 2019-11-14 14:52:30 +00:00
Michael Telatynski
54dcaf1302 Replace bluebird specific promise things. Fix uses of sync promise code. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-14 13:52:17 +00:00
Damir Jelić
cc2ee53824 EventIndex: Add some more docs and fix some lint issues. 2019-11-13 16:21:26 +01:00
Damir Jelić
1316e04776 EventIndexing: Check if there is a room when resetting the timeline. 2019-11-13 15:23:08 +01:00
Damir Jelić
54b352f69c MatrixChat: Fix the limited timeline checkpoint adding. 2019-11-13 10:37:20 +01:00
Travis Ralston
fd28cf7a4c Move notification count to in front of the room name in the page title 
Fixes https://github.com/vector-im/riot-web/issues/10943
 2019-11-12 15:12:54 -07:00
Michael Telatynski
79ebb9091c
Merge branch 'develop' into t3chguy/remove_bluebird_1 2019-11-12 18:16:34 +00:00
Damir Jelić
d911055f5d MatrixChat: Move the indexing limited room logic to a different event. 2019-11-12 15:39:54 +01:00
Damir Jelić
e296fd05c0 RoomView: Move the search logic into a separate module. 2019-11-12 15:39:26 +01:00
Michael Telatynski
b73d0ca92a delint and run i18n 2019-11-12 12:37:47 +00:00
Damir Jelić
cfdcf45ac6 MatrixChat: Move the event indexing logic into separate modules. 2019-11-12 13:29:07 +01:00
Michael Telatynski
2b34cf4362 Replace Promise.delay with promise utils sleep 
(cherry picked from commit 0a21957b2c)
 2019-11-12 12:07:56 +00:00
Michael Telatynski
2ea239d192 Replace rest of defer usages using small shim. Add homebrew promise utils 
(cherry picked from commit 6850c14739)
 2019-11-12 12:07:56 +00:00
Michael Telatynski
7a512f7299 Revert "Replace rest of defer usages using small shim. Add homebrew promise utils" 
This reverts commit 6850c147
 2019-11-12 11:56:43 +00:00
Michael Telatynski
f9d6ed63f0 Revert "Replace Promise.delay with promise utils sleep" 
This reverts commit 0a21957b
 2019-11-12 11:56:32 +00:00
Michael Telatynski
168b1b68bb Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions" 
This reverts commit 09a8fec2
 2019-11-12 11:56:21 +00:00