From 0aa5c71d5907c32b3945094ca7fa17ff1938dfef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= Date: Tue, 23 Jan 2018 22:17:55 +0100 Subject: [PATCH 1/2] Bump version code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Óscar García Amor --- ultrasonic/version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ultrasonic/version.properties b/ultrasonic/version.properties index 10872cb1..9ebbcbd4 100644 --- a/ultrasonic/version.properties +++ b/ultrasonic/version.properties @@ -1,2 +1,2 @@ -#Mon Jan 22 14:58:03 CET 2018 -AI_VERSION_CODE=61 +#Tue Jan 23 22:14:32 CET 2018 +AI_VERSION_CODE=62 From 3c21631f30d9a627273957e939d6deea08dee5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= Date: Wed, 24 Jan 2018 11:06:45 +0100 Subject: [PATCH 2/2] Added translations section in contributing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Óscar García Amor --- CONTRIBUTING.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9830cd59..63bbb71c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,21 +5,29 @@ Ultrasonic development is a community project, and contributions are welcomed. First, see if your issue haven’t been yet reported [here](https://github.com/ultrasonic/ultrasonic/issues), then, please, first discuss the change you wish to make via [a new issue](https://github.com/ultrasonic/ultrasonic/issues/new). +## Contributing Translations + +Interested in help to translate Ultrasonic? You can contribute in our +[Transifex team](https://www.transifex.com/ultrasonic/ultrasonic/). + +## Contributing Code + By default Pull Request should be opened against **develop** branch, PR against **master** branch should be used only for critical bugfixes. ### Here are a few guidelines you should follow before submitting: -1. **License Acceptance:** All contributions must be licensed as [GNU GPLv3](LICENSE) to be accepted. + +1. **License Acceptance:** All contributions must be licensed as [GNU GPLv3](LICENSE) to be accepted. Use `git commit --signoff` to acknowledge this. 2. **App is migrating to [Kotlin](https://kotlinlang.org/) programming language:** new Pull Requests should be written in this programming language. -3. **No Breakage:** New features or changes to existing ones must not degrade the user experience. -4. **Coding standards** best-practices should be followed, comment generously, and avoid "clever" algorithms. +3. **No Breakage:** New features or changes to existing ones must not degrade the user experience. +4. **Coding standards:** best-practices should be followed, comment generously, and avoid "clever" algorithms. Refactoring existing messes is great, but watch out for breakage. -5. **No large PR:*** Try to limit the scope of PR only to the related issue, so it will be easier to review +5. **No large PR:** Try to limit the scope of PR only to the related issue, so it will be easier to review and test. -## Pull Request Process +### Pull Request Process 1. Ensure all commits are signed-off. 2. Check tests for the new code are added.