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
735c298de3
Merge branch 'release-v0.8.4' into develop
2016-11-02 12:01:30 +00:00
db07ef7899
Update readme to point to github releases
...
not /packages
2016-11-02 12:01:01 +00:00
03caaeef07
Back to develop js-sdk & react-sdk
2016-11-02 11:47:30 +00:00
91793a7a8e
v0.8.4-rc.2
2016-11-02 11:40:04 +00:00
7323ae5bf5
Prepare changelog for v0.8.4-rc.2
2016-11-02 11:40:04 +00:00
d04cc03c1c
Take version from first arg, if given
2016-11-02 11:38:11 +00:00
4fb273284d
v0.8.4-rc.1
2016-11-02 11:17:36 +00:00
3bfdbad5ba
Prepare changelog for v0.8.4-rc.1
2016-11-02 11:17:36 +00:00
890751951c
Released js-sdk & react-sdk
2016-11-02 11:11:40 +00:00
f2e59f1bd3
matrix-js-sdk dep back to develop
2016-11-02 11:10:20 +00:00
a8a6a9d73d
v0.7.5-rc.1
2016-11-02 11:08:02 +00:00
6cd55e0811
Prepare changelog for v0.7.5-rc.1
2016-11-02 11:08:02 +00:00
2cb9e606be
Use released js-sdk
2016-11-02 11:03:52 +00:00
ba7e02c3b1
Merge pull request #2528 from vector-im/dbkr/package_is_now_dist
...
Rename the package script/output dir to 'dist'
2016-11-01 15:48:06 +00:00
622ab27254
gitignore dist
2016-11-01 15:35:41 +00:00
a6417c287f
Merge pull request #530 from matrix-org/dbkr/no_pack_world
...
Explicitly list files in package.json
2016-11-01 15:27:21 +00:00
f17e851435
Rename the package script/output dir to 'dist'
...
To match conventions from other projects and match the release
script which expects releasde artefacts in dist/
2016-11-01 15:22:06 +00:00
ce19739899
Remove .npmignore as it's superseeded by 'files'
...
And also seems to be out of date anyway
2016-11-01 15:16:49 +00:00
3e8fcac303
Explicitly list file sin package.json
...
To avoid publishing whatever happens to be in the working copy.
Equivalent of https://github.com/vector-im/vector-web/pull/2516
for react-sdk.
2016-11-01 15:15:31 +00:00
9e69b48762
Merge pull request #529 from matrix-org/rav/fix_codestyle_quoting
...
Fix some markdown in the code style doc
2016-11-01 13:13:22 +00:00
86a24fb5de
Fix some markdown ih the code style doc
2016-11-01 11:33:06 +00:00
8349ea4b0e
fix code style for ES6 classes
2016-11-01 10:58:56 +00:00
5e84a6c39e
Merge pull request #2518 from vector-im/rav/ignore_olm_if_missing
...
Avoid errors if olm is missing
2016-10-27 10:28:27 +01:00
a86f2720bc
Avoid errors if olm is missing
...
If olm isn't installed, webpack prints out scary warnings (though it still
actually succeeds). Let's avoid scaring people by quietly removing it from the
list of things to process.
2016-10-27 10:16:10 +01:00
a53c1958eb
Merge pull request #527 from matrix-org/dbkr/highlight_async
...
Run highlight.js asynchronously
2016-10-27 09:57:23 +01:00
David Baker
David Baker
Richard van der Hoff
Richard van der Hoff
Mark Haines
Matthew Hodgson