aleksis/AlekSIS-App-Hjelp
8
0
Fork 0
Code Issues 3 Pull requests 2 Projects Releases 1 Packages Activity Actions

Resolve "Allow sorting of FAQ Sections and Questions" #98

Merged
ZugBahnHof merged 35 commits from 29-allow-sorting-of-faq-sections-and-questions into master 2021-05-15 16:52:56 +02:00
Conversation 58 Commits 35 Files changed 13 +911 -227
ZugBahnHof commented 2020-08-02 19:01:25 +02:00 (Migrated from edugit.org)
Copy link

Closes #29

Closes #29
hansegucker commented 2020-12-09 08:59:29 +01:00 (Migrated from edugit.org)
Copy link

Any progress on this?

Any progress on this?
ZugBahnHof commented 2021-01-04 18:14:34 +01:00 (Migrated from edugit.org)
Copy link

added 11 commits

  • 6aacdc62 - Add a field `show` to FAQSections and create migrations
  • 1c7273cb - Use correct queryset
  • 6f855781 - Create a view to order the faq
  • b623a098 - Create an url to order the faq
  • acd7ff24 - Create a js script to order the faq
  • c5e51b2a - Create a html template script to order the faq
  • 12668c4f - Change a model to order the faq
  • 3c4daa7d - Create a form to order the faq
  • e1a14436 - Create a stylesheet to order the faq
  • 58c2169d - Create a menu to order the faq
  • 6589db68 - Remove unnecessary stuff

Compare with previous version

added 11 commits <ul><li>6aacdc62 - Add a field `show` to FAQSections and create migrations</li><li>1c7273cb - Use correct queryset</li><li>6f855781 - Create a view to order the faq</li><li>b623a098 - Create an url to order the faq</li><li>acd7ff24 - Create a js script to order the faq</li><li>c5e51b2a - Create a html template script to order the faq</li><li>12668c4f - Change a model to order the faq</li><li>3c4daa7d - Create a form to order the faq</li><li>e1a14436 - Create a stylesheet to order the faq</li><li>58c2169d - Create a menu to order the faq</li><li>6589db68 - Remove unnecessary stuff</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=4165&start_sha=176efe6c322cb970b51b4a8bb2cbe3288696608b)
ZugBahnHof commented 2021-05-14 22:02:16 +02:00 (Migrated from edugit.org)
Copy link

added 96 commits

  • 6589db68...94c059fa - 84 commits from branch master
  • 8eceb4ba - Use permissions
  • 889c1608 - Merge branch 'master' into 29-allow-sorting-of-faq-sections-and-questions
  • 31ed20ce - Create a form to edit faqquestions
  • 8bc3aee5 - Add a property for questions to be shown
  • 213a698f - Build a crude template for CRUD views inside hjelp
  • 610626aa - Add CRUD views for faq actions
  • f503ae57 - Add success messages on OrderFAQ
  • 2874f54e - Add urls for said crud views
  • 2a998d71 - Show only correct faq questions and sections and display a message if there are none
  • f67edae5 - Use black as a default icon color
  • ec2d5b18 - Include all new forms in the order_faq.html template
  • d3355340 - Style the faq management using css

Compare with previous version

added 96 commits <ul><li>6589db68...94c059fa - 84 commits from branch <code>master</code></li><li>8eceb4ba - Use permissions</li><li>889c1608 - Merge branch &#39;master&#39; into 29-allow-sorting-of-faq-sections-and-questions</li><li>31ed20ce - Create a form to edit faqquestions</li><li>8bc3aee5 - Add a property for questions to be shown</li><li>213a698f - Build a crude template for CRUD views inside hjelp</li><li>610626aa - Add CRUD views for faq actions</li><li>f503ae57 - Add success messages on OrderFAQ</li><li>2874f54e - Add urls for said crud views</li><li>2a998d71 - Show only correct faq questions and sections and display a message if there are none</li><li>f67edae5 - Use black as a default icon color</li><li>ec2d5b18 - Include all new forms in the order_faq.html template</li><li>d3355340 - Style the faq management using css</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8115&start_sha=6589db68e4f7427438e963b1084418d2a2b5a399)
hansegucker commented 2021-05-14 22:03:15 +02:00 (Migrated from edugit.org)
Copy link

assigned to @hansegucker

assigned to @hansegucker
hansegucker commented 2021-05-14 22:03:20 +02:00 (Migrated from edugit.org)
Copy link

requested review from @nik

