Commit graph

6996 commits

Author SHA1 Message Date
J. Ryan Stinnett
8b25d4f710 Nudge karma to 3.1.2
This includes a fix for detecting the version of Chrome used to run tests.
2019-02-28 13:52:34 +00:00
David Baker
e37a8dc8a1
Merge pull request from vector-im/nadonomy/electron-spinner
Updated install spinner
2019-02-28 10:20:51 +00:00
Nad Chishtie
f020995ac4 Updated install spinner referenced in 2019-02-28 11:19:00 +01:00
David Baker
0d5e80cc51 Update to electron 4.0.6 2019-02-27 17:34:36 +00:00
Travis Ralston
a5a4c167e8
Merge pull request from vector-im/t3chguy/no-update
Allow disabling update mechanism
2019-02-24 18:00:54 -07:00
Travis Ralston
9e11c70416
Merge pull request from vector-im/t3chguy/minimize_tray
Allow configuration of whether closing window closes or minimizes to tray
2019-02-24 17:33:14 -07:00
Michael Telatynski
ffacf30722 Allow disabling update mechanism
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 04:52:07 +00:00
Michael Telatynski
5a3b9ae454 more matching
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 01:38:21 +00:00
Michael Telatynski
717495c4e0 specify return types to match superclass
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 01:21:18 +00:00
Michael Telatynski
714570443d Allow configuration of whether closing window closes or minimizes to tray
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 01:08:01 +00:00
Bruno Windels
588030141b
Merge pull request from jryans/jenkins-lang-file
Fix language file path for Jenkins
2019-02-21 13:53:58 +01:00
J. Ryan Stinnett
09b17f77c2 Fix language file path for Jenkins
Jenkins seems to use a different layout of the repos than other environments.
The sub-projects are cloned inside of the `riot-web` workspace. To account for
this, we need to adjust the Riot language file path.
2019-02-21 12:31:45 +00:00
J. Ryan Stinnett
62d4bb2144
Merge pull request from vector-im/jryans/default-server-name
Document and recommend `default_server_name`
2019-02-21 10:38:37 +00:00
J. Ryan Stinnett
2dc26b4c5d Document and recommend default_server_name
This the recommended way to define a default server (instead of the existing HS
and IS URL options). It will use `.well-known` discovery to find the URLs.

See https://github.com/vector-im/riot-web/issues/8763.
2019-02-20 16:08:58 +00:00
Bruno Windels
ad04e8bee8
Merge pull request from vector-im/bwindels/moarcachebustin
Cache busting for icons & language files
2019-02-20 13:34:58 +01:00
Bruno Windels
6a9c053536 simplify config entry 2019-02-20 09:39:42 +01:00
Bruno Windels
e56206241b use same hash format as webpack defaults 2019-02-20 09:39:27 +01:00
Bruno Windels
c2d14392b2 allow setting the relative location of the language file for running the unit tests in ci, where riot-web is a subdirectory of react-sdk 2019-02-18 17:26:49 +01:00
Bruno Windels
223d8a87ca move relative path in react-sdk to webpack config file
otherwise react-sdk can't build anymore with riot-web
in a specific location
2019-02-18 16:25:19 +01:00
Bruno Windels
070cc77e0f add content hash to languages.json file using webpack file-loader 2019-02-18 16:12:04 +01:00
Bruno Windels
878190ba27 add content hash to individual language files 2019-02-18 16:11:41 +01:00
Travis Ralston
5d2d8ccc71
Merge pull request from aaronraimist/remove-redesign-issue-template
Remove redesign issue template
2019-02-15 22:10:22 -07:00
Aaron Raimist
257611f1b4
Remove redesign issue template
The redesign is just the design now

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-15 22:29:40 -06:00
Bruno Windels
2e60037d9f add cache busting for app icons and msapp config xml 2019-02-15 16:11:33 +01:00
Bruno Windels
f7e88855fe Merge branch 'master' into develop 2019-02-15 14:05:25 +01:00
Bruno Windels
c727e774c4 Merge branch 'release-v1.0.1' 2019-02-15 14:05:16 +01:00
Bruno Windels
1b501f6582 v1.0.1 2019-02-15 14:01:19 +01:00
Bruno Windels
88ed193725 Prepare changelog for v1.0.1 2019-02-15 14:01:19 +01:00
Bruno Windels
77b317b3cf v1.0.1 2019-02-15 14:00:01 +01:00
Bruno Windels
c953791cd0 bump matrix-react-sdk to 1.0.1 2019-02-15 13:57:04 +01:00
Matthew Hodgson
20dc7068af
Merge pull request from abeluck/develop
Make scripts/make-icons.sh work on linux
2019-02-15 12:28:58 +00:00
J. Ryan Stinnett
674b8c3561 Merge branch 'release-v1.0.0' 2019-02-14 17:11:09 +00:00
J. Ryan Stinnett
3b123ce5c1 v1.0.0 2019-02-14 17:08:42 +00:00
J. Ryan Stinnett
27f1c5476b Prepare changelog for v1.0.0 2019-02-14 17:08:42 +00:00
J. Ryan Stinnett
55da52debd v1.0.0 2019-02-14 17:07:27 +00:00
J. Ryan Stinnett
47fbe1f600 Update dependencies 2019-02-14 16:59:01 +00:00
J. Ryan Stinnett
bf12815473 Merge branch 'develop' into release-v1.0.0 2019-02-14 16:58:21 +00:00
J. Ryan Stinnett
b3f2857c20
Merge pull request from jryans/ansible-snip
Add snipping lines to welcome page without guests
2019-02-14 16:25:07 +00:00
J. Ryan Stinnett
fc12d62d4b Add context on snipping lines 2019-02-14 16:22:50 +00:00
J. Ryan Stinnett
7c94437177 Add snipping lines to welcome page without guests 2019-02-14 15:40:58 +00:00
David Baker
ec2af993da
Merge pull request from vector-im/dbkr/remove_white_screen_of_welcome
Add home page to fix loading tests
2019-02-14 13:46:39 +00:00
David Baker
ad95ca4e86 Add home page to fix loading tests 2019-02-14 13:29:57 +00:00
J. Ryan Stinnett
4872992ba2 Make arch specific directories 2019-02-14 13:13:53 +00:00
J. Ryan Stinnett
2b069fce75 Copy unsigned builds to separate dirs 2019-02-14 13:05:49 +00:00
J. Ryan Stinnett
0f4757c289 Fix up packaging directories for Windows 2019-02-14 12:54:26 +00:00
J. Ryan Stinnett
755ad22489 Upgrade electron-builder-squirrel-windows 2019-02-14 12:24:25 +00:00
J. Ryan Stinnett
1c1ebfa784 v1.0.0-rc.2 2019-02-14 11:20:03 +00:00
J. Ryan Stinnett
d982163911 Prepare changelog for v1.0.0-rc.2 2019-02-14 11:20:03 +00:00
J. Ryan Stinnett
21f11f02a4 v1.0.0-rc.2 2019-02-14 11:19:06 +00:00
J. Ryan Stinnett
39e16a18e2 Update dependencies 2019-02-14 11:18:24 +00:00