Merge branch 'jhuopensource:develop' into develop

jhuopensource · Sep 22, 2024 · 10b700f · 10b700f
2 parents 55d59b9 + b373618
commit 10b700f
Show file tree

Hide file tree

Showing 7 changed files with 684 additions and 366 deletions.
diff --git a/agreement/templates/privacypolicy.html b/agreement/templates/privacypolicy.html
diff --git a/agreement/templates/termsofservice.html b/agreement/templates/termsofservice.html
@@ -17,6 +17,8 @@
 	<meta property="og:image" content="http://i.imgur.com/Eem4KTj.png" />
 	<meta property="og:description" content="Terms of Service" />
 	<meta property="fb:admins" content="535129063" />
+	<meta property="fb:app_id" content="580022102164877" />
+
 
 	<title>Terms of Service | Semester.ly</title>
 	<link rel="shortcut icon" type="image/x-icon" href="{% static 'img/logo2.0-310x310.png' %}" />

diff --git a/build/local_settings.py b/build/local_settings.py
@@ -1,7 +1,7 @@
 import os
 
-DEBUG = True
-SHOW_DEBUG_TOOLBAR = False
+
+DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 # This configuration relies on environment variables for DB settings

diff --git a/build/run_parser.sh b/build/run_parser.sh
@@ -3,7 +3,7 @@
 echo starting;
 cd /code
 # TODO: No params does not honor active-only semesters, this is hardcoded for now
-python3 manage.py ingest jhu --term Spring --years 2024;
+python3 manage.py ingest jhu --term Fall --years 2024;
 python3 manage.py digest jhu;
 python3 manage.py digest jhu --types evals;
 

diff --git a/manifests/azure-pipeline-stage-prod.yml b/manifests/azure-pipeline-stage-prod.yml
@@ -15,7 +15,7 @@ resources:
 variables:
 
   # Container registry service connection established during pipeline creation
-  dockerRegistryServiceConnection: '720df4c3-7872-4076-aa73-375f702f7e7c'
+  dockerRegistryServiceConnection: '7ab1d48e-244b-4080-9ced-d2c1bb7eccd6'
   imageRepository: 'semesterly'
   containerRegistry: 'semesterly.azurecr.io'
   tag: '$(Build.BuildId)'

diff --git a/manifests/azure-pipelines-dev.yml b/manifests/azure-pipelines-dev.yml
@@ -15,7 +15,7 @@ resources:
 variables:
 
   # Container registry service connection established during pipeline creation
-  dockerRegistryServiceConnection: '720df4c3-7872-4076-aa73-375f702f7e7c'
+  dockerRegistryServiceConnection: '7ab1d48e-244b-4080-9ced-d2c1bb7eccd6'
   imageRepository: 'semesterly'
   containerRegistry: 'semesterly.azurecr.io'
   tag: '$(Build.BuildId)'

diff --git a/semesterly/settings.py b/semesterly/settings.py
@@ -60,7 +60,7 @@ def get_secret(key):
 
 SECRET_KEY = get_secret("SECRET_KEY")
 
-DEBUG = True
+DEBUG = False
 
 SHOW_DEBUG_TOOLBAR = False