From: David A. Velasco Date: Mon, 25 Mar 2013 14:08:40 +0000 (+0100) Subject: Added CONTRIBUTING.md and THIRD_PARTY.txt X-Git-Tag: oc-android-1.4.3~42 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/58c569b968a829975b4767b7396d4b55c896fd03?ds=inline;hp=--cc Added CONTRIBUTING.md and THIRD_PARTY.txt --- 58c569b968a829975b4767b7396d4b55c896fd03 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..5d0c02f2 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,39 @@ +## Submitting issues + +If you have questions about how to use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc]. + +### Guidelines +* [Report the issue](https://github.com/owncloud/android/issues/new) using our [template][template], it includes all the informations we need to track down the issue. +* This repository is *only* for issues within the ownCloud Android app code. Issues in other compontents should be reported in their own repositores: + - [ownCloud code](https://github.com/owncloud/core/issues) + - [iOS client](https://github.com/owncloud/ios-issues/issues) + - [Desktop client](https://github.com/owncloud/mirall/issues) + - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar, Contacts...) +* Search the existing issues first, it's likely that your issue was already reported. + +If your issue appears to be a bug, and hasn't been reported, open a new issue. + +Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues. + +[template]: https://raw.github.com/owncloud/android/master/issue_template.md +[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud +[forum]: http://forum.owncloud.org/ +[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4 + +## Contributing to Source Code + +Thanks for wanting to contribute source code to ownCloud. That's great! + +Before we're able to merge your code into the ownCloud app for Android, you need to sign our [Contributor Agreement][agreement]. + +### Guidelines +* Contribute your code in the branch 'develop'. It will give us a better chance to test your code before merging it with stable code. +* For your first contribution, start a pull request on develop and send us the signed [Contributor Agreement][agreement]. +* Keep on using pull requests for your next contributions although you own write permissions. + +[agreement]: http://owncloud.org/about/contributor-agreement/ + +## Translations +Please submit translations via [Transifex][transifex]. + +[transifex]: https://www.transifex.com/projects/p/owncloud/ diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt new file mode 100644 index 00000000..1d51b72a --- /dev/null +++ b/THIRD_PARTY.txt @@ -0,0 +1,64 @@ +################################################################### + ownCloud Android client + + Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2012 Bartek Przybylski +################################################################### + + +########### +# LICENSE # +########### + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +The source distribution of this program should include a full copy +of the GNU GPL version 2 license in the LICENSE.txt file located +in its root directory. If not, see . + + +######################## +# THIRD PARTY LICENSES # +######################## + +Both the source and binary distributions of this software contain +some third party software. All the third party software included +or linked is redistributed under the terms and conditions of their +original licenses. These licenses are compatible the GPL license +that govern this software, for the purposes they are being used. + +The third party software included and used by this project is: + + * Apache JackRabbit, version 2.2.5. + Copyright (C) 2004-2010 The Apache Software Foundation. + Licensed under Apache License, Version 2.0. + Placed at libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar + The jar file must be included in the ownCloud client APK. + Original license document included at libs/LICENSE.txt + See http://jackrabbit.apache.org/ + + * Transifex client.JavaMail API, version 1.4.3 + Copyright (C) Transifex. + Licensed under GNU General Public License. + Placed at third_party/transifex-client. + Used as a helper tool, not included in the ownCloud client APK. + Original license document included at third_party/transifex-client/LICENSE. + See http://help.transifex.com/features/client/ + + * ActionBarSherlock, master branch. + Copyright (C) 2012 Jake Wharton. + Licensed under Apache License, Version 2.0. + The official repository is linked as a submodule in the + ownCloud/android repository. + A binary JAR file must be generated from this linked project + and included in the ownCloud client APK. + See http://http://actionbarsherlock.com/ + \ No newline at end of file diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 00000000..493572d2 --- /dev/null +++ b/issue_template.md @@ -0,0 +1,32 @@ +### Expected behaviour +Tell us what should happen + +### Actual behaviour +Tell us what happens instead + +### Steps to reproduce +1. +2. +3. + +### Environment data +Android version: + +Device model: + +Stock or customized system: + +ownCloud app version: + +ownCloud server version: + +### Logs +#### Web server error log +``` +Insert your webserver log here +``` + +#### ownCloud log (data/owncloud.log) +``` +Insert your ownCloud log here +```