Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(KUI-1571): update upl-main with changes from master #386

Merged
20 commits merged into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b94052e
Recommended prerequisites are now fetched from Om Kursen, not Kopps
axelbjo Aug 19, 2024
1b46ae3
Only show recommended prerequisites if it has content
axelbjo Aug 19, 2024
7a3b080
Added information modal to recommended prerequisites
axelbjo Aug 22, 2024
6631a2d
Fixed some incorrect namings in project
axelbjo Aug 22, 2024
348b2a6
updated test
axelbjo Aug 22, 2024
3887f23
Removed debugging html tags
axelbjo Aug 22, 2024
113e220
feat(KUI-1378): delay is added to the shimmer effect
amirhossein-haerian Sep 3, 2024
255bf91
fix(KUI-1394): change the popup text
amirhossein-haerian Sep 3, 2024
a1411e5
fix(KUI-1434): the padding issue for local navigation in mobile view …
amirhossein-haerian Sep 4, 2024
8ddf832
removed supplementaryInfoUrl from mapping
axelbjo Sep 30, 2024
022ff43
updated snapshot
axelbjo Sep 30, 2024
b2446d8
Requested changes
axelbjo Sep 30, 2024
d253ebf
fix(KUI-1375): fix merge conflict
axelbjo Oct 4, 2024
7ffbfd5
Merge pull request #362 from KTH/issues/KUI-1375-fetch-recommended-pr…
axelbjo Oct 4, 2024
35fc271
fix(KUI-1390): fix merge conflict and incorrect field name
axelbjo Oct 4, 2024
c9adee5
Merge pull request #364 from KTH/issues/KUI-1390-information-icon
axelbjo Oct 4, 2024
bd0c260
fix(KUI-1519): fix to correct config name for "memoStorageUri" (shoul…
Oct 10, 2024
21afc32
chore(KUI-1527): handled dependency vulnerabilities
axelbjo Oct 25, 2024
0e112b7
Merge pull request #384 from KTH/issues/KUI-1527-update-dependencies
axelbjo Oct 28, 2024
e3ef419
Merge branch 'master' into upl-main
Nov 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions i18n/messages.en.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ module.exports = {
},
header_dropdown_menu_navigation:
'Choose semester and course offering to see current information and more about the course, such as course syllabus, study period, and application information.',
header_dropdown_menue: 'Information per course offering',
header_dropdown_menu: 'Information per course offering',
header_dropdown_menu_aria_label: 'Information about choosing semester and course offering',
header_course_info: 'Course information',
header_content: 'Content and learning outcomes',
Expand All @@ -104,7 +104,7 @@ module.exports = {
'Course offering may be cancelled if number of admitted are less than minimum of places. If there are more applicants than number of places selection will be made.',
round_seats_info: 'The selection results are based on:',
syllabus_info:
'<p>A course goes different course offerings. To see information about a specific course offering, choose semester and course offering. The course syllabus information will be updated depending on the chosen semester. Information from the course syllabus is marked with *.</p><p>• Please note: regulations in course syllabus are rules that are generally applicable and binding for both employees and students.</p><p>• If you have not chosen semester and course offering, you will see course information from the current or future course syllabus. The valid period of the course syllabus is stated on the page.</p>',
'<p>A course goes different course offerings. To see information about a specific course offering, choose semester and course offering. The course syllabus information will be updated depending on the chosen semester. Information from the course syllabus is marked with *</p>',
sideMenu: {
aria_label: 'Sub menu',
page_about_course: 'About course',
Expand Down Expand Up @@ -166,6 +166,9 @@ module.exports = {
course_department: 'Offered by',
course_contact_name: 'Contact ',
course_prerequisites: 'Recommended prerequisites',
course_prerequisites_description:
'Describes the knowledge and skills (in addition to the eligibility requirements) that you need to be able to take the course.',
course_prerequisites_menu_aria_label: 'Information about recommended prerequisites',
course_suggested_addon_studies: 'Add-on studies',
course_supplemental_information_url: 'Supplementary information link',
course_supplemental_information_url_text: 'Supplementary information link text',
Expand Down
7 changes: 5 additions & 2 deletions i18n/messages.se.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ module.exports = {
},
header_dropdown_menu_navigation:
'Välj termin och kursomgång för att se aktuell information och mer om kursen, såsom kursplan, studieperiod och anmälningsinformation.',
header_dropdown_menue: 'Information per kursomgång',
header_dropdown_menu: 'Information per kursomgång',
header_dropdown_menu_aria_label: 'Information om val av termin och kursomgång',
header_course_info: 'Kursinformation',
header_content: 'Innehåll och lärandemål',
Expand All @@ -106,7 +106,7 @@ module.exports = {
'Kursomgången kan komma att ställas in om antalet antagna understiger minimiantalet platser. Vid fler sökande än platser kommer urval att ske.',
round_seats_info: 'Urvalet sker baserat på:',
syllabus_info:
'<p>En kurs undervisas i olika kursomgångar. För att se information om en specifik kursomgång behöver du välja termin och kursomgång. Information från kursplan kommer att uppdateras beroende på vald termin. Information från kursplan är markerad med *.</p><p>• Observera: bestämmelser i kursplaner är regler som är generellt tillämpbara och bindande för såväl anställda som studenter.</p><p>• Har du inte valt termin och kursomgång ser du kursinformation från nuvarande eller kommande kursplan. På sidan anges den period som information från kursplan gäller för.</p>',
'<p>En kurs undervisas i olika kursomgångar. För att se information om en specifik kursomgång behöver du välja termin och kursomgång. Information från kursplan kommer att uppdateras beroende på vald termin. Information från kursplan är markerad med *</p>',
sideMenu: {
aria_label: 'Undermeny',
page_about_course: 'Om kursen ',
Expand Down Expand Up @@ -170,6 +170,9 @@ module.exports = {
course_department: 'Ges av',
course_contact_name: 'Kontaktperson',
course_prerequisites: 'Rekommenderade förkunskaper',
course_prerequisites_description:
'Beskriver vilka kunskaper och färdigheter (utöver behörighetskraven) som du behöver för att kunna ta till dig kursen.',
course_prerequisites_menu_aria_label: 'Information om rekommenderade förkunskaper',
course_suggested_addon_studies: 'Påbyggnad',
course_supplemental_information_url: 'Övrig information - länk',
course_supplemental_information_url_text: 'Övrig information - länk text',
Expand Down
Loading
Loading