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

3655 commits

Author SHA1 Message Date
Luke Barnard
c894c83fbe Remove GuestWarningBar 2017-05-25 11:02:48 +01:00
Luke Barnard
f3fc459875 Merge pull request #922 from matrix-org/luke/new-guest-access-default-welcome 
Implement default welcome page and allow custom URL /w config
 2017-05-25 10:08:34 +01:00
Luke Barnard
8fc44a9b66 Add comment to explain sync_state dispatch 2017-05-25 09:31:14 +01:00
Luke Barnard
fffe425730 Add non-null RoomView key 2017-05-24 18:04:04 +01:00
Luke Barnard
dcf2fb68ae Remove console log 2017-05-24 18:02:17 +01:00
Luke Barnard
5f36f797da Implement default welcome page and allow custom URL /w config 
This changes the default behaviour of displaying the room directory to instead displaying the default homepage. If specified, the config "welcomePageUrl" can be used to override the default '/home.html'.
 2017-05-24 17:55:36 +01:00
Luke Barnard
298c5e4df3 Implement a store for RoomView 
This allows for a truely flux-y way of storing the currently viewed room, making some callbacks (like onRoomIdResolved) redundant and making sure that the currently viewed room (ID) is only stored in one place as opposed to the previous many places.

This was required for the `join_room` action which can be dispatched to join the currently viewed room.

Another change was to introduce `LifeCycleStore` which is a start at encorporating state related to the lifecycle of the app into a flux store. Currently it only contains an action which will be dispatched when the sync state has become PREPARED. This was necessary to do a deferred dispatch of `join_room` following the registration of a PWLU (PassWord-Less User).

The following actions are introduced:
 - RoomViewStore:
    - `view_room`: dispatch to change the currently viewed room ID
    - `join_room`: dispatch to join the currently viewed room
 - LifecycleStore:
    - `do_after_sync_prepared`: dispatch to store an action which will be dispatched when `sync_state` is dispatched with `state = 'PREPARED'`
 - MatrixChat:
    - `sync_state`: dispatched when the sync state changes. Ideally there'd be a SyncStateStore that emitted an `update` upon receiving this, but for now the `LifecycleStore` will listen for `sync_state` directly.
 2017-05-24 16:56:13 +01:00
David Baker
b677a2002f Minimal UI fixes 
Add a label. Make css selector match style. Also fix import.
 2017-05-24 14:36:14 +01:00
David Baker
aef068b00e Indenting 2017-05-24 14:28:30 +01:00
David Baker
c2df23395d Fix up language dropdown 
* Read languages from the available ones rather than the config
 * Make the search work (add searchEnabled=true)
 * Move variables to the class since they were populated there
 2017-05-24 11:25:06 +01:00
Michael Telatynski
edcfb77a6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_call_sleep 2017-05-24 10:56:41 +01:00
David Baker
a95f3252b8 s/tabs/spaces/ 2017-05-24 10:48:10 +01:00
David Baker
f412552c2c Fix imports/exports 2017-05-23 18:32:45 +01:00
David Baker
cc0924f1c7 Fix imports 2017-05-23 18:16:02 +01:00
MTRNord
9bce417400 fix algorithm ReferenceError 2017-05-23 18:01:30 +01:00
David Baker
d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
David Baker
46bb29a3af Merge pull request #910 from matrix-org/t3chguy/version_anchor_newtab 
Make the linked versions open a new tab, turt2live complained :P
 2017-05-23 13:51:40 +01:00
Michael Telatynski
a10c2faac1 lets not open an attack vector :) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-23 13:12:21 +01:00
Michael Telatynski
b65ba6b080 Merge pull request #919 from matrix-org/rav/delint_slashcommands 
Fix lint errors in SlashCommands
 2017-05-23 12:10:34 +01:00
David Baker
6d30bc7182 Merge pull request #911 from matrix-org/t3chguy/autofocus_directorysearchbox 
autoFocus input box
 2017-05-23 09:57:20 +01:00