requested review from @nik
ZugBahnHof commented 2021-05-14 22:09:26 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>9387ee73 - Merge migrations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8117&start_sha=d3355340910a79ed645ba3bff4300aa4d3dfe7c9)
ZugBahnHof commented 2021-05-14 22:12:26 +02:00 (Migrated from edugit.org)
Copy link

Screenshot_2021-05-14_at_22-11-31_Delete_Faq_Question___AlekSIS

Screenshot_2021-05-14_at_22-11-16_Delete_Faq_Section___AlekSIS

Screenshot_2021-05-14_at_22-09-50_Edit_FAQQuestion___AlekSIS

Screenshot_2021-05-14_at_22-10-50_Create_FAQQuestion___AlekSIS

Screenshot_2021-05-14_at_22-10-35_Create_FAQSection___AlekSIS

Screenshot_2021-05-14_at_22-10-22_Manage_FAQ___AlekSIS

![Screenshot_2021-05-14_at_22-11-31_Delete_Faq_Question___AlekSIS](/uploads/0de464007d9f65841aef9c0e08766abd/Screenshot_2021-05-14_at_22-11-31_Delete_Faq_Question___AlekSIS.png) ![Screenshot_2021-05-14_at_22-11-16_Delete_Faq_Section___AlekSIS](/uploads/6b1cb8a5ca9955d9b89dde927e742624/Screenshot_2021-05-14_at_22-11-16_Delete_Faq_Section___AlekSIS.png) ![Screenshot_2021-05-14_at_22-09-50_Edit_FAQQuestion___AlekSIS](/uploads/9cfab769d7767e862eb17f4c357c7f03/Screenshot_2021-05-14_at_22-09-50_Edit_FAQQuestion___AlekSIS.png) ![Screenshot_2021-05-14_at_22-10-50_Create_FAQQuestion___AlekSIS](/uploads/dc028381dfb7a1fb1398523cd5d60d26/Screenshot_2021-05-14_at_22-10-50_Create_FAQQuestion___AlekSIS.png) ![Screenshot_2021-05-14_at_22-10-35_Create_FAQSection___AlekSIS](/uploads/7505a65b5501ebe27756bc0b0f855c81/Screenshot_2021-05-14_at_22-10-35_Create_FAQSection___AlekSIS.png) ![Screenshot_2021-05-14_at_22-10-22_Manage_FAQ___AlekSIS](/uploads/d92b26bb79d36f457ccc50b57046e43e/Screenshot_2021-05-14_at_22-10-22_Manage_FAQ___AlekSIS.png)
hansegucker commented 2021-05-14 22:13:26 +02:00 (Migrated from edugit.org)
Copy link

Please remove this unrelated stuff and merge the migrations. Additionally, the migration should get a speaking name.

Please remove this unrelated stuff and merge the migrations. Additionally, the migration should get a speaking name.
hansegucker commented 2021-05-14 22:13:26 +02:00 (Migrated from edugit.org)
Copy link

I would like you to rewrite this like that:

FAQOrderFormSet = forms.modelformset_factory ...
FAQOrderFormSet.ordering_widget = ...
I would like you to rewrite this like that: ```python FAQOrderFormSet = forms.modelformset_factory ... FAQOrderFormSet.ordering_widget = ... ```
hansegucker commented 2021-05-14 22:13:27 +02:00 (Migrated from edugit.org)
Copy link

Debug print

Debug print
hansegucker commented 2021-05-14 22:13:27 +02:00 (Migrated from edugit.org)
Copy link

Please remove this empty line.

Please remove this empty line.
hansegucker commented 2021-05-14 22:13:27 +02:00 (Migrated from edugit.org)
Copy link
        context["title"] = _("Create FAQ question")
```suggestion:-0+0 context["title"] = _("Create FAQ question") ```
hansegucker commented 2021-05-14 22:13:28 +02:00 (Migrated from edugit.org)
Copy link
    success_message = _("The FAQ question was edited successfully.")
```suggestion:-0+0 success_message = _("The FAQ question was edited successfully.") ```
hansegucker commented 2021-05-14 22:13:28 +02:00 (Migrated from edugit.org)
Copy link
        context["title"] = _("Edit FAQ question")
```suggestion:-0+0 context["title"] = _("Edit FAQ question") ```
hansegucker commented 2021-05-14 22:13:28 +02:00 (Migrated from edugit.org)
Copy link
    success_message = _("The FAQ question was deleted successfully.")
