diff --git a/BUILDS.md b/BUILDS.md index 3a1db764..53a1582e 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -19,7 +19,6 @@ Otherwise, the sending of crash reports will be disabled. export MSYSTEM= ``` - ### Build Bridge * in project root run @@ -44,6 +43,12 @@ make build-ie * for `windows`, the binary will have the file extension `.exe` (e.g `proton-bridge.exe`) * for `darwin`, the application will be created with name of the project directory (e.g `proton-bridge.app`) +### Tags +Note that repository contains both Bridge and Import-Export apps and they are +not released together. Therefore, each app has own tag prefix. Bridge tags +starts with `br-` and Import-Export tags starts with `ie-`. Both tags continues +with semantic versioning `MAJOR.MINOR.PATCH`. An example of full tag is +`br-1.4.4` or `ie-1.1.2` (current versions in October 2020). ## Useful tests, lints and checks In order to be able to run following commands please install the development dependencies: diff --git a/Changelog.md b/Changelog.md index d2bc6767..524b8380 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/) ### Added * GODT-763 Detect Gmail labels from All Mail mbox export (using X-Gmail-Label header). +* GODT-834 Info about tags in BUILDS.md and link to Import-Export page in README.md. ### Fixed * GODT-749 Don't force PGP/Inline when sending plaintext messages. diff --git a/README.md b/README.md index f2bfcd01..7eae0f45 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # ProtonMail Bridge and Import Export app Copyright (c) 2020 Proton Technologies AG -This repository holds the ProtonMail Bridge application. +This repository holds the ProtonMail Bridge and the ProtonMail Import-Export applications. For a detailed build information see [BUILDS](./BUILDS.md). For licensing information see [COPYING](./COPYING.md). For contribution policy see [CONTRIBUTING](./CONTRIBUTING.md). @@ -35,6 +35,8 @@ configure transfer rules (match source and target mailboxes, set time range limits and so on) and hit start. Once the transfer is complete, check the results. +More details [on the public website](https://protonmail.com/import-export). + ## Keychain You need to have a keychain in order to run the ProtonMail Bridge. On Mac or Windows, Bridge uses native credential managers. On Linux, use