Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,470 Commits 3 Branches 492 Tags 100 MiB
6cf14e6a2a
Commit Graph

2470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard van der Hoff
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
David Baker
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
Richard van der Hoff
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
David Baker
3601b44429 Fix loading with no config from HTTP 2016-11-03 14:17:23 +00:00
David Baker
b3510d6973 Comment the menu stuff that we only do on mac 2016-11-03 13:37:40 +00:00
David Baker
d9780239b6 Make indenting consistent with rest of project 2016-11-03 13:33:49 +00:00
David Baker
fb3ca441ba Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 13:32:01 +00:00
David Baker
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
David Baker
f1b72dfa09 Fix copyright 2016-11-03 11:51:41 +00:00
David Baker
4d0b492ba0 Merge remote-tracking branch 'origin/develop' into dbkr/platform_version 2016-11-03 11:51:23 +00:00
David Baker
3bcb447e03 Fix copyright 2016-11-03 11:48:49 +00:00
David Baker
108af83ae8 Just bind the right function to the button 
rather than deciding in onChangelogClicked
 2016-11-03 11:43:50 +00:00
David Baker
275a55266b Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-02 19:46:02 +00:00
David Baker
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
David Baker
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
David Baker
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
David Baker
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
Richard van der Hoff
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
David Baker
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
David Baker
8c3fed7559 CSS for changelogs 2016-11-02 17:48:47 +00:00
David Baker
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
David Baker
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
Richard van der Hoff
c75118caa2 Merge branch 'develop' into dbkr/platform_version 2016-11-02 16:35:31 +00:00
David Baker
0b5085ecbb Merge pull request #2531 from vector-im/dbkr/platform 
Implement Platforms
 2016-11-02 16:21:14 +00:00
David Baker
64fdb290eb Move 'new version' support into Platform 2016-11-02 16:02:55 +00:00
David Baker
a714edbf2b Implement Platforms 
Provide WebPlatform for functionality specific to the web version of vector.
 2016-11-02 15:12:51 +00:00
David Baker
735c298de3 Merge branch 'release-v0.8.4' into develop 2016-11-02 12:01:30 +00:00
David Baker
db07ef7899 Update readme to point to github releases 
not /packages
 2016-11-02 12:01:01 +00:00
David Baker
03caaeef07 Back to develop js-sdk & react-sdk 2016-11-02 11:47:30 +00:00
David Baker
91793a7a8e v0.8.4-rc.2 2016-11-02 11:40:04 +00:00
David Baker
7323ae5bf5 Prepare changelog for v0.8.4-rc.2 2016-11-02 11:40:04 +00:00
David Baker
d04cc03c1c Take version from first arg, if given 2016-11-02 11:38:11 +00:00
David Baker
4fb273284d v0.8.4-rc.1 2016-11-02 11:17:36 +00:00
David Baker
3bfdbad5ba Prepare changelog for v0.8.4-rc.1 2016-11-02 11:17:36 +00:00
David Baker
890751951c Released js-sdk & react-sdk 2016-11-02 11:11:40 +00:00
David Baker
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
David Baker
622ab27254 gitignore dist 2016-11-01 15:35:41 +00:00
David Baker
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
Richard van der Hoff
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
Richard van der Hoff
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
Richard van der Hoff
b174d49f9d Merge pull request #2515 from vector-im/rav/cache_busting 
Put a cachebuster in the names of CSS and JS files
 2016-10-26 16:58:27 +01:00
Richard van der Hoff
31ed719df1 webpack: Improve comment on HtmlWebpackPlugin 2016-10-26 16:52:26 +01:00
Richard van der Hoff
c19538d6ce Merge branch 'develop' into rav/cache_busting 2016-10-26 16:50:45 +01:00
Richard van der Hoff
3adf5fe3fd Merge pull request #2517 from vector-im/rav/upgrade_olm 
Bump to olm 2.0.0
 2016-10-26 16:50:22 +01:00
Richard van der Hoff
bd0e121f0e Merge pull request #2516 from vector-im/rav/no_pack_world 
Don't include the world in the published packages
 2016-10-26 16:48:22 +01:00
Richard van der Hoff
de1f7861d6 Bump to olm 2.0.0 2016-10-26 16:20:42 +01:00
Richard van der Hoff
5a58c8bda4 Don't include the world in the published packages 
We ended up including all sorts of stuff in our published packages. Let's take
the opposite approach and include useful stuff rather than exclude unuseful
stuff.
 2016-10-26 15:35:54 +01:00
Richard van der Hoff
6396c60645 Put a cachebuster in the names of CSS and JS files 
This means that clients can do better caching of assets, as it will mean we are
no longer reliant on etags to ensure that clients get a fresh version.

We inhibit the cachebuster for `npm start`, so that we don't get millions of
copies of the bundles on dev boxes.
 2016-10-26 15:20:59 +01:00
Richard van der Hoff
f700bb4efa Merge pull request #2514 from vector-im/rav/webpack_olm 
Use webpack to copy olm.js
 2016-10-26 15:18:27 +01:00
Richard van der Hoff
53e5894759 Merge branch 'develop' into rav/webpack_olm 2016-10-26 15:13:57 +01:00