Merge pull request #267 from skoleapp/v1.3.0-rc3

v1.3.0-rc3
skoleapp · Jan 21, 2021 · bcab7dd · bcab7dd
2 parents 70dc4de + 74a6b10
commit bcab7dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Add blogging system and first blog about app store releases.
 - Add about page that contains links to all info pages etc. (for teachers, contact, guidelines, score, values, blog, terms and privacy)
 - Show back button on all settings pages on desktop.
+- Add SA badges to values pages.
 
 ### Changed
 
@@ -27,8 +28,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Enable app store links in landing page.
 - Change href for Markdown reference link.
 - Make back button always behave like the browsers back button.
-- Make translations for "Hot Topics" more compact.
 - Send my-data downloads as links in the email instead of attachments.
+- Change font from Roboto to Rubik.
 
 ### Removed
 
@@ -45,6 +46,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Fix title for invite friends link - remove colon.
 - Fix paragraph margins for all Markdown content.
 - Fix meta tags for all pages and locales.
+- Fix miscellaneous emojis.
 
 ## [1.2.1] - 2021-01-16
 

diff --git a/backend b/backend
diff --git a/frontend b/frontend
+0 −1		dependencies.md
+1 −1		locales/en/common.json
+15 −15		locales/en/for-teachers.json
+1 −1		locales/en/home.json
+4 −4		locales/en/index.json
+3 −3		locales/en/suggestions.json
+15 −15		locales/fi/for-teachers.json
+1 −1		locales/fi/home.json
+4 −4		locales/fi/index.json
+3 −3		locales/fi/suggestions.json
+15 −15		locales/sv/for-teachers.json
+1 −1		locales/sv/home.json
+4 −4		locales/sv/index.json
+3 −3		locales/sv/suggestions.json
+2 −2		markdown/en/blogs/skole-released-in-app-stores.md
+2 −0		markdown/en/values.md
+2 −0		markdown/fi/values.md
+2 −0		markdown/sv/values.md
+0 −1		package.json
+1 −1		public/images/icons/skole-icon-text-red.svg
+1 −1		public/images/icons/skole-icon-text.svg
+2 −0		src/components/layout/Head.tsx
+1 −1		src/components/shared/ContactDialog.tsx
+28 −0		src/components/shared/Emoji.tsx
+1 −0		src/components/shared/index.ts
+7 −1		src/components/templates/LandingPageTemplate.tsx
+3 −2		src/components/templates/LoginRequiredTemplate.tsx
+0 −1		src/pages/_app.tsx
+1 −1		src/pages/blogs/[slug].tsx
+62 −13		src/pages/for-teachers.tsx
+10 −5		src/pages/home.tsx
+46 −17		src/pages/index.tsx
+8 −1		src/pages/suggestions.tsx
+9 −3		src/pages/upload-resource.tsx
+1 −1		src/theme.ts
+1 −1		src/types/dialogs.ts
+1 −1		src/types/layout.ts
+0 −51		src/utils/constants.ts
+0 −5		yarn.lock