Merge pull request #289 from skoleapp/v1.4.0-rc5

v1.4.0-rc5
skoleapp · Feb 1, 2021 · 09b493e · 09b493e
2 parents 08e33ad + 6b61837
commit 09b493e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Make marketing description slightly larger on desktop on landing pages.
 - Improve email body for shared links.
 - Hide back button during loading screen on mobile.
+- Combine the course name and code searches into one input.
 
 ### Removed
 

diff --git a/backend b/backend
diff --git a/frontend b/frontend
+1 −1		schema.graphql
+8 −8		skole/schemas/course.py
+7 −12		skole/tests/schemas/test_course.py
+8 −10		__generated__/src/graphql/common.graphql.tsx
+2 −1		locales/en/forms.json
+2 −1		locales/fi/forms.json
+2 −1		locales/sv/forms.json
+2 −4		src/graphql/common.graphql
+8 −11		src/graphql/common.graphql.d.ts
+1 −1		src/hooks/useSearch.ts
+8 −3		src/pages/home.tsx
+15 −30		src/pages/search.tsx