diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-09-25 00:35:28 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-09-25 00:35:28 +0200 |
| commit | 107017bc3364ac1c408a941a6aa1922798ea1c38 (patch) | |
| tree | 0315935fef9269ec44abf695668f582562694b0f | |
| parent | 4918d377fed75a24a339bcf71581717dc3706ceb (diff) | |
| parent | f7bc2796ac73fdb73eb39a190094cac87493f10e (diff) | |
Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger
| -rw-r--r-- | .github/CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE.md | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index c44dd479d..710a9f1e1 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -8,4 +8,4 @@ Please search the issue tracker (including closed issues). Your bug might be a s Please fill in the template when creating new issues and provide information about your device and your server. The [adb logcat](https://wiki.cyanogenmod.org/w/Doc:_debugging_with_logcat) can be omitted if you can reproduce the bug under every condition. (ie *click button X and the application crashes*) But the adb logcat is required if the bug happens only under certain conditions or involves network problem (Server not found, messages not arriving) -**If you are seeking help or are unable to reproduce the exact problem please join our MUC at conversations@conference.siacs.eu** +**If you are seeking help or are unable to reproduce the exact problem please join our MUC at support@room.pix-art.de** diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index b6a51dcdd..247ac7a00 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -3,11 +3,6 @@ * **Version:** eg 1.12.2 * **Device:** eg Google Nexus 5 * **Android Version:** eg Android 6.0 Stock or Android 5.1 Cyanogenmod -* **Server name:** eg conversations.im, jabber.at or self hosted -* **Server software:** ejabberd 16.04 or prosody 0.10 (if known) -* **Installed server modules:** eg Stream Managment, CSI, MAM -* **Conversations source:** eg PlayStore, PlayStore Beta Channel, F-Droid, self build (latest HEAD) - #### Steps to reproduce @@ -22,9 +17,9 @@ What is the expected output? What do you see instead? #### Debug output -Please post the output of adb logcat. The log should begin with the start of Conversations and include all the +Please post the output of adb logcat. The log should begin with the start of Pix-Art Messenger and include all the steps it takes to reproduce the problem. ```` -adb logcat -s conversations +adb logcat -s Pix-Art Messenger ```` |