Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ppfeufer/aa-srp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.16.2
Choose a base ref
...
head repository: ppfeufer/aa-srp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 51,721 additions and 14,344 deletions.
  1. +1 −1 .editorconfig
  2. +1 −1 .flake8
  3. +3 −3 .github/ISSUE_TEMPLATE/bug_report.md
  4. +2 −1 .github/ISSUE_TEMPLATE/feature_request.md
  5. +3 −6 .github/PULL_REQUEST_TEMPLATE.md
  6. +29 −0 .github/dependabot.yml
  7. +95 −197 .github/workflows/automated-checks.yml
  8. +38 −0 .github/workflows/potential-duplicates.yml
  9. +21 −7 .github/workflows/{pypi-release.yml → release.yml}
  10. +7 −4 .gitignore
  11. +120 −0 .make/conf.d/django.mk
  12. +24 −0 .make/conf.d/formatting.mk
  13. +27 −0 .make/conf.d/git.mk
  14. +33 −0 .make/conf.d/pre-commit.mk
  15. +38 −0 .make/conf.d/tests.mk
  16. +275 −42 .pre-commit-config.yaml
  17. +24 −0 .pylintrc
  18. +32 −0 .stylelintrc.json
  19. +559 −107 CHANGELOG.md
  20. +48 −28 CODE_OF_CONDUCT.md
  21. +169 −48 CONTRIBUTING.md
  22. +0 −8 MANIFEST.in
  23. +79 −31 Makefile
  24. +138 −82 README.md
  25. BIN aa-srp-models.png
  26. +6 −3 aasrp/__init__.py
  27. +209 −18 aasrp/admin.py
  28. +19 −10 aasrp/app_settings.py
  29. +3 −1 aasrp/apps.py
  30. +16 −12 aasrp/auth_hooks.py
  31. +40 −17 aasrp/constants.py
  32. +207 −0 aasrp/discord/channel_message.py
  33. +233 −0 aasrp/discord/direct_message.py
  34. +214 −110 aasrp/form.py
  35. +57 −65 aasrp/helper/character.py
  36. +14 −6 aasrp/helper/eve_images.py
  37. +140 −77 aasrp/helper/icons.py
  38. +38 −296 aasrp/helper/notification.py
  39. +41 −0 aasrp/helper/static_files.py
  40. +7 −4 aasrp/helper/user.py
  41. BIN aasrp/images/aa-srp-dashboard-view-all.jpg
  42. BIN aasrp/images/aa-srp-dashboard.jpg
  43. BIN aasrp/images/aa-srp-request-details.jpg
  44. BIN aasrp/images/aa-srp-requests-overview.jpg
  45. BIN aasrp/images/aa-srp-your-requests.jpg
  46. BIN aasrp/images/tooltip-change-srp-payout-amount.png
  47. BIN aasrp/locale/cs_CZ/LC_MESSAGES/django.mo
  48. +997 −0 aasrp/locale/cs_CZ/LC_MESSAGES/django.po
  49. BIN aasrp/locale/de/LC_MESSAGES/django.mo
  50. +810 −399 aasrp/locale/de/LC_MESSAGES/django.po
  51. +1,022 −0 aasrp/locale/django.pot
  52. +0 −569 aasrp/locale/en/LC_MESSAGES/django.po
  53. BIN aasrp/locale/es/LC_MESSAGES/django.mo
  54. +792 −302 aasrp/locale/es/LC_MESSAGES/django.po
  55. BIN aasrp/locale/fr_FR/LC_MESSAGES/django.mo
  56. +992 −0 aasrp/locale/fr_FR/LC_MESSAGES/django.po
  57. BIN aasrp/locale/it_IT/LC_MESSAGES/django.mo
  58. +987 −0 aasrp/locale/it_IT/LC_MESSAGES/django.po
  59. BIN aasrp/locale/ja/LC_MESSAGES/django.mo
  60. +986 −0 aasrp/locale/ja/LC_MESSAGES/django.po
  61. +0 −569 aasrp/locale/ko/LC_MESSAGES/django.po
  62. BIN aasrp/locale/ko_KR/LC_MESSAGES/django.mo
  63. +1,014 −0 aasrp/locale/ko_KR/LC_MESSAGES/django.po
  64. BIN aasrp/locale/nl_NL/LC_MESSAGES/django.mo
  65. +988 −0 aasrp/locale/nl_NL/LC_MESSAGES/django.po
  66. BIN aasrp/locale/pl_PL/LC_MESSAGES/django.mo
  67. +992 −0 aasrp/locale/pl_PL/LC_MESSAGES/django.po
  68. BIN aasrp/locale/ru/LC_MESSAGES/django.mo
  69. +883 −410 aasrp/locale/ru/LC_MESSAGES/django.po
  70. BIN aasrp/locale/sk/LC_MESSAGES/django.mo
  71. +998 −0 aasrp/locale/sk/LC_MESSAGES/django.po
  72. BIN aasrp/locale/uk/LC_MESSAGES/django.mo
  73. +1,060 −0 aasrp/locale/uk/LC_MESSAGES/django.po
  74. BIN aasrp/locale/zh_Hans/LC_MESSAGES/django.mo
  75. +812 −386 aasrp/locale/zh_Hans/LC_MESSAGES/django.po
  76. +35 −5 aasrp/management/commands/aasrp_load_eve.py
  77. +47 −31 aasrp/management/commands/aasrp_migrate_srp_data.py
  78. +128 −27 aasrp/managers.py
  79. +0 −1 aasrp/migrations/0001_initial.py
  80. +0 −1 aasrp/migrations/0002_relations_update.py
  81. +0 −1 aasrp/migrations/0003_aasrprequest_reject_info.py
  82. +0 −1 aasrp/migrations/0004_aasrpusersettings.py
  83. +0 −1 aasrp/migrations/0005_insurance.py
  84. +0 −1 aasrp/migrations/0006_related_names.py
  85. +0 −1 aasrp/migrations/0007_aasrprequestcomment_comment_time_and_more.py
  86. +0 −1 aasrp/migrations/0008_aasrprequestcomment_new_status_and_more.py
  87. +52 −0 aasrp/migrations/0009_add_fleet_type_to_srp_link.py
  88. +430 −0 aasrp/migrations/0010_model_changes.py
  89. +51 −0 aasrp/migrations/0011_default_settings.py
  90. +327 −0 aasrp/migrations/0012_alter_fleettype_options_alter_insurance_options_and_more.py
  91. +27 −0 aasrp/migrations/0013_setting_loss_value_source.py
  92. +291 −77 aasrp/models.py
  93. +3 −2 aasrp/providers.py
  94. +0 −13 aasrp/static/aasrp/css/aa-bootstrap-fix.css
  95. +0 −1 aasrp/static/aasrp/css/aa-bootstrap-fix.min.css
  96. +14 −0 aasrp/static/aasrp/css/aa-srp-form.css
  97. +2 −1 aasrp/static/aasrp/css/aa-srp-form.min.css
  98. +1 −0 aasrp/static/aasrp/css/aa-srp-form.min.css.map
  99. +6 −76 aasrp/static/aasrp/css/aa-srp.css
  100. +2 −1 aasrp/static/aasrp/css/aa-srp.min.css
  101. +1 −0 aasrp/static/aasrp/css/aa-srp.min.css.map
  102. +0 −334 aasrp/static/aasrp/javascript/aa-srp-dashboard.js
  103. +0 −1 aasrp/static/aasrp/javascript/aa-srp-dashboard.min.js
  104. +0 −1 aasrp/static/aasrp/javascript/aa-srp-view-requests.min.js
  105. +64 −0 aasrp/static/aasrp/javascript/aa-srp.js
  106. +2 −0 aasrp/static/aasrp/javascript/aa-srp.min.js
  107. +1 −0 aasrp/static/aasrp/javascript/aa-srp.min.js.map
  108. +18 −0 aasrp/static/aasrp/javascript/form.js
  109. +2 −0 aasrp/static/aasrp/javascript/form.min.js
  110. +1 −0 aasrp/static/aasrp/javascript/form.min.js.map
  111. +210 −0 aasrp/static/aasrp/javascript/my-srp-requests.js
  112. +8 −0 aasrp/static/aasrp/javascript/my-srp-requests.min.js
  113. +1 −0 aasrp/static/aasrp/javascript/my-srp-requests.min.js.map
  114. +194 −0 aasrp/static/aasrp/javascript/srp-links.js
  115. +2 −0 aasrp/static/aasrp/javascript/srp-links.min.js
  116. +1 −0 aasrp/static/aasrp/javascript/srp-links.min.js.map
  117. +73 −57 aasrp/static/aasrp/javascript/{aa-srp-view-requests.js → view-requests.js}
  118. +2 −0 aasrp/static/aasrp/javascript/view-requests.min.js
  119. +1 −0 aasrp/static/aasrp/javascript/view-requests.min.js.map
  120. +0 −15 aasrp/static/aasrp/libs/x-editable/1.5.3/bootstrap3-editable/css/bootstrap-editable.min.css
  121. +0 −6,883 aasrp/static/aasrp/libs/x-editable/1.5.3/bootstrap3-editable/js/bootstrap-editable.js
  122. +0 −1 aasrp/static/aasrp/libs/x-editable/1.5.3/bootstrap3-editable/js/bootstrap-editable.min.js
  123. +231 −240 ...ibs/x-editable/{1.5.3/bootstrap3-editable → 1.5.4/bootstrap5-editable}/css/bootstrap-editable.css
  124. +16 −0 aasrp/static/aasrp/libs/x-editable/1.5.4/bootstrap5-editable/css/bootstrap-editable.min.css
  125. +1 −0 aasrp/static/aasrp/libs/x-editable/1.5.4/bootstrap5-editable/css/bootstrap-editable.min.css.map
  126. BIN ...tatic/aasrp/libs/x-editable/{1.5.3/bootstrap3-editable → 1.5.4/bootstrap5-editable}/img/clear.png
  127. BIN ...tic/aasrp/libs/x-editable/{1.5.3/bootstrap3-editable → 1.5.4/bootstrap5-editable}/img/loading.gif
  128. +6,731 −0 aasrp/static/aasrp/libs/x-editable/1.5.4/bootstrap5-editable/js/bootstrap-editable.js
  129. +2 −0 aasrp/static/aasrp/libs/x-editable/1.5.4/bootstrap5-editable/js/bootstrap-editable.min.js
  130. +1 −0 aasrp/static/aasrp/libs/x-editable/1.5.4/bootstrap5-editable/js/bootstrap-editable.min.js.map
  131. +140 −0 aasrp/templates/aasrp/ajax-render/srp-request-additional-information.html
  132. +0 −99 aasrp/templates/aasrp/ajax_render/srp_request_additional_information.html
  133. +72 −2 aasrp/templates/aasrp/base.html
  134. +0 −3 aasrp/templates/aasrp/bundles/aa-bootstrap-fix-css.html
  135. +2 −2 aasrp/templates/aasrp/bundles/aa-srp-css.html
  136. +0 −3 aasrp/templates/aasrp/bundles/aa-srp-dashboard-js.html
  137. +2 −2 aasrp/templates/aasrp/bundles/aa-srp-form-css.html
  138. +3 −0 aasrp/templates/aasrp/bundles/aa-srp-form-js.html
  139. +3 −0 aasrp/templates/aasrp/bundles/aa-srp-js.html
  140. +0 −3 aasrp/templates/aasrp/bundles/aa-srp-view-requests-js.html
  141. +3 −0 aasrp/templates/aasrp/bundles/my-srp-requests-js.html
  142. +3 −0 aasrp/templates/aasrp/bundles/srp-links-js.html
  143. +3 −0 aasrp/templates/aasrp/bundles/view-requests-js.html
  144. +2 −2 aasrp/templates/aasrp/bundles/x-editable-css.html
  145. +2 −2 aasrp/templates/aasrp/bundles/x-editable-js.html
  146. +48 −52 aasrp/templates/aasrp/dashboard.html
  147. +5 −14 aasrp/templates/aasrp/{link_add.html → link-add.html}
  148. +20 −0 aasrp/templates/aasrp/link-edit.html
  149. +0 −23 aasrp/templates/aasrp/link_edit.html
  150. +8 −10 aasrp/templates/aasrp/modals/dashboard/{delete_srp_link.html → delete-srp-link.html}
  151. +8 −10 aasrp/templates/aasrp/modals/dashboard/{disable_srp_link.html → disable-srp-link.html}
  152. +8 −10 aasrp/templates/aasrp/modals/dashboard/{enable_srp_link.html → enable-srp-link.html}
  153. +10 −9 .../modals/{view_requests/accept_rejected_request.html → view-requests/accept-rejected-request.html}
  154. +11 −9 aasrp/templates/aasrp/modals/{view_requests/accept_request.html → view-requests/accept-request.html}
  155. +11 −10 aasrp/templates/aasrp/modals/{view_requests/remove_request.html → view-requests/delete-request.html}
  156. +14 −10 ...emplates/aasrp/modals/{view_requests/mark_complete_modal.html → view-requests/mark-complete.html}
  157. +9 −9 aasrp/templates/aasrp/modals/{view_requests/reject_request.html → view-requests/reject-request.html}
  158. +6 −8 .../templates/aasrp/modals/{view_requests/request_details.html → view-requests/request-details.html}
  159. +0 −15 aasrp/templates/aasrp/partials/dashboard/buttons.html
  160. +35 −0 aasrp/templates/aasrp/partials/dashboard/srp-links.html
  161. +0 −32 aasrp/templates/aasrp/partials/dashboard/srp_links.html
  162. +0 −17 aasrp/templates/aasrp/partials/dashboard/table.html
  163. +0 −27 aasrp/templates/aasrp/partials/dashboard/user_settings.html
  164. +0 −31 aasrp/templates/aasrp/partials/dashboard/user_srp_requests.html
  165. +11 −0 aasrp/templates/aasrp/partials/footer/app-translation-footer.html
  166. +1 −1 aasrp/templates/aasrp/partials/form/{required_field_hint.html → required-field-hint.html}
  167. +0 −10 aasrp/templates/aasrp/partials/header/h1.html
  168. +27 −0 aasrp/templates/aasrp/partials/link-add/form.html
  169. +25 −0 aasrp/templates/aasrp/partials/link-edit/form.html
  170. +0 −28 aasrp/templates/aasrp/partials/link_add/form.html
  171. +0 −26 aasrp/templates/aasrp/partials/link_edit/form.html
  172. +25 −0 aasrp/templates/aasrp/partials/navigation/actions.html
  173. +47 −0 aasrp/templates/aasrp/partials/navigation/top-navigation.html
  174. +32 −0 aasrp/templates/aasrp/partials/request-srp/fleet-details.html
  175. +39 −0 aasrp/templates/aasrp/partials/request-srp/form.html
  176. +0 −28 aasrp/templates/aasrp/partials/request_srp/form.html
  177. +18 −0 aasrp/templates/aasrp/partials/user-settings/form.html
  178. +31 −0 aasrp/templates/aasrp/partials/view-own-requests/user-srp-requests.html
  179. +81 −0 aasrp/templates/aasrp/partials/view-requests/overview.html
  180. +34 −0 aasrp/templates/aasrp/partials/view-requests/requests.html
  181. +0 −79 aasrp/templates/aasrp/partials/view_requests/overview.html
  182. +0 −34 aasrp/templates/aasrp/partials/view_requests/requests.html
  183. +23 −0 aasrp/templates/aasrp/request-srp.html
  184. +0 −18 aasrp/templates/aasrp/request_srp.html
  185. +11 −0 aasrp/templates/aasrp/user-settings.html
  186. +71 −0 aasrp/templates/aasrp/view-own-requests.html
  187. +105 −0 aasrp/templates/aasrp/view-requests.html
  188. +0 −101 aasrp/templates/aasrp/view_requests.html
  189. +214 −0 aasrp/templatetags/aasrp.py
  190. +0 −130 aasrp/templatetags/aasrp_user.py
  191. +0 −26 aasrp/templatetags/aasrp_versioned_static.py
  192. +110 −60 aasrp/tests/test_access.py
  193. +148 −0 aasrp/tests/test_auth_hooks.py
  194. +96 −106 aasrp/tests/test_helper_character.py
  195. +12 −4 aasrp/tests/test_installed_modules.py
  196. +55 −0 aasrp/tests/test_model_fleettype.py
  197. +172 −0 aasrp/tests/test_model_setting.py
  198. +265 −138 aasrp/tests/test_templatetags.py
  199. +55 −6 aasrp/tests/utils.py
  200. +108 −69 aasrp/urls.py
  201. +0 −74 aasrp/utils.py
  202. +0 −1,193 aasrp/views.py
  203. +3 −0 aasrp/views/__init__.py
  204. +718 −0 aasrp/views/ajax.py
  205. +692 −0 aasrp/views/general.py
  206. +13 −12 codecov.yml
  207. BIN docs/images/aa-srp-dashboard-view-all.jpg
  208. BIN docs/images/aa-srp-dashboard.jpg
  209. BIN docs/images/aa-srp-request-details.jpg
  210. BIN docs/images/aa-srp-requests-overview.jpg
  211. BIN docs/images/aa-srp-your-requests.jpg
  212. BIN docs/images/tooltip-change-srp-payout-amount.png
  213. BIN docs/images/weblate/aa-srp-aar-link-in-ui.jpg
  214. BIN docs/images/weblate/aa-srp-after-action-report-link-add-change-button.jpg
  215. BIN docs/images/weblate/aa-srp-after-action-report-link.jpg
  216. BIN docs/images/weblate/aa-srp-app-name-and-version-in-django-backend.jpg
  217. BIN docs/images/weblate/aa-srp-app-name-as-header.jpg
  218. BIN docs/images/weblate/aa-srp-app-name-as-menu-item.jpg
  219. BIN docs/images/weblate/aa-srp-request-form-error-on-already-existing-killmail.jpg
  220. BIN docs/images/weblate/aa-srp-request-form-error-on-invalid-killboard-link.jpg
  221. BIN docs/images/weblate/aa-srp-request-form-error-on-invalid-killmail-link.jpg
  222. BIN docs/images/weblate/aa-srp-request-form-submitting.jpg
  223. BIN docs/images/weblate/aa-srp-request-form.jpg
  224. BIN docs/images/weblate/aa-srp-top-navigation-srp-links-button.jpg
  225. +33 −0 eslint.config.js
  226. +2,350 −0 package-lock.json
  227. +9 −0 package.json
  228. +19,182 −0 pastebin/esi_insurance.json
  229. +814 −0 pastebin/evekill_killmail.json
  230. +63 −3 pyproject.toml
  231. +0 −50 setup.cfg
  232. +19 −2 testauth/celery.py
  233. +107 −98 testauth/{settings.py → settings/base.py}
  234. +123 −0 testauth/settings/local.py
  235. +2 −2 testauth/urls.py
  236. +27 −38 tox.ini
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -17,5 +17,5 @@ indent_size = 2
indent_size = 2

