Commit Graph

11 Commits

Author SHA1 Message Date
Andrey Meshkov 72db014905 Pull request: added companiesdb script, fix #2793
Merge in DNS/adguard-home from 2793-whotracksme to master

Squashed commit of the following:

commit eff9de98b389ba087eb529c12e3ec916842aa8c3
Merge: bf9bc6a4 49eb62ae
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 16:38:53 2021 +0300

    Merge branch 'master' into 2793-whotracksme

commit bf9bc6a4f5c1d7e4b6265f1c33bd532ec5b58cc7
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 16:04:57 2021 +0300

    scripts: fix review comments

commit 5a035cabc1a75a3c750a4a7a36af38ad9f33959b
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 15:47:41 2021 +0300

    added companiesdb script, fix #2793
2021-12-15 16:44:28 +03:00
Ainar Garipov 0122710750 Pull request: scripts: imp i18n upload script
Merge in DNS/adguard-home from imp-i18n-script to master

Squashed commit of the following:

commit 2ea88dcfaf24722f2b7568802a54cbe4f8ebc084
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 3 16:05:00 2021 +0300

    scripts: imp i18n upload script
2021-12-03 16:20:10 +03:00
Ainar Garipov d2c9052dde Pull request: all: fix some typos
Merge in DNS/adguard-home from fix-typos to master

Squashed commit of the following:

commit d6a79ea60fea9e9f8bebbe845f403787b93e6f66
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 17 15:54:09 2021 +0300

    all: fix some typos
2021-08-17 15:58:40 +03:00
Eugene Burkov 755a5055c6 Pull request: 3033 verbose version output
Merge in DNS/adguard-home from 3033-version-bug to master

Closes #3033.

Squashed commit of the following:

commit b10bd35c5c2e5a922af730e5c0930e6cd92c7855
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon May 24 21:15:46 2021 +0300

    all: fix & imp scripts, rm main module version
2021-05-24 21:46:33 +03:00
Ainar Garipov 01a25323f8 Pull request: scripts: imp sh scripts
Updates #2275.

Squashed commit of the following:

commit 2c44e7f490eafcfb2798037f9e0b7e6f8af42b75
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri May 21 15:32:44 2021 +0300

    scripts: imp sh scripts
2021-05-21 15:40:44 +03:00
Ainar Garipov 1402145cdd Pull request: all: improve build reproducibility
Updates #2959.

Squashed commit of the following:

commit 2178c73835454b75b6b0790322df3975e1d14f10
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 30 19:34:39 2021 +0300

    all: improve build reproducibility
2021-04-30 19:51:23 +03:00
Ainar Garipov 55d4c7ee4f Pull request: scripts: fix readme
Merge in DNS/adguard-home from fix-scripts-readme to master

Squashed commit of the following:

commit dae6aa9f9f69b30d2c949c958b2af413f4ac63be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 10 20:18:49 2021 +0300

    scripts: fix readme
2021-03-10 20:26:35 +03:00
Ainar Garipov 6de54b3b99 Pull request: scripts: add more control to build-release, imp docs
Updates #2608.

Squashed commit of the following:

commit 59f68f2da22c111a73660a6b799e0429b79f743d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Feb 2 15:49:54 2021 +0300

    scripts: add more control to build-release, imp docs
2021-03-10 20:12:18 +03:00
Ainar Garipov 2d7042425e Pull request: scripts: imp version
Merge in DNS/adguard-home from 2412-versions to master

Squashed commit of the following:

commit 8c7f11cd2d8987c611a4e828482ba039a55ef677
Merge: 43cd0374 1789c96c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 10 17:05:58 2021 +0300

    Merge branch 'master' into 2412-versions

commit 43cd0374b7c200fdc45e153781e94ca23cf46b7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Mar 5 15:27:13 2021 +0300

    scripts: imp version
2021-03-10 18:08:47 +03:00
Ainar Garipov 4aa6f77a61 Pull request: all: imp tests, docs
Merge in DNS/adguard-home from imp-tests to master

Squashed commit of the following:

commit 15e1bd4ac38e95aa7dce716679d9a6bea43c5964
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 29 19:41:03 2021 +0300

    scripts: imp docs

commit bc54ce4e703dd4b2956636e0bd554073c9aa12c6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 29 19:39:26 2021 +0300

    all: imp tests, docs
2021-01-29 20:00:11 +03:00
Ainar Garipov 0e84962fde Pull request: all: add a new Makefile and scripts, remove goreleaaser
Merge in DNS/adguard-home from 2276-releases to master

Updates #2276.

Squashed commit of the following:

commit 84961947c51477aae53606ec6e2e0cce0bdfc139
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 14:36:13 2020 +0300

    all: fix github build

commit 54af2adbf2f433e80393fb142e66ba6b3a78b13e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 14:34:02 2020 +0300

    all: remove old Dockerfile, improve build scripts

commit 99bb2f2ba1458d32074ac0911b5c02ce6669e43e
Merge: 2292b677a 5e20ac7ed
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 13:47:19 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit 2292b677a20ce8e93d9e6e2bb042cd468606fec3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 13:30:10 2020 +0300

    all: improve docker build

commit 0bcc97c41f105ee4a4363f20fa4775c7643bf0cc
Merge: c7d3f12ef aef4659e9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 17:47:45 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit c7d3f12ef2b63ddfa2acf46e3129fcbc56fb0a90
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 16:28:25 2020 +0300

    all: improve build scripts

commit 55de1e5d7ef0fbdbd1a76cfb71362d16ca0a1966
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 15:36:47 2020 +0300

    all: fix Makefile

commit d11b1fe28d0fde1efeaf6160a614951b19d0ef94
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 14:16:19 2020 +0300

    scripts: fix build-release

commit ecc0577e2451afa86c37da7283a63a9d26fb37ba
Merge: dde64ed8e 483f02c92
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 13:59:32 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit dde64ed8e456f73559f21c2ca549dc3b46724add
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 25 18:04:46 2020 +0300

    all: imp docs, other improvements

commit be8574408db79901bb15c1d31916db3ca352a35f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 25 14:48:30 2020 +0300

    all: imp docker build

commit fc1876f34b93d667bf166226f4bc666d394f10c7
Merge: fa5a304c8 955b735c8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 25 13:54:29 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit fa5a304c83d86145796a2de4141de6d18f7c56bf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 19:10:51 2020 +0300

    all: improve scripts

commit 3f32e3fd5e658d058d5c5172519384efc6cfef83
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 18:50:01 2020 +0300

    all: improve scripts

commit 2d38b81421acab4b90a7a19da7598c75063e8e93
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 18:25:21 2020 +0300

    all: fix shell for windows, improve go-lint.sh

commit d695285cd6dc476c0d972cfe0c49bbeea5f5a049
Merge: 313b020e9 9fb6bf82c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 18:14:38 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit 313b020e9dfcdab736670cee72b2171eac8c32b7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 18:13:31 2020 +0300

    Makefile: use npm ci again

commit 5acee9d6a6c8cd2a7dd04b173a73929650882bad
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 17:57:54 2020 +0300

    all: try fixing windows build

commit c63a2a54641ac8cd032a3306bb35e49b9ae74728
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 17:39:30 2020 +0300

    all: imp scripts, try another goproxy and direct

commit 423229e8b63ee73caeee8e84c23f67d145aff9df
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 17:25:29 2020 +0300

    all: imp HACKING.md, try a new proxy

... and 1 more commit
2020-12-30 18:26:25 +03:00