```suggestion:-0+0 success_message = _("The FAQ question was deleted successfully.") ```
hansegucker commented 2021-05-14 22:13:29 +02:00 (Migrated from edugit.org)
Copy link
    success_message = _("The FAQ question was created successfully.")
```suggestion:-0+0 success_message = _("The FAQ question was created successfully.") ```
hansegucker commented 2021-05-14 22:13:29 +02:00 (Migrated from edugit.org)
Copy link
    success_message = _("The FAQ section was deleted successfully.")
```suggestion:-0+0 success_message = _("The FAQ section was deleted successfully.") ```
hansegucker commented 2021-05-14 22:13:29 +02:00 (Migrated from edugit.org)
Copy link
    success_message = _("The FAQ section was created successfully!")
```suggestion:-0+0 success_message = _("The FAQ section was created successfully!") ```
hansegucker commented 2021-05-14 22:13:30 +02:00 (Migrated from edugit.org)
Copy link
        context["title"] = _("Create FAQ section")
```suggestion:-0+0 context["title"] = _("Create FAQ section") ```
hansegucker commented 2021-05-14 22:13:30 +02:00 (Migrated from edugit.org)
Copy link
        context["layout"] = Layout(Row("name", "icon", "show"))
```suggestion:-0+0 context["layout"] = Layout(Row("name", "icon", "show")) ```
hansegucker commented 2021-05-14 22:13:30 +02:00 (Migrated from edugit.org)
Copy link
    success_message = _("The FAQ was updated successfully.")
```suggestion:-0+0 success_message = _("The FAQ was updated successfully.") ```
ZugBahnHof commented 2021-05-14 22:16:52 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_105_105)
ZugBahnHof commented 2021-05-14 22:16:52 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_114_114)
ZugBahnHof commented 2021-05-14 22:16:52 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_119_119)
ZugBahnHof commented 2021-05-14 22:16:53 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_127_127)
ZugBahnHof commented 2021-05-14 22:16:53 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_96_96)
ZugBahnHof commented 2021-05-14 22:16:53 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_89_89)
ZugBahnHof commented 2021-05-14 22:16:53 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_71_71)
ZugBahnHof commented 2021-05-14 22:16:54 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_81_81)
ZugBahnHof commented 2021-05-14 22:16:54 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_44_44)
ZugBahnHof commented 2021-05-14 22:16:54 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d#1d5c742651b598a03a3894a8537d40c474fb340c_40_40)
ZugBahnHof commented 2021-05-14 22:16:55 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • f5e55dad - Apply 10 suggestion(s) to 1 file(s)

Compare with previous version

added 1 commit <ul><li>f5e55dad - Apply 10 suggestion(s) to 1 file(s)</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8120&start_sha=9387ee73869736af682c3c3096c6e400d757c76d)
hansegucker commented 2021-05-14 22:17:45 +02:00 (Migrated from edugit.org)
Copy link
        <i class="material-icons left">create_new_folder</i> {% trans "Add FAQ section" %}
```suggestion:-0+0 <i class="material-icons left">create_new_folder</i> {% trans "Add FAQ section" %} ```
hansegucker commented 2021-05-14 22:17:45 +02:00 (Migrated from edugit.org)
Copy link
        <i class="material-icons left">playlist_add</i> {% trans "Add FAQ question" %}
```suggestion:-0+0 <i class="material-icons left">playlist_add</i> {% trans "Add FAQ question" %} ```
hansegucker commented 2021-05-14 22:17:46 +02:00 (Migrated from edugit.org)
Copy link
        context["layout"] = Layout("name", "icon", "show")
```suggestion:-0+0 context["layout"] = Layout("name", "icon", "show") ```
hansegucker commented 2021-05-14 22:17:46 +02:00 (Migrated from edugit.org)
Copy link
                {% trans "There are no questions in this section." %}
```suggestion:-0+0 {% trans "There are no questions in this section." %} ```
hansegucker commented 2021-05-14 22:17:46 +02:00 (Migrated from edugit.org)
Copy link
        context["layout"] = Layout(Row("name"), Row("icon"), Row("show"))
```suggestion:-0+0 context["layout"] = Layout(Row("name"), Row("icon"), Row("show")) ```
hansegucker commented 2021-05-14 22:17:47 +02:00 (Migrated from edugit.org)
Copy link
        context["layout"] = Layout(Row("question_text"), Row("icon", "section"), Row("show"), Row("answer_text"))
```suggestion:-0+0 context["layout"] = Layout(Row("question_text"), Row("icon", "section"), Row("show"), Row("answer_text")) ```
ZugBahnHof commented 2021-05-14 22:27:46 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 5 of the diff

