Skip to content

Commit

Permalink
Update LICENSE & README; Replace leftovers of diasporaForAndroid;
Browse files Browse the repository at this point in the history
  • Loading branch information
gsantner committed Feb 24, 2017
1 parent 9f39e3c commit 4ed9a01
Show file tree
Hide file tree
Showing 43 changed files with 169 additions and 167 deletions.
15 changes: 7 additions & 8 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#### General information


* **Device:** <!-- eg Nexus 5 -->
* **Android Version:** <!--eg Android 6.0.1 -->
* **App version:** <!-- See in About -> Debug. eg 0.1.5, or commit -->
* **App source:** <!--F-Droid, self build (latest HEAD) Can be left blank if not related -->
* **Pod:** <!--eg pod.geraspora.de Can be left blank if not related -->
* **Diaspora pod version:** <!--eg 0.5.99.0-p9bd2337c (can be found on the bottom) Can be left blank if not related -->
* **Android Device:**
* **Android API Version:**
* **App version:**
* **App source:**
* **Pod version:**


<!--
Expand All @@ -15,7 +14,7 @@ I have:
- At least version 0.2.0 installed, see About-> Debug. If it is not visible you have an very old version, and
your issue will be closed.
- searched open and closed issues for duplicates
- read <https://github.com/Diaspora-for-Android/diaspora-android/blob/master/CONTRIBUTING.md>
- read <https://github.com/Diaspora-for-Android/dandelion/blob/master/CONTRIBUTING.md>
- not submitted translations - see [Crowdin](https://crowdin.com/project/diaspora-for-android/invite)
-->

Expand All @@ -38,7 +37,7 @@ Upload screenshots via drag&drop if needed and apply resizing:

#### Debug output

Please post the output of adb logcat. The log should begin with the start of Diaspora for Android and include all the steps it takes to reproduce the problem.
Please post the output of adb logcat. The log should begin with the start of dandelion* and include all the steps it takes to reproduce the problem.
IMPORTANT: In-App debug log must be activated and the app restarted first!

````
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
We are always open for any kind of contribution. (PR's, bug reports, feature requests, translations, ..)
If you got any questions feel free to join our IRC conference at `#dandelion @irc.freenode.net` or [Gitter](https://gitter.im/Diaspora-for-Android/diaspora-android).
If you got any questions feel free to join our IRC conference at `#diaspora-android @irc.freenode.net`.
Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.

We use Crowdin to translate dandelion\*. Join our project here: <https://crowdin.com/project/diaspora-for-android/invite>
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ Nacho Fernández (nacho_f AT joindiaspora DOT com): Spanish translation
Naofumi Fukue (https://github.com/naofum): Japanese translation
pskosinski (email AT pskosinski DOT pl): Polish translation
SansPseudoFix (https://github.com/SansPseudoFix): French translation
secitem (https://pod.geraspora.de/u/secitem): Czech translation
secitem (secitem AT tuta DOT io): Czech translation
Zsolt Szakács (maxigaz AT diaspora DOT zone): Hungarian translation
4 changes: 3 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see https://www.gnu.org/licenses/.

If you want to publish dandelion\* in an app store, you have to change the app name (dandelion\*), package name & (blue) launcher icon. See "7. Additional Terms" of GPL. You also have to provide the modifications in source code somewhere online for free. This is explicitly not about building the app and sharing with some friends, it's about app stores. F-Droid is explicitly allowed to publish as dandelion\*. The reason is, that most app stores allow an app id just once, which would block our uploads if somebody else uploaded. Also, we want to keep control on where the app is published, and want to make sure there is no malware in it.


# Miscellaneous

We took some inspiration and code from LeafPic. Go check it out, its free software as well!
https://github.com/HoraApps/LeafPic
https://github.com/HoraApps/LeafPic
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ This is an unofficial webview based client for the community-run, distributed so
- Download ([F-Droid](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android), [Release Archive](https://github.com/Diaspora-for-Android/dandelion/releases))
- Watch [Changelog](https://github.com/Diaspora-for-Android/dandelion/blob/master/CHANGELOG.md)
- See [Screenshots](https://github.com/Diaspora-for-Android/dandelion/blob/master/SCREENSHOTS.md)
- Get updates from our diaspora\* account: [[email protected]](https://diasp.org/people/48b78420923501341ef3782bcb452bd5)

## Contributions
We are always open for any kind of contribution. (PR's, bug reports, feature requests, translations, ..)
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/github/dfa/diaspora_android/App.java
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand All @@ -32,7 +32,7 @@

/**
* User profile
* Created by gsantner (https://gsantner.github.io/) on 24.03.16. Part of Diaspora for Android.
* Created by gsantner (https://gsantner.github.io/) on 24.03.16. Part of dandelion*.
*/
public class DiasporaUserProfile {
private static final int MINIMUM_USERPROFILE_LOAD_TIMEDIFF = 5000;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
This file is part of the Diaspora for Android.
This file is part of the dandelion*.
Diaspora for Android is free software: you can redistribute it and/or modify
dandelion* 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 3 of the License, or
(at your option) any later version.
Diaspora for Android is distributed in the hope that it will be useful,
dandelion* 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.
You should have received a copy of the GNU General Public License
along with the Diaspora for Android.
along with the dandelion*.
If not, see <http://www.gnu.org/licenses/>.
*/
Expand Down
Loading

0 comments on commit 4ed9a01

Please sign in to comment.