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
a98792b05e
auto-launch support, ux =checkbox in UserSettings[Electron]
...
settings are sorta generic, probably reusable for proxy settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-24 15:52:08 +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
aaf948017a
Make language dropdown a more sensible width
2017-05-24 14:37:12 +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
d4aa428321
Move translation status image to i18n section
2017-05-24 14:23:34 +01:00
David Baker
d5425b62a1
Don't inject languages into the config
...
If we're defaulting this it should really be by the component
itself or with the other defaukts in SdkConfig, but we've decided
to leave out support for reading languages from the config file as
it's only useful for a Riot admin to restrict the choice of
languages available to users which is of debateable use.
2017-05-24 11:27:06 +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
Michael Telatynski
c63e429c76
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep
2017-05-24 10:56:36 +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
ff1567ed2a
Remove spurious import
2017-05-23 17:09:09 +01:00
David Baker
af6cc7bf9c
I don't really see why this is necessary
2017-05-23 17:06:49 +01:00
David Baker
caca5cc00b
Remove c+ped UserSettingsStore functions
...
as they don't seem to be necessary
2017-05-23 17:06:02 +01:00
David Baker
241d95293e
Code style fixes
...
Use async/await consistently rather than flipping between that and
callbacks, s/var/let/, indenting
2017-05-23 16:44:54 +01:00
David Baker
a6b11968a4
s/tabs/spaces/
2017-05-23 16:15:52 +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
3f3f230a77
Remove accidentally comitted yarn stuff
2017-05-23 14:20:51 +01:00
David Baker
6b6fa59f3e
Squash merge https://github.com/vector-im/riot-web/pull/3636
2017-05-23 14:12:53 +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
8994c2bad1
missed a concat :)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-22 19:28:01 +01:00
Michael Telatynski
e0fb2fd074
/me forgets we don't have babel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-22 19:25:56 +01:00
Michael Telatynski
4bb054c955
electron stuff isn't actually using flow, so don't enable it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-22 19:25:18 +01:00
Michael Telatynski
911c3bcf6e
tidy electron files, they were starting to annoy me
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-22 19:21:52 +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
Michael Telatynski
4944bfdaa2
onAction support in Electron process, disable powersave when in call
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-22 18:32:39 +01:00
Michael Telatynski
f57d8e4cb9
make ESLint a touch happier
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-22 18:31:30 +01:00
Michael Telatynski
755c66b9f1
pass dispatcher through to electron, on a whitelist basis
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-22 18:30:45 +01:00
Richard Lewis
998739a7dc
Edit icon and styling
2017-05-22 18:00:40 +01:00
Richard Lewis
b111579aed
App tile events
2017-05-22 18:00:17 +01:00
David Baker
7d59742a22
Merge pull request #3975 from vector-im/t3chguy/riot-desktopt-linux-cat
...
add menu category for linux build of app
2017-05-22 16:59:27 +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
Michael Telatynski
6e8516e537
fiiine!
2017-05-22 16:53:46 +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