소스 검색

Copyright update & Readme & Guidelines

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 년 전
부모
커밋
0d0fb11e6b
59개의 변경된 파일183개의 추가작업 그리고 56개의 파일을 삭제
  1. 51 0
      README.md
  2. 1 1
      app/src/main/java/com/nextcloud/talk/activities/MainActivity.java
  3. 1 1
      app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java
  4. 1 1
      app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
  5. 1 1
      app/src/main/java/com/nextcloud/talk/api/NcApi.java
  6. 1 1
      app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java
  7. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/RetrofitBucket.java
  8. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/User.java
  9. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/call/Call.java
  10. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOCS.java
  11. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOverall.java
  12. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/converters/EnumRoomTypeConverter.java
  13. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericMeta.java
  14. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOCS.java
  15. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOverall.java
  16. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/generic/Status.java
  17. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOCS.java
  18. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOverall.java
  19. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/participants/Participant.java
  20. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOCS.java
  21. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOverall.java
  22. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/rooms/Room.java
  23. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOCS.java
  24. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOverall.java
  25. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOCS.java
  26. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOverall.java
  27. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ExactSharees.java
  28. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Sharee.java
  29. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOCS.java
  30. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOverall.java
  31. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/sharees/SharesData.java
  32. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Value.java
  33. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileData.java
  34. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOCS.java
  35. 1 1
      app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOverall.java
  36. 1 1
      app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
  37. 1 1
      app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java
  38. 1 1
      app/src/main/java/com/nextcloud/talk/controllers/BottomNavigationController.java
  39. 1 1
      app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
  40. 1 1
      app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
  41. 1 1
      app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java
  42. 1 1
      app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
  43. 1 1
      app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java
  44. 1 1
      app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java
  45. 1 1
      app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java
  46. 1 1
      app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
  47. 1 1
      app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
  48. 1 1
      app/src/main/java/com/nextcloud/talk/models/LoginData.java
  49. 1 1
      app/src/main/java/com/nextcloud/talk/persistence/entities/Cache.java
  50. 1 1
      app/src/main/java/com/nextcloud/talk/persistence/entities/User.java
  51. 1 1
      app/src/main/java/com/nextcloud/talk/utils/BundleKeys.java
  52. 1 1
      app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java
  53. 1 1
      app/src/main/java/com/nextcloud/talk/utils/ColorUtils.java
  54. 1 1
      app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheModule.java
  55. 1 1
      app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheUtils.java
  56. 1 1
      app/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java
  57. 1 1
      app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java
  58. 41 0
      contribute/HowToApplyALicense.md
  59. 35 0
      contribute/developer-certificate-of-origin

+ 51 - 0
README.md

@@ -0,0 +1,51 @@
+# Nextcloud Talk for Android
+
+**Video & audio calls through Nextcloud on Android**
+
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6e151be57a3d4f69a7cf1bc047e75daa)](https://www.codacy.com/app/mario_6/talk-android?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nextcloud/talk-android&amp;utm_campaign=Badge_Grade) [![irc](https://img.shields.io/badge/IRC-%23nextcloud--mobile%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-mobile)
+
+## Why is this so awesome?
+
+If you have suggestions or problems, please [open an issue](https://github.com/nextcloud/talk-android/issues) or contribute directly :)
+
+## Contribution Guidelines
+
+Please read the [Code of Conduct](https://nextcloud.com/community/code-of-conduct/). This document offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
+
+For more information please review the [guidelines for contributing](https://github.com/nextcloud/talk-android/blob/master/CONTRIBUTING.md) to this repository.
+
+### Apply a license
+
+All contributions to this repository are considered to be licensed under
+the GNU GPLv3 or any later version.
+
+Contributors to the Nextcloud Talk app retain their copyright. Therefore we recommend
+to add following line to the header of a file, if you changed it substantially:
+
+```
+@copyright Copyright (c) <year> <your name> (<your email address>)
+```
+
+For further information on how to add or update the license header correctly please have a look at [our licensing HowTo][applyalicense].
+
+### Sign your work
+
+We use the Developer Certificate of Origin (DCO) as a additional safeguard
+for the Nextcloud project. This is a well established and widely used
+mechanism to assure contributors have confirmed their right to license
+their contribution under the project's license.
+Please read [developer-certificate-of-origin][dcofile].
+If you can certify it, then just add a line to every git commit message:
+
+````
+  Signed-off-by: Random J Developer <random@developer.example.org>
+````
+
+Use your real name (sorry, no pseudonyms or anonymous contributions).
+If you set your `user.name` and `user.email` git configs, you can sign your
+commit automatically with `git commit -s`. You can also use git [aliases](https://git-scm.com/book/tr/v2/Git-Basics-Git-Aliases)
+like `git config --global alias.ci 'commit -s'`. Now you can commit with
+`git ci` and the commit will be signed.
+
+[dcofile]: https://github.com/nextcloud/talk-android/blob/master/contribute/developer-certificate-of-origin
+[applyalicense]: https://github.com/nextcloud/talk-android/blob/master/contribute/HowToApplyALicense.md

+ 1 - 1
app/src/main/java/com/nextcloud/talk/activities/MainActivity.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/NcApi.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/RetrofitBucket.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/User.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/call/Call.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOCS.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOverall.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/converters/EnumRoomTypeConverter.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericMeta.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOCS.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOverall.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/generic/Status.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOCS.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOverall.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/participants/Participant.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOCS.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOverall.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/rooms/Room.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOCS.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOverall.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOCS.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOverall.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ExactSharees.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Sharee.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOCS.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOverall.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/sharees/SharesData.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Value.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileData.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOCS.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOverall.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/controllers/BottomNavigationController.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/models/LoginData.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/persistence/entities/Cache.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/persistence/entities/User.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/utils/BundleKeys.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/utils/ColorUtils.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheModule.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheUtils.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java

@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * 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

+ 1 - 1
app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java

@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   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

+ 41 - 0
contribute/HowToApplyALicense.md

@@ -0,0 +1,41 @@
+# How to apply a license
+
+This application is licenced under the GNU GPLv3 or any later version.
+
+Nextcloud doesn't require a CLA (Contributor License Agreement).
+The copyright belongs to all the individual contributors.
+
+If you modify an existing file, please keep the existing license header as
+it is and just add your copyright notice:
+
+````
+@copyright Copyright (c) <year> <your name> (<your email address>)
+````
+
+If you create a new file please use this license header:
+
+````
+/*
+ * Nextcloud Talk application
+ *
+ * @author <your name>
+ * Copyright (C) <year> <your name> (<your email address>)
+ *
+ * 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 3 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */````
+
+Additionally we require a Developer Certificate of Origin (DCO), look
+at [CONTRIBUTING.md][contributing] to learn more how to sign your commits.
+
+[contributing]: https://github.com/nextcloud/talk-android/blob/master/CONTRIBUTING.md#sign-your-work

+ 35 - 0
contribute/developer-certificate-of-origin

@@ -0,0 +1,35 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.