changed this line in [version 5 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8122&start_sha=f5e55dadddda0e117a53d3375f50ccee2ca6a30d#0faf9de069ebc87e5bff835d77d23c766b53e101_41_40)
ZugBahnHof commented 2021-05-14 22:27:52 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>e2202ae1 - Remove debug print statement</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8122&start_sha=f5e55dadddda0e117a53d3375f50ccee2ca6a30d)
ZugBahnHof commented 2021-05-14 22:34:15 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8126&start_sha=e2202ae1d2d1342c9dced2967f44ac24d1a6b30f#ec9b17fb5c26c95fd5617242e2974c6187724b79_16_16)
ZugBahnHof commented 2021-05-14 22:34:16 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8126&start_sha=e2202ae1d2d1342c9dced2967f44ac24d1a6b30f#011a49f654e98f53e8f5dd76fa10540c94445512_14_14)
ZugBahnHof commented 2021-05-14 22:34:16 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8126&start_sha=e2202ae1d2d1342c9dced2967f44ac24d1a6b30f#011a49f654e98f53e8f5dd76fa10540c94445512_18_18)
ZugBahnHof commented 2021-05-14 22:34:16 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8126&start_sha=e2202ae1d2d1342c9dced2967f44ac24d1a6b30f#0a6fb8156665380f02325767ac07560e0d8739f8_32_32)
ZugBahnHof commented 2021-05-14 22:34:16 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8126&start_sha=e2202ae1d2d1342c9dced2967f44ac24d1a6b30f#1d5c742651b598a03a3894a8537d40c474fb340c_82_82)
ZugBahnHof commented 2021-05-14 22:34:17 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8126&start_sha=e2202ae1d2d1342c9dced2967f44ac24d1a6b30f#1d5c742651b598a03a3894a8537d40c474fb340c_106_106)
ZugBahnHof commented 2021-05-14 22:34:18 +02:00 (Migrated from edugit.org)
Copy link

added 4 commits

Compare with previous version

added 4 commits <ul><li>c6872282 - Unify layout of urls.py</li><li>cbed9c9f - Remove unnecessary Row</li><li>7ec6c857 - Beautify template strings</li><li>adee3016 - Apply layout suggestions from @hansegucker</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8126&start_sha=e2202ae1d2d1342c9dced2967f44ac24d1a6b30f)
ZugBahnHof commented 2021-05-14 22:40:15 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8128&start_sha=adee3016b15e3279458e0e7f07824b3974795b99#015fd8bccf6e204194f29db33e483827d83bc203_15_15)
ZugBahnHof commented 2021-05-14 22:40:16 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 807661c3 - Apply form building suggestions from @hansegucker

Compare with previous version

added 1 commit <ul><li>807661c3 - Apply form building suggestions from @hansegucker</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8128&start_sha=adee3016b15e3279458e0e7f07824b3974795b99)
ZugBahnHof commented 2021-05-14 22:41:15 +02:00 (Migrated from edugit.org)
Copy link

resolved all threads

resolved all threads
ZugBahnHof commented 2021-05-14 22:41:32 +02:00 (Migrated from edugit.org)
Copy link

marked this merge request as ready

marked this merge request as **ready**
ZugBahnHof commented 2021-05-15 12:15:11 +02:00 (Migrated from edugit.org)
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>78ba22a1 - Run reformat</li><li>79ec735f - Add permissions to all new views</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8166&start_sha=807661c35e4ebcc84bb7fa77928891d1d70a3693)
nik commented 2021-05-15 12:21:50 +02:00 (Migrated from edugit.org)
Copy link

Please clean up the commit history, squashing/reordering/etc. irrelevant commits.

Please clean up the commit history, squashing/reordering/etc. irrelevant commits.
ZugBahnHof commented 2021-05-15 12:24:57 +02:00 (Migrated from edugit.org)
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>7cf4a7bc - Remove unused import</li><li>9ca54598 - Update lockfile</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8173&start_sha=79ec735f95ea122538c0f77ae3776163aff3a433)
ZugBahnHof commented 2021-05-15 13:03:40 +02:00 (Migrated from edugit.org)
Copy link