# Makefiles always use tabs for indentation
[Makefile]
[{Makefile*,*.mk}]
indent_style = tab
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[flake8]
exclude = .git, *migrations*, .tox, dist, htmlcov
extend-ignore = E203, E266, E501
extend-ignore = E203, E266, E501, W503
max-line-length = 888
max-complexity = 18
select = B,C,E,F,W,T4,B9
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@ A clear and concise description of what the bug is.

Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
2. Click on '...'
3. Scroll down to '...'
4. See error


@@ -32,7 +32,7 @@ If applicable, add screenshots to help explain your problem.

### Please complete the following information:

- AA-SRP Version:
- App Version:
- Alliance Auth Version:
- Browser and Version:

3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
name: Feature Request
about: Suggest an idea for AA SRP
about: Suggest an idea
title: "[Feature Request] "
labels: ''
assignees: ''

---

### Context
9 changes: 3 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -6,18 +6,15 @@ change.

Fixes # (issue)


## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not
work as expected)

- [ ] Breaking change (fix or feature that would cause existing functionality not to work as expected)

## Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand areas
- [ ] I have checked my code and corrected any misspellings
29 changes: 29 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
version: 2

updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "master"
schedule:
interval: "monthly"
commit-message:
# Prefix all commit messages with "[github-actions] "
prefix: "[github-actions] "

# Maintain dependencies for npm
- package-ecosystem: "npm"
directory: "/"
target-branch: "master"
versioning-strategy: increase
groups:
"NPM Dependencies":
update-types:
- "major"
- "minor"
- "patch"
schedule:
interval: "monthly"
commit-message:
# Prefix all commit messages with "[npm] "
prefix: "[npm] "
Loading