Deployment #343
Merged
Deployment #343
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
…nd the inner is questions. Questions with multiple categories shows up in all categories
# Conflicts: # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
… a missing translation, based on review comments
This was mainly done to facilitate dependency (and subsequently security) scanning, like GitHub's Dependabot (see https://github.com/MAKENTNU/web/network/updates).
This file was generated by GitHub.
I considered setting `target-branch: "dev"`, but decided against it due to the following quote from the documentation (https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/configuration-options-for-dependency-updates#target-branch): > When you use this option, the settings for this package manager will no longer affect any pull requests raised for security updates.
This file was generated by GitHub.
The following error occurred when building the wheel for `python-ldap`:
In file included from Modules/LDAPObject.c:3:0:
Modules/common.h:15:10: fatal error: lber.h: No such file or directory
Also added tip on how to print database queries to the console.
(This is only relevant for production, not local development.) Previously, when visiting e.g. https://i.makentnu.no/ when not logged in, one would get redirected to the front page (https://makentnu.no/) after login. Also moved the subdomain list from `hosts.py` to `settings.py`.
Add Dependabot and CodeQL analysis
Improve settings
Also removed the unused duplicate "make_reservation" path in `make_queue/urls.py`.
The most popular convention for naming CSS and JavaScript files seems to be using hyphens between words. In our codebase, however, the .css files have underscores instead of hyphens, to match the name of the template file they belong to. The .js files also have underscores, to simply match the naming convention of all the other files.
… FaqpageConfig to FaqConfig
Also removed the unused `data-title` and `data-content` attributes of the delete button in `faq_admin.html` and `admin_equipment_list.html`, and some (now) unused selectors in `style.css`.
Now the view is not dependent on a completely unrelated template, which facilitates changing model-specific parts of the templates without affecting the other view. This does however duplicate most of the code of `contentbox/edit.html`, and the two templates should be reformatted in the future to reduce this duplication.
* Added "Cancel" buttons to edit/create pages * Made the "Cancel"/"Save" buttons float to the right, and made the "Save"/"Submit" buttons "MAKE yellow" instead of blue * Made alle "Edit" buttons use an `edit` icon
* Made CKEditor choose "_blank" as default link target * Made events in the calendar into <a> tags * Added links to event places in the event list
Not entirely sure which change caused this..
This also fixed some failing `DeleteReservationViewTestCase` tests.
Also updated a couple changed validator messages in `0002_filter_page_title.py` and `0013_course_card_number_field.py`.
…servation was denied
Reservation error fix
Fixes for course registration search functionality
…cleanup # Conflicts: # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po # make_queue/templates/make_queue/course/course_registration_list.html # make_queue/templates/make_queue/reservation_edit.html # make_queue/views/reservation/reservation.py
Design and layout cleanup
Codecov Report
@@ Coverage Diff @@
## master #343 +/- ##
==========================================
+ Coverage 72.05% 72.41% +0.35%
==========================================
Files 103 113 +10
Lines 3357 3458 +101
==========================================
+ Hits 2419 2504 +85
- Misses 938 954 +16
Continue to review full report at Codecov.
|
ddabble
approved these changes
Mar 10, 2021
mahoyen
added
the
deployment
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.
This deployment PR includes the changes from:
#323 Add FAQ page
#324 Internal mainpage
#335 Add Dependabot and CodeQL analysis
#336 Improve settings
#337 Cleanup of filenames and folder structure
#338 Design and layout cleanup
#339 Reservation error fix
#340 Fixes for course registration search functionality