added 72 commits

  • eba1616f - Create a page for faq ordering
  • fd515744 - Remove unnecessary stuff
  • c81556a8 - Use permissions
  • 6bede98e - Fixed icon bug
  • 32ea35a4 - Update translation files
  • aab9b4ff - Translated using Weblate (German)
  • 21d50375 - Update dependency flake8-isort to v4
  • c4eff4aa - Update dependency pytest to v6
  • 1d93368e - Update lockfile
  • 7b5af0d5 - Update lockfile. Advances AlekSIS/official/AlekSIS#305.
  • 41694c70 - Update dependency flake8-rst-docstrings to ^0.0.14
  • 016d7555 - Update dependency pytest-django to v4
  • f1e61c13 - Use correct icon
  • bec1e544 - Update poetry lockfile. Advances AlekSIS/official/AlekSIS#316.
  • de1c8856 - Build pypi package and reformat
  • 0a59593b - Fix core dependency
  • 30c90bdc - Allow prereleases
  • 6492ce85 - Bump dependency version
  • 5cbd6306 - Include compiled messages
  • 20ef0a5e - Use setuptools entrypoints to register AlekSIS app
  • 0e180873 - Configure black line length
  • b4d70689 - Use aleksis-builddeps meta-package
  • 14cf72c3 - Update poetry.lock
  • ab52a0cb - Update tox.ini from template
  • ffdf5657 - Make lint clean
  • a7846b4d - Use predefined black profile in isort
  • ca925d9f - Update lockfile
  • fc9436d5 - Add never_cache decorators
  • fb7487c4 - Update tox.ini. Advances AlekSIS-Core#338
  • 59f08061 - Update tox.ini. Advances AlekSIS-Core#338
  • 6598f538 - Remove wrongly added locales
  • 207cdb3f - ugettext lazy is deprecated.
  • 79799bd6 - Update poetry.lock
  • 52fb7b84 - Update ci config
  • 1070fecd - Update tox.ini; compile messages before building dist
  • 4b49c83f - Add template for pull requests at GitHub for mirroring
  • 08a3b7cc - Update ci config
  • 61df5741 - Trigger dist pipeline on master
  • 451a4777 - Update lockfile
  • 9a3aede8 - Fix GlobalPermissionModel
  • d12bab7a - Change max_length attributes
  • ff7aede0 - Update poetry.lock
  • aa66803f - Update poetry.lock
  • 01185f23 - Update copyright information for 2021
  • 02a9bf7f - Denote Teckids e.V. as licensor as defined by EUPL
  • 8e89799b - Prepare django 3.2 update
  • 320d40e4 - Translated using Weblate (German)
  • 77dce072 - Translated using Weblate (German)
  • 64285c80 - Translated using Weblate (German)
  • 2fca1dfc - Update poetry.lock
  • 1dcc8ae2 - Create a form to edit faqquestions
  • 2b2223c1 - Add a property for questions to be shown
  • e48acea2 - Build a crude template for CRUD views inside hjelp
  • ecdb8a50 - Add CRUD views for faq actions
  • 3f59b2ad - Add success messages on OrderFAQ
  • 2ce929dc - Add urls for said crud views
  • 9910bf49 - Show only correct faq questions and sections and display a message if there are none
  • 89ae863b - Use black as a default icon color
  • 8235cc76 - Include all new forms in the order_faq.html template
  • 298e1dfb - Style the faq management using css
  • 62c80e36 - Merge migrations
  • 4a8244d2 - Apply 10 suggestion(s) to 1 file(s)
  • bc5230aa - Remove debug print statement
  • 9d0ae61b - Unify layout of urls.py
  • 97745ede - Remove unnecessary Row
  • b48c7656 - Beautify template strings
  • 8e59440a - Apply layout suggestions from @hansegucker
  • 5bf723f0 - Apply form building suggestions from @hansegucker
  • 4236929f - Run reformat
  • 0e56c233 - Add permissions to all new views
  • c5c97996 - Remove unused import
  • 237e84eb - Update lockfile

Compare with previous version

