Commit Graph

8807 Commits

Author SHA1 Message Date
Ben Parsons 5566fd4f32
Merge pull request #9154 from vector-im/benp/labs-docs
"Render simple counters in room header" details
2019-03-22 14:58:37 +00:00
Ben Parsons d098857d5a wrap text and link from README.md 2019-03-22 14:49:44 +00:00
Ben Parsons 24296ca44e Merge branch 'develop' into benp/labs-docs 2019-03-22 14:45:01 +00:00
Travis Ralston 8e5147976a
Merge pull request #9238 from vector-im/travis/buildkite2
Use medium agents for the more resource intensive builds
2019-03-21 12:11:44 -06:00
Travis Ralston 8b097bcd8c Use medium agents for the more resource intensive builds 2019-03-21 11:00:06 -06:00
Bruno Windels 7fb4b32e8f update react-sdk version in yarn lockfile 2019-03-21 13:55:46 +01:00
Bruno Windels f777c2c9bc Merge branch 'master' into develop 2019-03-21 11:40:43 +01:00
Bruno Windels e413d69d0b Merge branch 'release-v1.0.5' 2019-03-21 11:40:30 +01:00
Bruno Windels c8692473a4 v1.0.5 2019-03-21 11:37:35 +01:00
Bruno Windels a84a599f16 Prepare changelog for v1.0.5 2019-03-21 11:37:35 +01:00
Bruno Windels 0dd1a7b309 v1.0.5 2019-03-21 11:34:17 +01:00
Bruno Windels 4792eb4aa4 bump matrix-react-sdk version to 1.0.5 2019-03-21 11:31:12 +01:00
David Baker 5fcf884303
Merge pull request #9223 from vector-im/dbkr/buildkite_group_logs
Add log grouping to buildkite
2019-03-20 21:47:28 +00:00
David Baker 930ac3ae18 Add log grouping to buildkite
It mostly truncates the log anyway but what are you gonna do
2019-03-20 21:33:25 +00:00
J. Ryan Stinnett 38a24bf4ce
Merge pull request #9222 from jryans/git-proto
Switch to `git` protocol for CI dependencies
2019-03-20 20:53:19 +00:00
J. Ryan Stinnett 52ad757cf4 Switch to `git` protocol for CI dependencies
If you try to clone a repo that doesn't exist via `https`, `git` will prompt for
auth credentials and hang forever. Using `git` avoids this and fails immediately
instead, which is what we want for a missing repo.

Part of https://github.com/vector-im/riot-web/issues/9221
2019-03-20 18:06:18 +00:00
J. Ryan Stinnett 82d7457168
Merge pull request #9212 from jryans/ci-forks
Support CI for matching branches on forks
2019-03-20 09:57:03 +00:00
J. Ryan Stinnett f5c28a19e1 Support CI for matching branches on forks
Currently, people with push access to the main Riot repos can push matching
branch names to Riot and the SDKs, and CI will test all the branches together.
This change allows contributors to access the same ability when submitting
several matching PRs from their fork of each repo.

Part of https://github.com/vector-im/riot-web/issues/9041
2019-03-19 18:17:27 +00:00
David Baker 9735c332ff Merge branch 'master' into develop 2019-03-18 16:27:39 +00:00
David Baker 2de1f375fa Update yarn.lock
which wasn't updated at release time
2019-03-18 16:27:01 +00:00
David Baker 42c2692d28 Merge branch 'master' into develop 2019-03-18 14:20:09 +00:00
David Baker dceb2dd671 v1.0.4 2019-03-18 14:16:23 +00:00
David Baker 9001416343 Prepare changelog for v1.0.4 2019-03-18 14:16:23 +00:00
David Baker 5254cef980 v1.0.4 2019-03-18 14:11:52 +00:00
David Baker 59ebb15fe9 Released js-sdk & react-sdk 2019-03-18 14:11:09 +00:00
David Baker e6addecd8f
Merge pull request #9199 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2019-03-18 10:18:54 +00:00
Weblate 2029aa31d3 Merge branch 'origin/develop' into Weblate. 2019-03-18 09:26:44 +00:00
Micheál Ó hÓgáin 8b3f473b60 Translated using Weblate (Irish)
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/ga/
2019-03-18 09:26:43 +00:00
Gene Wood 723d28e549 Translated using Weblate (English (United States))
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/en_US/
2019-03-18 09:26:42 +00:00
Micheál Ó hÓgáin fae63d04e0 Added translation using Weblate (Irish) 2019-03-17 01:41:44 +00:00
Travis Ralston abb6bee44d
Merge pull request #9177 from vector-im/travis/browser-support-docs
Declare the officially supported browsers in the README
2019-03-15 12:04:17 -06:00
J. Ryan Stinnett faa9932c77
Merge pull request #9011 from vector-im/t3chguy/local-config
Document some desktop app things
2019-03-15 17:53:55 +00:00
J. Ryan Stinnett 95611d2c12
Update README.md grammar 2019-03-15 17:53:20 +00:00
Travis Ralston 25c767c79e Merge remote-tracking branch 'origin/develop' into travis/browser-support-docs 2019-03-15 11:44:09 -06:00
Travis Ralston 771909eddb
Merge pull request #9165 from vector-im/travis/buildkite
Use Buildkite for CI
2019-03-15 11:43:43 -06:00
Travis Ralston 631fcb0ad2 Cross-promote mobile apps 2019-03-15 11:43:00 -06:00
Travis Ralston df7b617881 Fix downstream branch fetching
We should be giving the PR the best possible chance at passing the build.
2019-03-15 10:23:43 -06:00
Tom Lant bccdd60889
Update issue templates 2019-03-15 14:24:45 +00:00
Travis Ralston e47728e0e4 Declare the officially supported browsers in the README
Fixes https://github.com/vector-im/riot-web/issues/8701
2019-03-14 12:59:57 -06:00
J. Ryan Stinnett 61a79a36f8
Merge pull request #9170 from Mikaela/issue-templates
Update version number in issue templates
2019-03-14 10:14:22 +00:00
Mikaela Suomalainen 49165a09c3
Update version number in issue templates
Signed-off-by: Mikaela Suomalainen <mikaela+git@mikaela.info>
2019-03-14 12:03:11 +02:00
Travis Ralston ef6313fbb4 Use the right CI branch 2019-03-13 22:44:28 -06:00
Travis Ralston 1fb8b23d4c Set up BuildKite for Chrome 2019-03-13 22:03:37 -06:00
Travis Ralston f6d4c6a5a3 Lint doesn't need develop deps 2019-03-13 18:40:48 -06:00
Travis Ralston 0b4c52c032 Remove Travis (CI)
We're using BuildKite now
2019-03-13 18:40:48 -06:00
Travis Ralston b6cdaa8597 Add a basic BuildKite :pipeline: 2019-03-13 18:40:47 -06:00
Travis Ralston 1d51507134
Merge pull request #9159 from vector-im/travis/node-8-isnt-real
Remove node 8.x from the build matrix
2019-03-13 14:48:33 -06:00
Travis Ralston 789a0da176 Remove irrelevant warning 2019-03-13 14:39:10 -06:00
Travis Ralston df164d7489 Remove node 8.x from the build matrix
We don't support Node 8 anymore. Also the build is broken.
2019-03-13 14:10:12 -06:00
Travis Ralston 6ac69c109c
Merge pull request #9157 from aaronraimist/electron-help
Update Electron help menu link
2019-03-13 13:52:31 -06:00