Skip to content

Commit a003bba

Browse files
abztraktabztrakt
authored
Merge branch 'develop' into task/SCOUT-1076
2 parents b2b1d05 + 7dd998c commit a003bba

22 files changed

+23
-23
lines changed

‎requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
-e git+https://github.com/uw-it-aca/uw-restclients-spotseeker.git#egg=uw_restclients_spotseeker
1+
-e git+https://github.com/uw-it-aca/uw-restclients-spotseeker.git@v0.3#egg=uw_restclients_spotseeker
22
-e git+https://github.com/uw-it-aca/django-hybridize/#egg=hybridize
33
-e .

‎scout/context_processors.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
from django.conf import settings

‎scout/dao/image.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
from uw_spotseeker import Spotseeker

‎scout/dao/item.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
from scout.dao.space import get_spots_by_filter, _get_spot_filters, \

‎scout/dao/space.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
from django.conf import settings

‎scout/templates/hybridize/discover_notice.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h3>
1919
<li><a style="color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://www.lib.washington.edu/coronavirus/">UW Libraries updates and resources</a></li>
2020
<li><a style="color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://hub.washington.edu/home/hub-hours/">The HUB hours</a></li>
2121
<li><a style="color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://hfs.uw.edu/Suspended-Operations/">UW Seattle Housing (dorm) restaurants and other amenities</a></li>
22-
<li style="text-align: left;">Student Technology Loan Program: <a style="display: inline; color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://www.facebook.com/uwstlp/">get updates via Facebook</a> or <a style="display: inline; color:#25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://stlp.uw.edu/">reserve equipment on their website</a>.</li>
22+
<li style="text-align: left;">Student Technology Loan Program: <a style="display: inline; color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://www.facebook.com/uwstlp/">get updates via Facebook</a> or <a style="display: inline; color:#25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://apps.stlp.uw.edu/">reserve equipment on their website</a>.</li>
2323
</ul>
2424
<p>Are you a space owner whose spaces are open? Let us know so we can include you in Scout by emailing <a href="mailto:[email protected]">[email protected]</a>.</p>
2525
{% elif campus == "tacoma" %}

‎scout/templates/hybridize/tech/detail.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
</li>
7676
{% endif %}
7777
<li>
78-
<a href="https://stlp.uw.edu/reserve" class="item-link" data-turbolinks="false">
78+
<a href="https://apps.stlp.uw.edu/reserve" class="item-link" data-turbolinks="false">
7979
<div class="item-content">
8080
<div class="item-inner">
81-
<div class="item-title">Reserve Item <span>https://stlp.uw.edu/reserve</span></div>
81+
<div class="item-title">Reserve Item <span>https://apps.stlp.uw.edu/reserve</span></div>
8282
</div>
8383
</div>
8484
</a>

‎scout/templates/hybridize/tech/list.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<p>
247247
The UW Student Technology Loan Program (UW STLP) is run by students for students, allowing currently-registered
248248
students to borrow laptops, projectors, cameras, and more for free.
249-
<a href="https://stlp.uw.edu" target="_blank">Visit the STLP site to see what's available and check out equipment.</a>
249+
<a href="https://apps.stlp.uw.edu" target="_blank">Visit the STLP site to see what's available and check out equipment.</a>
250250
</p>
251251
</div>
252252
</div>