added 72 commits <ul><li>eba1616f - Create a page for faq ordering</li><li>fd515744 - Remove unnecessary stuff</li><li>c81556a8 - Use permissions</li><li>6bede98e - Fixed icon bug</li><li>32ea35a4 - Update translation files</li><li>aab9b4ff - Translated using Weblate (German)</li><li>21d50375 - Update dependency flake8-isort to v4</li><li>c4eff4aa - Update dependency pytest to v6</li><li>1d93368e - Update lockfile</li><li>7b5af0d5 - Update lockfile. Advances AlekSIS/official/AlekSIS#305.</li><li>41694c70 - Update dependency flake8-rst-docstrings to ^0.0.14</li><li>016d7555 - Update dependency pytest-django to v4</li><li>f1e61c13 - Use correct icon</li><li>bec1e544 - Update poetry lockfile. Advances AlekSIS/official/AlekSIS#316.</li><li>de1c8856 - Build pypi package and reformat</li><li>0a59593b - Fix core dependency</li><li>30c90bdc - Allow prereleases</li><li>6492ce85 - Bump dependency version</li><li>5cbd6306 - Include compiled messages</li><li>20ef0a5e - Use setuptools entrypoints to register AlekSIS app</li><li>0e180873 - Configure black line length</li><li>b4d70689 - Use aleksis-builddeps meta-package</li><li>14cf72c3 - Update poetry.lock</li><li>ab52a0cb - Update tox.ini from template</li><li>ffdf5657 - Make lint clean</li><li>a7846b4d - Use predefined black profile in isort</li><li>ca925d9f - Update lockfile</li><li>fc9436d5 - Add never_cache decorators</li><li>fb7487c4 - Update tox.ini. Advances AlekSIS-Core#338</li><li>59f08061 - Update tox.ini. Advances AlekSIS-Core#338</li><li>6598f538 - Remove wrongly added locales</li><li>207cdb3f - ugettext lazy is deprecated.</li><li>79799bd6 - Update poetry.lock</li><li>52fb7b84 - Update ci config</li><li>1070fecd - Update tox.ini; compile messages before building dist</li><li>4b49c83f - Add template for pull requests at GitHub for mirroring</li><li>08a3b7cc - Update ci config</li><li>61df5741 - Trigger dist pipeline on master</li><li>451a4777 - Update lockfile</li><li>9a3aede8 - Fix GlobalPermissionModel</li><li>d12bab7a - Change max_length attributes</li><li>ff7aede0 - Update poetry.lock</li><li>aa66803f - Update poetry.lock</li><li>01185f23 - Update copyright information for 2021</li><li>02a9bf7f - Denote Teckids e.V. as licensor as defined by EUPL</li><li>8e89799b - Prepare django 3.2 update</li><li>320d40e4 - Translated using Weblate (German)</li><li>77dce072 - Translated using Weblate (German)</li><li>64285c80 - Translated using Weblate (German)</li><li>2fca1dfc - Update poetry.lock</li><li>1dcc8ae2 - Create a form to edit faqquestions</li><li>2b2223c1 - Add a property for questions to be shown</li><li>e48acea2 - Build a crude template for CRUD views inside hjelp</li><li>ecdb8a50 - Add CRUD views for faq actions</li><li>3f59b2ad - Add success messages on OrderFAQ</li><li>2ce929dc - Add urls for said crud views</li><li>9910bf49 - Show only correct faq questions and sections and display a message if there are none</li><li>89ae863b - Use black as a default icon color</li><li>8235cc76 - Include all new forms in the order_faq.html template</li><li>298e1dfb - Style the faq management using css</li><li>62c80e36 - Merge migrations</li><li>4a8244d2 - Apply 10 suggestion(s) to 1 file(s)</li><li>bc5230aa - Remove debug print statement</li><li>9d0ae61b - Unify layout of urls.py</li><li>97745ede - Remove unnecessary Row</li><li>b48c7656 - Beautify template strings</li><li>8e59440a - Apply layout suggestions from @hansegucker</li><li>5bf723f0 - Apply form building suggestions from @hansegucker</li><li>4236929f - Run reformat</li><li>0e56c233 - Add permissions to all new views</li><li>c5c97996 - Remove unused import</li><li>237e84eb - Update lockfile</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8183&start_sha=9ca545989dcb3ab06cf525b31f4b1ff707840b9d)
ZugBahnHof commented 2021-05-15 13:36:18 +02:00 (Migrated from edugit.org)
Copy link

