Michael Telatynski
dcd99ac3de
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings
...
# Conflicts:
# src/components/structures/UserSettings.js
# src/i18n/strings/en_EN.json
First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:54:57 +01:00
Michael Telatynski
1bba419235
add flow annotation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 20:02:46 +01:00
Michael Telatynski
d484372c7f
introduce concept of platform name, based on class name, because webpack.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:50:04 +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
811cd79206
Make the clear cache button work on desktop
...
Fixes https://github.com/vector-im/riot-web/issues/3597
2017-04-10 17:39:27 +01:00
David Baker
18d4d3392a
Fix a bunch of linting errors
...
eslint --fix and a few manual ones
2017-01-20 14:22:27 +00:00
David Baker
a16aae1124
Move screen sharing error check into platform
...
Because on the browser it depends on HTTPS, on electron it doesn't
matter.
2017-01-10 18:37:57 +00:00
David Baker
28e663dd48
Pass the room object into displayNotification
...
It needs it to do the view_room if the notification is clicked.
2016-12-06 13:27:36 +00:00
David Baker
d871ca2b24
PR feedback
2016-11-08 11:43:24 +00:00
David Baker
d44adcb7a9
Fix the vector web version in UserSettings
...
Add a getAppVersion() function to the platform rather than relying
on the updater code firing an event before we know what the app
version is.
2016-11-08 10:45:19 +00:00
David Baker
d408b7c180
Fix copyright
2016-11-03 11:47:57 +00:00
David Baker
743e54f9bb
Specify promise arg
2016-11-02 19:23:09 +00:00
David Baker
920e3346dc
Move Notifications into Platform
...
Also add support for clearing notifications if the Platform
supports it.
2016-11-02 17:35:31 +00:00
David Baker
f433f9ca32
Move platform-specific functionality into Platform
...
Platform classes are provided by the application via
PlatformPeg.set().
2016-11-02 15:10:21 +00:00