‎scout/templates/newssplash.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ <h3>UW Seattle</h3>
431431
<li><a target="_blank" rel="noopener noreferrer" href="https://hub.washington.edu/home/hub-hours/">The HUB hours</a></li>
432432
<li><a target="_blank" rel="noopener noreferrer" href="https://hfs.uw.edu/Suspended-Operations/">UW Seattle Housing (dorm) restaurants and other amenities</a></li>
433433
<li><a target="_blank" rel="noopener noreferrer" href="https://www.washington.edu/studentlife/open/">Student Life's "What's Open"</a></li>
434-
<li>Student Technology Loan Program: <a target="_blank" rel="noopener noreferrer" href="https://www.facebook.com/uwstlp/">get updates via Facebook</a> or <a target="_blank" rel="noopener noreferrer" href="https://stlp.uw.edu/">reserve equipment on their website</a>.</li>
434+
<li>Student Technology Loan Program: <a target="_blank" rel="noopener noreferrer" href="https://www.facebook.com/uwstlp/">get updates via Facebook</a> or <a target="_blank" rel="noopener noreferrer" href="https://apps.stlp.uw.edu/">reserve equipment on their website</a>.</li>
435435
</ul>
436436
<h3>UW Tacoma</h3>
437437
<ul>

‎scout/templates/scout/discover_notice.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h3>
1919
<li><a style="color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://www.lib.washington.edu/coronavirus/">UW Libraries updates and resources</a></li>
2020
<li><a style="color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://hub.washington.edu/home/hub-hours/">The HUB hours</a></li>
2121
<li><a style="color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://hfs.uw.edu/Suspended-Operations/">UW Seattle Housing (dorm) restaurants and other amenities</a></li>
22-
<li style="text-align: left;">Student Technology Loan Program: <a style="display: inline; color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://www.facebook.com/uwstlp/">get updates via Facebook</a> or <a style="display: inline; color:#25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://stlp.uw.edu/">reserve equipment on their website</a>.</li>
22+
<li style="text-align: left;">Student Technology Loan Program: <a style="display: inline; color: #25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://www.facebook.com/uwstlp/">get updates via Facebook</a> or <a style="display: inline; color:#25738F; text-decoration: underline;" target="_blank" rel="noopener noreferrer" href="https://apps.stlp.uw.edu/">reserve equipment on their website</a>.</li>
2323
</ul>
2424
<p>Are you a space owner whose spaces are open? Let us know so we can include you in Scout by emailing <a href="mailto:[email protected]">[email protected]</a>.</p>
2525
{% elif campus == "tacoma" %}

‎scout/templates/scout/tech/detail.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ <h4 class="visually-hidden">Reservation Info</h4>
7878
</span>
7979
</a>
8080
{% else %}
81-
<a href="https://stlp.uw.edu/reserve" target="_blank">
81+
<a href="https://apps.stlp.uw.edu/reserve" target="_blank">
8282
<span class="fa-stack fa-lg">
8383
<i class="fa fa-circle fa-stack-2x"></i>
8484
<i class="fa fa-bookmark fa-stack-1x fa-inverse"></i>

‎scout/templates/scout/tech/list.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ <h4 class="scout-spot-name" id="item_header_{{item.item_id}}">{{ item.name }}</h
162162
<p>
163163
The UW Student Technology Loan Program (UW STLP) is run by students for students, allowing currently-registered
164164
students to borrow laptops, projectors, cameras, and more for free.
165-
<a href="https://stlp.uw.edu" target="_blank">Visit the STLP site to see what's available and check out equipment.</a>
165+
<a href="https://apps.stlp.uw.edu" target="_blank">Visit the STLP site to see what's available and check out equipment.</a>
166166
</p>
167167
</div>
168168
</div>

‎scout/templatetags/scout_filters.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
from django import template

‎scout/test/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
from django.test import TestCase

‎scout/test/dao/test_item_dao.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
import copy

‎scout/test/dao/test_space_dao.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
import datetime

‎scout/test/pageflow/test_content.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
"""

‎scout/test/pageflow/test_navigation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
"""

‎scout/test/pageflow/test_page_load_status.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
"""

‎scout/urls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
from django.conf import settings

‎scout/views.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
from django.http import Http404, HttpResponse

‎scout/wsgi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 UW-IT, University of Washington
1+
# Copyright 2024 UW-IT, University of Washington
22
# SPDX-License-Identifier: Apache-2.0
33

44
import os

0 commit comments

Comments
 (0)