added 119 commits

  • 237e84eb...94c059fa - 84 commits from branch master
  • 5632f112 - Add a field `show` to FAQSections and create migrations
  • 0325bde6 - Use correct queryset
  • 41f58897 - Create a page for faq ordering
  • ae85dc82 - Remove unnecessary stuff
  • 2d71fb02 - Use permissions
  • d686cd29 - Fixed icon bug
  • bfd8ffca - Update dependency flake8-rst-docstrings to ^0.0.14
  • d2bd54be - Build pypi package and reformat
  • 319f6529 - Allow prereleases
  • 23730e7e - Configure black line length
  • d0adb95d - Update poetry.lock
  • c8564857 - Make lint clean
  • 2a75a2c1 - Update lockfile
  • 502957c8 - Create a form to edit faqquestions
  • c654ef11 - Add a property for questions to be shown
  • 58dc878c - Build a crude template for CRUD views inside hjelp
  • e3cc5f69 - Add CRUD views for faq actions
  • 71391b14 - Add success messages on OrderFAQ
  • 7663e6cb - Add urls for said crud views
  • b22457da - Show only correct faq questions and sections and display a message if there are none
  • ded9f6f4 - Use black as a default icon color
  • 9323bdf8 - Include all new forms in the order_faq.html template
  • 8c7dca1e - Style the faq management using css
  • 5a3611bf - Merge migrations
  • 0ca9689a - Apply 10 suggestion(s) to 1 file(s)
  • 6f44d3c7 - Remove debug print statement
  • 798b2b59 - Unify layout of urls.py
  • b22ec459 - Remove unnecessary Row
  • 7be3f7db - Beautify template strings
  • 80663de0 - Apply layout suggestions from @hansegucker
  • ee5819db - Apply form building suggestions from @hansegucker
  • 9eda6efb - Run reformat
  • bad75a66 - Add permissions to all new views
  • 45e834c3 - Remove unused import
  • 066e8753 - Update lockfile

Compare with previous version

added 119 commits <ul><li>237e84eb...94c059fa - 84 commits from branch <code>master</code></li><li>5632f112 - Add a field `show` to FAQSections and create migrations</li><li>0325bde6 - Use correct queryset</li><li>41f58897 - Create a page for faq ordering</li><li>ae85dc82 - Remove unnecessary stuff</li><li>2d71fb02 - Use permissions</li><li>d686cd29 - Fixed icon bug</li><li>bfd8ffca - Update dependency flake8-rst-docstrings to ^0.0.14</li><li>d2bd54be - Build pypi package and reformat</li><li>319f6529 - Allow prereleases</li><li>23730e7e - Configure black line length</li><li>d0adb95d - Update poetry.lock</li><li>c8564857 - Make lint clean</li><li>2a75a2c1 - Update lockfile</li><li>502957c8 - Create a form to edit faqquestions</li><li>c654ef11 - Add a property for questions to be shown</li><li>58dc878c - Build a crude template for CRUD views inside hjelp</li><li>e3cc5f69 - Add CRUD views for faq actions</li><li>71391b14 - Add success messages on OrderFAQ</li><li>7663e6cb - Add urls for said crud views</li><li>b22457da - Show only correct faq questions and sections and display a message if there are none</li><li>ded9f6f4 - Use black as a default icon color</li><li>9323bdf8 - Include all new forms in the order_faq.html template</li><li>8c7dca1e - Style the faq management using css</li><li>5a3611bf - Merge migrations</li><li>0ca9689a - Apply 10 suggestion(s) to 1 file(s)</li><li>6f44d3c7 - Remove debug print statement</li><li>798b2b59 - Unify layout of urls.py</li><li>b22ec459 - Remove unnecessary Row</li><li>7be3f7db - Beautify template strings</li><li>80663de0 - Apply layout suggestions from @hansegucker</li><li>ee5819db - Apply form building suggestions from @hansegucker</li><li>9eda6efb - Run reformat</li><li>bad75a66 - Add permissions to all new views</li><li>45e834c3 - Remove unused import</li><li>066e8753 - Update lockfile</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8196&start_sha=237e84eb450f49de291c9ece653155203ebc36af)
ZugBahnHof commented 2021-05-15 16:31:26 +02:00 (Migrated from edugit.org)
Copy link

added 35 commits

  • 6aacdc62 - Add a field `show` to FAQSections and create migrations
  • 1c7273cb - Use correct queryset
  • 6f855781 - Create a view to order the faq
  • b623a098 - Create an url to order the faq
  • acd7ff24 - Create a js script to order the faq
  • c5e51b2a - Create a html template script to order the faq
  • 12668c4f - Change a model to order the faq
  • 3c4daa7d - Create a form to order the faq
  • e1a14436 - Create a stylesheet to order the faq
  • 58c2169d - Create a menu to order the faq
  • 6589db68 - Remove unnecessary stuff
  • 8eceb4ba - Use permissions
  • 889c1608 - Merge branch 'master' into 29-allow-sorting-of-faq-sections-and-questions
  • 31ed20ce - Create a form to edit faqquestions
  • 8bc3aee5 - Add a property for questions to be shown
  • 213a698f - Build a crude template for CRUD views inside hjelp
  • 610626aa - Add CRUD views for faq actions
  • f503ae57 - Add success messages on OrderFAQ
  • 2874f54e - Add urls for said crud views
  • 2a998d71 - Show only correct faq questions and sections and display a message if there are none
  • f67edae5 - Use black as a default icon color
  • ec2d5b18 - Include all new forms in the order_faq.html template
  • d3355340 - Style the faq management using css
  • 9387ee73 - Merge migrations
  • f5e55dad - Apply 10 suggestion(s) to 1 file(s)
  • e2202ae1 - Remove debug print statement
  • c6872282 - Unify layout of urls.py
  • cbed9c9f - Remove unnecessary Row
  • 7ec6c857 - Beautify template strings
  • adee3016 - Apply layout suggestions from @hansegucker
  • 807661c3 - Apply form building suggestions from @hansegucker
  • 78ba22a1 - Run reformat
  • 79ec735f - Add permissions to all new views
  • 7cf4a7bc - Remove unused import
  • 9ca54598 - Update lockfile

