Deployment #654
Merged
Deployment #654
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [social-auth-core[openidconnect]](https://github.com/python-social-auth/social-core) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/python-social-auth/social-core/releases) - [Changelog](https://github.com/python-social-auth/social-core/blob/master/CHANGELOG.md) - [Commits](python-social-auth/social-core@4.4.0...4.4.1) --- updated-dependencies: - dependency-name: social-auth-core[openidconnect] dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This was probably caused by a slip-up while rebasing 1047767.
Bumps [social-auth-app-django](https://github.com/python-social-auth/social-app-django) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/python-social-auth/social-app-django/releases) - [Changelog](https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md) - [Commits](python-social-auth/social-app-django@5.1.0...5.2.0) --- updated-dependencies: - dependency-name: social-auth-app-django dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Constantly having to keep this year updated to the present year seems to simply be a long-standing norm in the open source community, rather than something that's legally required. There doesn't seem to be a consensus on exactly what to remove and what to keep, however, so replacing the end year with "present" seems like the most conservative option that still removes the need to constantly keep the year updated. This was inspired by tox-dev/tox#2941, which also links to a couple other "testimonies": * https://daniel.haxx.se/blog/2023/01/08/copyright-without-years/ * https://hynek.me/til/copyright-years/
Bumps [django-ical](https://github.com/jazzband/django-ical) from 1.8.3 to 1.8.4. - [Release notes](https://github.com/jazzband/django-ical/releases) - [Changelog](https://github.com/jazzband/django-ical/blob/master/CHANGES.rst) - [Commits](jazzband/django-ical@1.8.3...1.8.4) --- updated-dependencies: - dependency-name: django-ical dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.4.0 to 9.5.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](python-pillow/Pillow@9.4.0...9.5.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Also corrected the English translation of "Skjul - noen er bak meg!" for the hiding button for secrets. Also replaced some usages of the dash (-) with the more appropriate en dash (–).
Also added `machine_usage_rule_form.html` (extending `content_box_form.html`), for removing the added Django admin link.
...in `CONTRIBUTING.md`.
The code should now be more easily extendable.
This should make it less frustrating for users trying to see secrets containing larger amounts of text, and will hopefully avoid creating situations where privileged users feel "forced" to visit the change form of a secret in order to see it for longer, which defeats the whole purpose of making the secrets auto-hide themselves. Also moved each secret's "hide" button (and "delay hiding" button) above the secret's content, to faster enable users to hide the secret right after showing it, since the "show" and "hide" buttons now appear in the same spot.
...so that the HTML elements are siblings. This makes it easier to reposition the buttons and other content around them.
This makes it possible to create secrets that not all MAKE members need - which has been requested as a feature (see #542).
...for use with the newly added `Secret.extra_view_permissions` field.
Fix a few misc things
Extra view permissions for secrets
Bumps [django-ical](https://github.com/jazzband/django-ical) from 1.8.4 to 1.9.0. - [Release notes](https://github.com/jazzband/django-ical/releases) - [Changelog](https://github.com/jazzband/django-ical/blob/master/CHANGES.rst) - [Commits](jazzband/django-ical@1.8.4...1.9.0) --- updated-dependencies: - dependency-name: django-ical dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) from 3.0.9 to 3.1.0. - [Release notes](https://github.com/jmcnamara/XlsxWriter/releases) - [Changelog](https://github.com/jmcnamara/XlsxWriter/blob/main/Changes) - [Commits](jmcnamara/XlsxWriter@RELEASE_3.0.9...RELEASE_3.1.0) --- updated-dependencies: - dependency-name: xlsxwriter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [social-auth-core[openidconnect]](https://github.com/python-social-auth/social-core) from 4.4.1 to 4.4.2. - [Release notes](https://github.com/python-social-auth/social-core/releases) - [Changelog](https://github.com/python-social-auth/social-core/blob/master/CHANGELOG.md) - [Commits](python-social-auth/social-core@4.4.1...4.4.2) --- updated-dependencies: - dependency-name: social-auth-core[openidconnect] dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…1.0 (#641) Bumps [django-phonenumber-field[phonenumbers]](https://github.com/stefanfoulis/django-phonenumber-field) from 7.0.2 to 7.1.0. - [Release notes](https://github.com/stefanfoulis/django-phonenumber-field/releases) - [Changelog](https://github.com/stefanfoulis/django-phonenumber-field/blob/main/CHANGELOG.rst) - [Commits](stefanfoulis/django-phonenumber-field@7.0.2...7.1.0) --- updated-dependencies: - dependency-name: django-phonenumber-field[phonenumbers] dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-ical](https://github.com/jazzband/django-ical) from 1.9.0 to 1.9.1. - [Release notes](https://github.com/jazzband/django-ical/releases) - [Changelog](https://github.com/jazzband/django-ical/blob/master/CHANGES.rst) - [Commits](jazzband/django-ical@1.9.0...1.9.1) --- updated-dependencies: - dependency-name: django-ical dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Added small secondary blue ribbon to internal events on the main page and the event page. Added a larger blue ribbon to the events detail page
Added large blue ribbon to internal articles on the main page and the articles page
Changed cropping of images in articles list and events list
Also added the search query to the page title in the template.
...instead of having the excluded reservation PK as part of the path. This should make it easier to potentially extend the code in the future.
The tests now use the more standard approach of comparing the context data of responses from test clients, instead of using mock requests. Also made the previously named `test_inherited_permissions()` properly test which inherited permissions are listed, as the tests previously didn't add any permissions to any of the groups (i.e. `dev.inherited_permissions` was empty). Also removed some comments from `test_models.py` that were accidentally added in 144e4ef from another, unfinished commit.
…stead-of-distinct-paths Make some views use URL query parameters instead of distinct paths
...to comply with the style guide. The path segments (i.e. the text between the forward slashes) now have a more consistent structure, including being prefixed by `admin/` and `api/` - as described in `CONTRIBUTING.md` - by placing the `path()` calls inside "custom `urlpatterns` lists", like `adminpatterns` and `apipatterns` - also described in `CONTRIBUTING.md`. Of the views whose paths have been changed, the ones that I deemed as relevant, have been added to the "Old URLs" in `web/urls.py` to (permanently) redirect from the old to the new path. Also added permission checks for all admin URLs (indlucing admin API URLs) that require the requesting user to have the `internal.is_internal` permission. Also: * Reordered the tests in all apps' `test_urls.py` to match the order of the paths listed in each app's `urls.py` * Improved some of the parts in `CONTRIBUTING.md` on things related to path naming and organization * Added some missing `ContentBox` tests to `internal/tests/test_urls.py`, as well as all the member GET URLs, as it's useful to have all URLs listed in one place, even if it duplicates some testing * Added some missing tests for the `event_ticket_cancel` URL in `news/tests/test_urls.py`
Now, instead of returning a `404` HTTP status code, `ContentBoxUpdateView` redirects to the content box's change page on the subdomain it "belongs on" (i.e. the subdomain that has a registered display URL for the content box). Additionally, if the requested content box has no registered URL on any subdomain, the view will redirect to the content box's Django admin change page.
--- `checkin` --- Moved from `views.py` to `api/views.py`: * AdminAPISuggestSkillVoteView * AdminAPISuggestSkillDeleteView * AdminAPIRegisterProfileView --- `make_queue` --- Moved from `forms.py` to `api/forms.py`: * APIMachineDataQueryForm * APIReservationListQueryForm Moved from `forms.py` to `forms/course.py`: * Printer3DCourseForm Moved from `forms.py` to `forms/machine.py`: * MachineFormBase * AddMachineForm * ChangeMachineForm * MachineDetailQueryForm Moved from `forms.py` to `forms/quota.py`: * QuotaForm * AdminQuotaPanelQueryForm Moved from `forms.py` to `forms/reservation_rule.py`: * ReservationRuleForm Moved from `forms.py` to `forms/reservation.py`: * ReservationForm * ReservationFindFreeSlotsForm * ReservationListQueryForm Moved from `views/api/calendar.py` to `api/views.py`: * reservation_type() * APIReservationListView * APIReservationRuleListView Moved from `views/api/reservation.py` to `api/views.py`: * APIMachineDataView Moved from `views/reservation/reservation.py` to `api/views.py`: * APIReservationMarkFinishedView * APIReservationDeleteView Renamed `views/admin/course.py` to `views/course.py`. Moved from `views/reservation/rules.py` to `views/machine.py`: * MachineTypeRelatedViewMixin * MachineUsageRuleDetailView * MachineUsageRuleUpdateView Moved from `views/reservation/reservation.py` to `views/machine.py`: * MachineRelatedViewMixin Moved from `views/reservation/calendar.py` to `views/machine.py`: * MachineDetailView Moved from `views/reservation/machine.py` to `views/machine.py`: * MachineListView * MachineFormMixin * MachineCreateView * MachineUpdateView * MachineDeleteView Renamed `views/admin/quota.py` to `views/quota.py`. Moved from `views/quota/user.py` to `views/quota.py`: * AdminUserQuotaListView Moved from `views/reservation/rules.py` to `views/reservation_rule.py`: * ReservationRuleListView * ReservationRuleFormMixin * ReservationRuleCreateView * ReservationRuleUpdateView * ReservationRuleDeleteView Moved from `views/reservation/reservation.py` to `views/reservation.py`: * ReservationCreateOrUpdateView * ReservationCreateView * ReservationUpdateView * ReservationListView * ReservationFindFreeSlotsView --- `news` --- Moved from `views.py` to `api/views.py`: * AdminAPINewsBaseToggleView * AdminAPIArticleToggleView * AdminAPIEventToggleView * AdminAPITimePlaceToggleView Moved from `views.py` to `views/article.py`: * ArticleListView * ArticleDetailView * AdminArticleListView * NewsBaseFormMixin * ArticleFormMixin * ArticleUpdateView * ArticleCreateView * ArticleDeleteView Moved from `views.py` to `views/event.py`: * EventListView * EventDetailView * AdminEventListView * AdminEventParticipantsSearchView * AdminEventDetailView * EventFormMixin * EventUpdateView * EventCreateView * EventRelatedViewMixin * TimePlaceRelatedViewMixin * TimePlaceFormMixin * TimePlaceUpdateView * TimePlaceCreateView * TimePlaceDuplicateCreateView * EventDeleteView * TimePlaceDeleteView * EventTicketCreateView * EventTicketDetailView * EventTicketMyListView * AdminEventTicketListView * AdminTimePlaceTicketListView * EventTicketCancelView --- `users` --- Renamed `views.py` to `api/views.py`.
Renamed `test_course.py` to `test_course_forms.py`. Renamed `test_reservation_rules.py` to `test_reservation_rule.py`. Moved from `test_reservation_reservation.py` to `test_api_reservation_views.py`: * TestAPIReservationMarkFinishedView Moved from `test_delete_reservation_view.py` to `test_api_reservation_views.py`: * TestAPIReservationDeleteView Renamed `test_reservation_reservation.py` to `test_reservation_views.py`.
Unused paths (not linked to anywhere) have a greater potential for containing insecure or buggy code, since they're unlikely to be visited regularly.
...which is a more appropriate response that an unexplained redirect.
It now responds with `405` ("Method Not Allowed") instead of `404` ("Not Found"), which is more appropriate.
…-and-views-and-forms Reorganize URL patterns, and some views and forms
Add some PR template checkboxes
Remove explicit copyright end year from LICENSE
make-bot
bot
added
the
deployment
Codecov Report
@@ Coverage Diff @@
## main #654 +/- ##
==========================================
+ Coverage 87.27% 88.16% +0.89%
==========================================
Files 135 152 +17
Lines 5672 6187 +515
==========================================
+ Hits 4950 5455 +505
- Misses 722 732 +10
|
elisakiv
approved these changes
May 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Brings in the changes from the following PRs:
Also the following automated PRs: