Commit Graph

4911 Commits (c478631db4376a945f122bcdb313d28d101c779e)

Author SHA1 Message Date
David Baker 54af06e8e1 What year is it? Who's the president? 2017-05-25 12:04:14 +01:00
David Baker 9fa6e8b1e2 Add us to copyright
As I've now added code to this file
2017-05-25 12:02:05 +01:00
David Baker bff0577cb6 Add buttons to room sub list headers
Conflicts:
	src/component-index.js
	src/components/views/rooms/RoomList.js

cherry-picking commit ce119a6.
2017-05-25 11:49:45 +01:00
David Baker d6d9a89453 Other empty sections no longer need to be greyed 2017-05-25 11:47:21 +01:00
David Baker c7776915f7 Kill off more tabs 2017-05-25 11:45:36 +01:00
David Baker 107024efa8 Unnecessary whitespace 2017-05-25 11:42:19 +01:00
David Baker 5c359e63ab Bulk change counterpart imports
to use languageHandler wrapper func
2017-05-25 11:39:08 +01:00
David Baker 5531f27435 Make the left panel more friendly to new users
https://github.com/vector-im/riot-web/issues/3609

Conflicts:
	src/components/views/rooms/RoomList.js

cherry-picking commit f5f35e3.
2017-05-25 11:24:45 +01:00
David Baker ec146c7f45 Switch to stock counterpart
We no longer need the custom counterpart. The things that were
changed in it and reasosn we no lomger need them are:

 1. set separator - this can be done with standard counterpart
 2. ES6 port: this was done to allow importing as _t, but is
    unnecessary with the _t wrapper function in react-sdk
    (although also seems to work fine with
    `import _t from 'counterpart';`)
 3. Fallback to key name: unnecessary with
    `setMissingEntryGenerator` in 0.18, but we've changed to just
    using a fallback locale anyway since No code missing en
    translations should ever make it to the devbelop branch.
 4. Logging on missing translations. Unnecessary with
    `onTranslationNotFound`, but now not used anyway because we
    let missing translations show up in the UI as
    'missing translation'

Bulk changes to imports coming in separate commit for easy reading.
2017-05-25 11:24:17 +01:00
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 454134661e Merge pull request #921 from matrix-org/luke/new-guest-access-room-view-store
Implement a store for RoomView and join the intended room after set a mxid
2017-05-25 10:07:39 +01:00
Luke Barnard 8fc44a9b66 Add comment to explain sync_state dispatch 2017-05-25 09:31:14 +01:00
Michael Telatynski 8158ec6d54 touchups
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 01:25:17 +01:00
Michael Telatynski 09d0ab7df5 attempt to make media selector work everywhere (TM)
loadDevices not only in electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 01:01:40 +01:00
Michael Telatynski a4b2bacc7e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings 2017-05-25 00:26:38 +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 c96d93b0d0 Merge branch 'new-guest-access' into luke/new-guest-access-room-view-store 2017-05-24 17:28:18 +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
Michael Telatynski b9ac1222ed remove listener on unmount
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:55:37 +01:00
Michael Telatynski 1186207658 Initial Electron Settings - for Auto Launch
(opens path for Proxy Settings)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:51:11 +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 dd1c50ce80 README formatting
Move translation status to its own heading
2017-05-23 15:30:36 +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 867f8914e1 Merge pull request #917 from matrix-org/dbkr/use_right_riot_branch
Make travis test against riot-web new-guest-access
2017-05-22 16:59:17 +01:00
Luke Barnard f2e526f1d5 Merge pull request #916 from matrix-org/dbkr/use_right_riot_branch
Add right-branch logic to travis test script
2017-05-22 16:57:03 +01:00
David Baker 52d3dd4de9 cd first so we checkout the right repo 2017-05-22 16:48:53 +01:00
David Baker c5a873c316 Remove depth=1 otherwise we won't find the branch 2017-05-22 16:41:43 +01:00
David Baker 77cd9d78db Use develop if no matching branch found 2017-05-22 16:34:15 +01:00
Luke Barnard b0a824c941 Remove double declaration of TextInputDialog 2017-05-22 16:28:23 +01:00
David Baker 2c462bdfb4 Add right-branch logic to travis test script 2017-05-22 16:27:41 +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
David Baker e4d35881f6 Merge pull request #915 from matrix-org/luke/new-guest-access-autoFocus-new-password
Add prop to toggle whether new password input is autoFocused
2017-05-22 15:19:56 +01:00
Luke Barnard a1f10ff46d Add prop to toggle whether new password input is autoFocused 2017-05-22 14:46:49 +01:00