Richard van der Hoff
5df4b9de16 Fix lint errors in SlashCommands 2017-05-23 09:44:11 +01:00
Richard van der Hoff
26c8540d03 Add in a "verify" slash command to confirm signing keys (#912) 
Allows users to send a text string via an alternative channel (like email
or SMS) which Riot can leverage to confirm that the signing keys match.

Effectively removes the tedium of checking keys until a better mechanism
is completed.

Signed-off-by: Kit Sczudlo <kit@kitscz.com>
 2017-05-23 09:24:18 +01:00
Michael Telatynski
024964aceb pass call state through, for things that don't have access to full API 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 18:33:14 +01:00
Luke Barnard
b0a824c941 Remove double declaration of TextInputDialog 2017-05-22 16:28:23 +01:00
Luke Barnard
05aaa599cc Merge branch 'develop' into new-guest-access 
Conflicts:
	src/components/structures/MatrixChat.js
 2017-05-22 16:19:10 +01:00
Luke Barnard
a1f10ff46d Add prop to toggle whether new password input is autoFocused 2017-05-22 14:46:49 +01:00
Richard van der Hoff
fc08dc33c6 Group e2e keys into blocks of 4 characters 
Hopefully this will make them a bit easier to compare.
 2017-05-22 12:01:09 +01:00
Richard van der Hoff
574b820d11 Factor out DeviceVerifyDialog 2017-05-22 11:12:36 +01:00
Michael Telatynski
02a1c1868c autoFocus input box 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-20 00:08:53 +01:00
Kieran Gould
47e5e8d678 Moved isTwelveHour alllll the way up to TimelinePanel. 2017-05-19 23:04:37 +01:00
Kieran Gould
6b32975e0c Add 12 hour class to mx_EventTile 2017-05-19 22:36:13 +01:00
Kieran Gould
f9152b205c Add parameter showTwelveHours to formatTime 2017-05-19 22:29:49 +01:00
Kieran Gould
5aa1bc4185 Rename twentyFourHour 
Pad time
 2017-05-19 22:29:49 +01:00
Maxwell Kepler
008cc95e9c Add 12 hour support 2017-05-19 22:29:49 +01:00
Michael Telatynski
cc3673d2d2 Make the linked versions open a new tab, turt2live complained :P 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 17:39:21 +01:00
Richard van der Hoff
e3dbf057fb Fix 'missing page_type' error 
LoggedInView will complain if it is instantiated without a page_type, so let's
keep showing the syncing spinner until we have one.
 2017-05-19 14:09:20 +01:00
Richard van der Hoff
c61294f71c Delintify some of MatrixChat (#907) 
... it annoyed me too much.
 2017-05-19 13:53:11 +01:00
Luke Barnard
2bec44a517 Remove suffix and prefix from login input username 
This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736
 2017-05-19 10:03:51 +01:00
Luke Barnard
96c3bf56f8 Implement warm-fuzzy success dialog for SetMxIdDialog 2017-05-19 09:43:56 +01:00
Michael Telatynski
cc7edbf86d allow for sending arbitrary events, also override highlight with 
event currently being forwarded while forwardingEvent is set

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 01:29:11 +01:00
Michael Telatynski
475646a2a7 Change wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:34:35 +01:00
Michael Telatynski
a2ab36f598 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:33:36 +01:00
Michael Telatynski
bf0fe63759 don't know why I'm even tracking mounted state. Never refd 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:20:51 +01:00
Michael Telatynski
0e7e4d8595 replace weird sidebar snapping with better ui_opacity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:20:32 +01:00
David Baker
3e7a31ac75 Revert "fix scroll behaviour on macs with no gemini" 
This reverts commit 1347d9fa65.
 2017-05-18 19:03:51 +01:00
David Baker
726cd60127 Merge pull request #902 from matrix-org/dbkr/prevent_illegal_finddomnode 
Prevent an exception getting scroll node
 2017-05-18 17:56:29 +01:00
David Baker
8fe3fa9178 Remove debug logging 2017-05-18 17:35:22 +01:00
David Baker
01955146e9 Prevent an exception getting scroll node 
Don't try to findDOMNode before we're mounted as it makes react
angry.
 2017-05-18 17:33:32 +01:00
Luke Barnard
32818aff4f Simplify expression 2017-05-18 17:08:26 +01:00
Luke Barnard
ee64f4a8dd Add country prefix to country dd options 2017-05-18 17:02:19 +01:00