842b5aed56
The variable is called roomId here
2016-11-03 17:13:02 +00:00
a6d029c556
Fix copyright
2016-11-03 17:06:41 +00:00
d61714ab8d
Merge branch 'markjh/encrypted-attachments' of github.com:matrix-org/matrix-react-sdk into markjh/encrypted-attachments
2016-11-03 16:39:32 +00:00
e949d91162
Handle decryption errors
2016-11-03 16:39:20 +00:00
46301727c3
Actually add isomorphic-fetch
2016-11-03 15:53:52 +00:00
ed9c29d365
Use require so we can import conditionally
2016-11-03 15:45:12 +00:00
527c390152
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-03 15:35:45 +00:00
a6c794cb11
Merge pull request #2542 from vector-im/rav/webpack-dev-server
...
Use webpack-dev-server instead of http-server
2016-11-03 15:35:17 +00:00
ff462580b0
Use webpack-dev-server instead of http-server
...
Advantages:
* blocks while a rebuild is in progress so you're less likely to reload the
old version
* serves from memory rather than disk, so we no longer need to turn off the
cachebuster to avoid filling the disk with bundles. Empirically, seems to
last a plausible amount of time without OOMing; there's no real reason to
believe it would use any more memory than webpack itself.
* That in turn means we no longer need the hack to stop chrome caching old
sourcemaps (because the sourcemap now has a cachebuster in its name).
* one fewer process for parallelshell to (fail to) manage.
* in future, we could consider the fancy hot-reload functionality.
2016-11-03 15:08:55 +00:00
6869c679ef
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-03 14:58:12 +00:00
4dab36d3b2
Merge pull request #2541 from vector-im/dbkr/blank_config_3
...
Better support no-config when loading from file
2016-11-03 14:56:16 +00:00
cfe63fa274
Better support no-config when loading from file
...
We should still error if given a 5xx with an empty body.
2016-11-03 14:43:10 +00:00
c1469f4e39
Merge pull request #2540 from vector-im/dbkr/fix_no_config
...
Fix loading with no config from HTTP
2016-11-03 14:20:30 +00:00
3601b44429
Fix loading with no config from HTTP
2016-11-03 14:17:23 +00:00
b3510d6973
Comment the menu stuff that we only do on mac
2016-11-03 13:37:40 +00:00
d9780239b6
Make indenting consistent with rest of project
2016-11-03 13:33:49 +00:00
fb3ca441ba
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-03 13:32:01 +00:00
31a47a9efd
Merge pull request #532 from matrix-org/dbkr/platform_version
...
Move 'new version' support into Platform
2016-11-03 13:30:30 +00:00
efd0dab316
Merge pull request #2532 from vector-im/dbkr/platform_version
...
Move 'new version' support into Platform
2016-11-03 13:30:19 +00:00
f1b72dfa09
Fix copyright
2016-11-03 11:51:41 +00:00
4d0b492ba0
Merge remote-tracking branch 'origin/develop' into dbkr/platform_version
2016-11-03 11:51:23 +00:00
8cafe4936d
Merge remote-tracking branch 'origin/develop' into dbkr/platform_version
2016-11-03 11:51:06 +00:00
3bcb447e03
Fix copyright
2016-11-03 11:48:49 +00:00
d408b7c180
Fix copyright
2016-11-03 11:47:57 +00:00
108af83ae8
Just bind the right function to the button
...
rather than deciding in onChangelogClicked
2016-11-03 11:43:50 +00:00
275a55266b
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-02 19:46:02 +00:00
5ae4228bfe
Merge remote-tracking branch 'origin/develop' into dbkr/platform_version
2016-11-02 19:45:40 +00:00
0944408946
Merge pull request #534 from matrix-org/dbkr/platform_notification
...
Move Notifications into Platform
2016-11-02 19:44:12 +00:00
18504ca14e
Merge pull request #2533 from vector-im/dbkr/platform_notification
...
Add Notification support to the Web Platform
2016-11-02 19:43:17 +00:00
6aba9f8eda
Don't always claim we have notif support
...
Only if the browser has the Notification API
2016-11-02 19:26:07 +00:00
743e54f9bb
Specify promise arg
2016-11-02 19:23:09 +00:00
e8494c3dc7
Split NewVersionBar release notes / changelog
...
and change the class to use React createClass syntax while I'm at
it, rather than a completely different third style we use nowhere
else in the project.
2016-11-02 19:20:11 +00:00
caa3cb7d89
Electron support
...
From https://github.com/vector-im/vector-web/pull/2511 but with
just the actual electron changes
2016-11-02 18:49:28 +00:00
67dbd9fba9
Merge pull request #2534 from vector-im/dbkr/config_accept_blank
...
Use the defaults if given a blank config file
2016-11-02 18:42:39 +00:00
19238b9326
Use the defaults if given a blank config file
...
This allows Vector to load from file:// URIs without breaking if
there is no config file (because we explicitly look for 404s, and
file:// URIs don't return 404s).
2016-11-02 17:57:27 +00:00
8c3fed7559
CSS for changelogs
2016-11-02 17:48:47 +00:00
17bb47676e
Make VectorBasePlatform
...
For template methods that are only used from within vector (ie. new version
support)
2016-11-02 17:45:35 +00:00
bd3fa6a7c5
Move version specific stuff to vector
2016-11-02 17:44:57 +00:00
757604fd60
Add Notification support to the Web Platform
...
Except display notification which was already accidentally included in a
previous PR
2016-11-02 17:36:48 +00:00
920e3346dc
Move Notifications into Platform
...
Also add support for clearing notifications if the Platform
supports it.
2016-11-02 17:35:31 +00:00
c75118caa2
Merge branch 'develop' into dbkr/platform_version
2016-11-02 16:35:31 +00:00
b057577b15
Merge branch 'develop' into dbkr/platform_version
2016-11-02 16:34:43 +00:00
e0cea74c7e
Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them
2016-11-02 16:26:10 +00:00
0b5085ecbb
Merge pull request #2531 from vector-im/dbkr/platform
...
Implement Platforms
2016-11-02 16:21:14 +00:00
58c0e0e056
Merge pull request #531 from matrix-org/dbkr/platform
...
Move platform-specific functionality into Platform
2016-11-02 16:20:20 +00:00
29bdf992ff
s/fir/for/
2016-11-02 16:15:35 +00:00
64fdb290eb
Move 'new version' support into Platform
2016-11-02 16:02:55 +00:00
3c4370c180
Move 'new version' support into Platform
...
Also adds support for the platform providing a changelog
2016-11-02 15:58:17 +00:00
a714edbf2b
Implement Platforms
...
Provide WebPlatform for functionality specific to the web version of vector.
2016-11-02 15:12:51 +00:00
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
David Baker
Mark Haines
David Baker
Richard van der Hoff
Richard van der Hoff