Compare with previous version

added 35 commits <ul><li>6aacdc62 - Add a field `show` to FAQSections and create migrations</li><li>1c7273cb - Use correct queryset</li><li>6f855781 - Create a view to order the faq</li><li>b623a098 - Create an url to order the faq</li><li>acd7ff24 - Create a js script to order the faq</li><li>c5e51b2a - Create a html template script to order the faq</li><li>12668c4f - Change a model to order the faq</li><li>3c4daa7d - Create a form to order the faq</li><li>e1a14436 - Create a stylesheet to order the faq</li><li>58c2169d - Create a menu to order the faq</li><li>6589db68 - Remove unnecessary stuff</li><li>8eceb4ba - Use permissions</li><li>889c1608 - Merge branch &#39;master&#39; into 29-allow-sorting-of-faq-sections-and-questions</li><li>31ed20ce - Create a form to edit faqquestions</li><li>8bc3aee5 - Add a property for questions to be shown</li><li>213a698f - Build a crude template for CRUD views inside hjelp</li><li>610626aa - Add CRUD views for faq actions</li><li>f503ae57 - Add success messages on OrderFAQ</li><li>2874f54e - Add urls for said crud views</li><li>2a998d71 - Show only correct faq questions and sections and display a message if there are none</li><li>f67edae5 - Use black as a default icon color</li><li>ec2d5b18 - Include all new forms in the order_faq.html template</li><li>d3355340 - Style the faq management using css</li><li>9387ee73 - Merge migrations</li><li>f5e55dad - Apply 10 suggestion(s) to 1 file(s)</li><li>e2202ae1 - Remove debug print statement</li><li>c6872282 - Unify layout of urls.py</li><li>cbed9c9f - Remove unnecessary Row</li><li>7ec6c857 - Beautify template strings</li><li>adee3016 - Apply layout suggestions from @hansegucker</li><li>807661c3 - Apply form building suggestions from @hansegucker</li><li>78ba22a1 - Run reformat</li><li>79ec735f - Add permissions to all new views</li><li>7cf4a7bc - Remove unused import</li><li>9ca54598 - Update lockfile</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Hjelp/-/merge_requests/42/diffs?diff_id=8271&start_sha=066e8753b41f1eaf15ad2aa30912b21b68ed0639)
nik (Migrated from edugit.org) scheduled this pull request to auto merge when all checks succeed 2021-05-15 16:41:15 +02:00
nik commented 2021-05-15 16:52:52 +02:00 (Migrated from edugit.org)
Copy link

mentioned in commit 39d359a006

mentioned in commit 39d359a006e3170e179d883090e4ecb3099539c8
nik (Migrated from edugit.org) merged commit 39d359a006 into master 2021-05-15 16:52:56 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
board
done

  
board
ready

  
board
todo

  
check
delete-eslint-rc-js

  
check
update-builddeps-package-json

  
check
update-eslint-rc-js

  
check
update-gitignore

  
check
update-merge-request-template

  
check
update-prettier-ignore

  
check
update-pyproject-toml

  
check
update-renovate-json

  
check
update-tox-ini

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
breaking

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

No labels
Security
TeX
auto-update
board
done
board
ready
board
todo
check
delete-eslint-rc-js
check
update-builddeps-package-json
check
update-eslint-rc-js
check
update-gitignore
check
update-merge-request-template
check
update-prettier-ignore
check
update-pyproject-toml
check
update-renovate-json
check
update-tox-ini
part
backend
part
ci
part
docs
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
breaking
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS-App-Hjelp!98
No description provided.