Skip to content

Commit f5942e5

Browse files
authored
Merge pull request #14 from fossasia/development
chore: merge development into master branch
2 parents 049fc8f + af3de46 commit f5942e5

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed

.github/ISSUE_TEMPLATE

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Actual Behaviour**
2+
3+
Please state here what is currently happening.
4+
5+
**Expected Behaviour**
6+
7+
State here what the feature should enable the user to do.
8+
9+
**Steps to reproduce it**
10+
11+
Add steps to reproduce bugs or add information on the place where the feature should be implemented. Add links to a sample deployment or code.
12+
13+
**LogCat for the issue**
14+
15+
Provide logs for the crash here
16+
17+
**Screenshots of the issue**
18+
19+
Where-ever possible add a screenshot of the issue.
20+
21+
**Would you like to work on the issue?**
22+
23+
Let us know if this issue should be assigned to you or tell us who you think could help to solve this issue.

.github/PULL_REQUEST_TEMPLATE

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Fixes #[Add issue number here. Note: This will automatically closes the issue. If you do not solve the issue entirely, please change the message to e.g. "First steps for issues #IssueNumber]
2+
3+
**Changes**: [Add here what changes were made in this issue and if possible provide links.]
4+
5+
**Screenshot/s for the changes**: [Add screenshot/s of the layout where you made changes or a `*.gif` containing a demonstration]
6+
7+
**Checklist**: [Please tick following check boxes with `[x]` if the respective task is completed]
8+
- [ ] I have used resources from `strings.xml`, `dimens.xml` and `colors.xml` without hard-coding them
9+
- [ ] No modifications done at the end of resource files `strings.xml`, `dimens.xml` or `colors.xml`
10+
- [ ] I have reformatted code in every file included in this PR [<kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>L</kbd>]
11+
- [ ] My code does not contain any extra lines or extra spaces
12+
- [ ] I have requested reviews from other members
13+
14+
**APK for testing**: [Compress the `app-debug.apk` file into a `<feature>.rar` or `<feature>.zip` file and upload it here]

scripts/upload-apk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ git config --global user.email "[email protected]"
99
git config --global user.name "Travis CI"
1010

1111
#clone the repository
12-
git clone --quiet --branch=apk https://fossasia:$GITHUB_API_KEY@github.com/fossasia/neurolab-android apk > /dev/null
12+
git clone --quiet --branch=apk https://fossasia:$GITHUB_KEY@github.com/fossasia/neurolab-android apk > /dev/null
1313

1414
cd apk
1515

0 commit comments

Comments
 (0)