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

2958 commits

Author SHA1 Message Date
Luke Barnard
6a9781f023 Remove redundant state 2017-06-02 11:41:09 +01:00
Luke Barnard
defecb1b14 Implement /user/@userid:domain?action=chat 
This is a URL that can be used to start a chat with a user.
 - If the user is a guest, setMxId dialog will appear before anything and a defered action will cause `ChatCreateOrReuseDialog` to appear once they've logged in.
 - If the user is registered, they will not see the setMxId dialog.

fixes https://github.com/vector-im/riot-web/issues/4034
 2017-06-02 11:36:18 +01:00
Kegan Dougal
a8ca7c899f Review comments 2017-06-02 11:16:08 +01:00
Luke Barnard
be7c2612e8 Merge pull request #967 from matrix-org/luke/show-people-rooms-tooltips 
Show People/Rooms emptySubListTip even when total rooms !== 0
 2017-06-02 11:10:48 +01:00
Kegan Dougal
f54c182eb1 Add remaining strings for vector-im/riot-web#4151 2017-06-02 10:47:08 +01:00
Kegan Dougal
d2e766e4f0 First round 2017-06-02 10:18:31 +01:00
Michael Telatynski
5e2e550bf9 don't lose date seperator when the first event of the new day is redacted 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 04:39:44 +01:00
Michael Telatynski
d2d0ba952a allow hiding redactions. no point onAccountData as it'd cause a full 
refresh, this may need to be handled differently in the future.
Currently handling same as the new timestamp stuff

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 04:23:07 +01:00
Matthew Hodgson
ec433907f0 Merge pull request #850 from t3chguy/webrtc_settings 
webrtc config electron
 2017-06-02 00:48:25 +01:00
Michael Telatynski
b1973d7998 undefined =/= '' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:42:19 +01:00
Michael Telatynski
f4db83a031 try empty string as falsey key 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:31:43 +01:00
Michael Telatynski
6b4daf02a9 i18 missed things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:27:20 +01:00
Michael Telatynski
0bafd6458a Revert voodoo 2017-06-02 00:26:31 +01:00
Matthew Hodgson
c7285b9053 fix fr layout 2017-06-02 00:21:00 +01:00
Michael Telatynski
46a9326607 special case default - CallMediaHandler can figure it out 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:20:34 +01:00
Matthew Hodgson
6a225d1ac2 use new sign-in string 2017-06-02 00:16:17 +01:00
Michael Telatynski
3eb519b227 this is just endless 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:54:17 +01:00
Michael Telatynski
beedeec163 copy the arrays so we're not making a mess 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:50:14 +01:00
Michael Telatynski
0f2c89d525 lets actually make things work, eh? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:39:54 +01:00
Michael Telatynski
4e36c10c38 only unshift default if there is no deviceId===default 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:33:36 +01:00
Michael Telatynski
dd4480f8c3 change device data structure to array of objects 
so that we can set falsey values, for unsetting device
                               most dolphinately needs testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:26:43 +01:00
Michael Telatynski
aa90d6b097 fix **AMAZING** C&P derp 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:00:25 +01:00
Michael Telatynski
dbba1dedb6 i18nize all the things and change show logic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 22:58:17 +01:00
Michael Telatynski
04b86e5d1d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings 
and i18nize webrtc stufffs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js
 2017-06-01 22:56:31 +01:00
Matthew Hodgson
ee965a89a7 Merge pull request #986 from uhoreg/compact 
enable useCompactLayout user setting an add a class when it's enabled
 2017-06-01 21:32:54 +01:00
Matthew Hodgson
6c56fa3381 Merge pull request #990 from matrix-org/kegan/translation-marmoset 
Translation fixes for everything but src/components
 2017-06-01 21:22:00 +01:00
Matthew Hodgson
8e34b59d32 Revert "Revert "add labels to language picker"" 2017-06-01 19:46:25 +01:00
Matthew Hodgson
33214b8752 Merge pull request #991 from turt2live/travis/date-sep-12hr 
Support 12hr time on DateSeparator
 2017-06-01 18:26:13 +01:00
Luke Barnard
16c4c14a16 Fix to show the correct room 2017-06-01 18:01:30 +01:00
Richard van der Hoff
b3e9716126 Revert "add labels to language picker" 2017-06-01 17:52:25 +01:00
Richard van der Hoff
53ebc8d7bd Merge pull request #983 from matrix-org/rav/clear_storage_on_logout 
Call MatrixClient.clearStores on logout
 2017-06-01 17:34:21 +01:00
turt2live
ab1e277f5f Support 12hr time on DateSeparator 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-01 09:53:24 -06:00
Kegan Dougal
ced68f2719 Find a way to translate the name of RTE in user settings 
I never said it was a *nice* way...
 2017-06-01 15:53:08 +01:00
Kegan Dougal
547f10bcbb Add translations for slash command failures 2017-06-01 15:44:56 +01:00
Matthew Hodgson
ecbc724a3f Merge pull request #988 from matrix-org/matthew/room-avatar-event 
Matthew/room avatar event
 2017-06-01 14:43:29 +01:00
Matthew Hodgson
e6cf93e237 switch to imports 2017-06-01 14:42:44 +01:00
daniel tygel
b8e26ddf3d add labels to language picker 2017-06-01 09:48:36 -03:00
Matthew Hodgson
00750b4686 quick and dirty RoomAvatarEvent 2017-06-01 13:31:24 +01:00
Matthew Hodgson
d689d4e1fa quick and dirty RoomAvatarEvent 2017-06-01 13:31:15 +01:00
Luke Barnard
dd48b3f055 Add comment 2017-06-01 10:08:02 +01:00
Hubert Chathi
92d1a9a6ff enable useCompactLayout user setting an add a class when it's enabled 
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
 2017-05-31 22:00:30 -04:00
Matthew Hodgson
3d91b31637 i18n invited, and delete stale warning 2017-06-01 01:29:07 +01:00
Matthew Hodgson
b4284cf000 fix up Can't connect to HS i18n with _tJsx 2017-06-01 01:17:39 +01:00
turt2live
165dfeccb9 Fix rare case where presence duration is undefined & i18n 2017-05-31 11:56:04 -06:00
Richard van der Hoff
cbbed3f544 Fixes to i18n code 2017-05-31 18:31:10 +01:00
Richard van der Hoff
c3d37c1ff9 Call MatrixClient.clearStores on logout 
... to make sure that we don't have any sensitive data sitting around in the
stores.
 2017-05-31 18:28:21 +01:00
Luke Barnard
8192374481 Add missing _t import 2017-05-31 16:02:42 +01:00
Luke Barnard
7abaadddde Merge pull request #977 from matrix-org/luke/session-store-null-on-logout 
Remove cachedPassword from localStorage on_logged_out
 2017-05-31 16:00:24 +01:00
Luke Barnard
d0e270bd1c Only re-render LoggedInView if MatrixClientPeg.get() is truthy 2017-05-31 15:15:27 +01:00
Richard van der Hoff
2d73f094ff Delint MatrixChat, again (#979) 
grrr.
 2017-05-31 15:09:09 +01:00