Skip to content

Commit

Permalink
Merge branch 'develop' into etna-rosetta
Browse files Browse the repository at this point in the history
  • Loading branch information
TNA-Allan committed Feb 9, 2024
2 parents 566b7ba + f73f889 commit 3fe683e
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .platform.app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ mounts:

crons:
# Publish scheduled pages once an hour
# https://docs.wagtail.io/en/stable/reference/management_commands.html#publish-scheduled-pages
publish_scheduled_pages:
# https://docs.wagtail.org/en/stable/reference/management_commands.html#publish-scheduled
publish_scheduled:
spec: 0 * * * *
cmd: python manage.py publish_scheduled_pages
cmd: poetry run python manage.py publish_scheduled

# Take snapshot at 5am every morning
# https://docs.platform.sh/administration/snapshot-and-restore.html#automated-snapshots
Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 The National Archives, UK

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 1 addition & 1 deletion templates/records/archive_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{% include "includes/records/archive-collections.html" %}

{% include "includes/records/archive-additional-resources.html" %}

</div>
{% endblock %}

{% block extra_js %}
Expand Down
2 changes: 1 addition & 1 deletion templates/records/record_creators.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="container">

{% include "includes/records/record_creator_description.html" %}

</div>
{% endblock %}

{% block extra_js %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ <h3 class="tna-heading-m">
<a href="{% url 'search-catalogue' %}?q={{ search_query|iriencode }}&group={{ bucket.key }}">
See all relevant {{ bucket.label_with_count }}
</a>
</div>
</p>
</div>
1 change: 1 addition & 0 deletions templates/search/blocks/native_website_result--grid.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@
{% endif %}

</dl>
</div>
</li>

Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,5 @@ <h4 class="tna-heading-s">
</div>
{% endif %}
{% endif %}
</div>
</li>
1 change: 1 addition & 0 deletions templates/search/native_website_search.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ <h2 class="sr-only">Results</h2>

</div>
</div>
</div>

{% if paginator.count %}
{% include './blocks/search_pagination.html' %}
Expand Down

0 comments on commit 3fe683e

Please sign in to comment.