gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,818 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

7818 Commits

Author SHA1 Message Date
Jonas Jelten 5a051824c0 configure auth footer links through sdkconfig 
Signed-off-by: Jonas Jelten <jelten@in.tum.de>
 2019-03-28 12:32:10 +01:00
David Baker d1a5b79bc3 v1.0.6-rc.1 2019-03-27 17:47:47 +00:00
David Baker c9e70fb0c6 Prepare changelog for v1.0.6-rc.1 2019-03-27 17:47:46 +00:00
David Baker f392a00138 v1.0.6-rc.1 2019-03-27 17:46:32 +00:00
David Baker d747896354 react-sdk & js-sdk rc.1 2019-03-27 17:44:30 +00:00
J. Ryan Stinnett a8e4949616 Update matrix-mock-request 2019-03-27 15:09:34 +00:00
J. Ryan Stinnett e8ec6cc1b1
Merge pull request #9279 from jryans/storage-edge-cases 
Use `on_logged_in` action in tests
 2019-03-27 09:22:30 +00:00
J. Ryan Stinnett fef69b54fb Use `on_logged_in` action in tests 
This changes the way tests wait for login to complete from a timer-based system
(which can cause intermittent failures) to an action-based system. The lifecycle
code dispatches the action `on_logged_in` when login completes which we can wait
for in the tests as a much better indication that work is done.
 2019-03-26 15:21:53 +00:00
Eden Tyler-Moss f4a0ff3642 Added translation using Weblate (English (United Kingdom)) 2019-03-26 14:44:27 +00:00
J. Ryan Stinnett 5112b33af2 Remove unused test helper 2019-03-26 14:41:10 +00:00
J. Ryan Stinnett 2e24b0c53b
Merge pull request #9278 from jryans/storage-edge-cases 
Convert away from `Promise.defer`
 2019-03-26 13:26:00 +00:00
J. Ryan Stinnett f321aba4ac Convert away from `Promise.defer` 
`Promise.defer` is deprecated in Bluebird and it logs loudly each time it's
called. This cleans up testing logs significantly by converting away from it.
 2019-03-26 12:46:26 +00:00
J. Ryan Stinnett 7ac117f964
Merge pull request #9233 from vector-im/bwindels/updatelockafterrelease 
update react-sdk version in yarn lockfile
 2019-03-26 11:17:45 +00:00
Peter Vágner 9d133eea75 Translated using Weblate (Slovak) 
Currently translated at 63.1% (12 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/sk/
 2019-03-26 10:58:31 +00:00
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