Commits · 0f371ed0078598bb3929eaafaf9d8c12b1a04887 · AlekSIS® / Official / AlekSIS-App-Chronos

May 15, 2021
- Do not exclude information due to holidays in regular plan · 0f371ed0
  Jonathan Weth authored 3 years ago
  
  0f371ed0
- Merge branch '125-django-3-2-database-improvements' into 'master' · edd54e90
  Nik | Klampfradler authored 3 years ago
  
  Resolve "Django 3.2 database improvements" Closes #125 See merge request !150
  edd54e90
- Merge branch 'fix/bump-2.0a5' into 'master' · 1daf4ca0
  Jonathan Weth authored 3 years ago
  
  Bump version to 2.0a5 See merge request !157
  1daf4ca0
- Bump version to 2.0a5 · 2957899f
  Jonathan Weth authored 3 years ago
  
  2957899f
- Merge branch 'master' into 125-django-3-2-database-improvements · 39235e09
  Jonathan Weth authored 3 years ago
  
  39235e09
- Merge branch 'update/poetry-5' into 'master' · 62262dff
  Jonathan Weth authored 3 years ago
  
  Update poetry.lock See merge request !156
  62262dff
- Update poetry.lock · 883fdbae
  Jonathan Weth authored 3 years ago
  
  883fdbae
- Fix lint · d4eeb1ef
  Jonathan Weth authored 3 years ago
  
  d4eeb1ef
- Merge branch 'master' into 125-django-3-2-database-improvements · 6a92a2ee
  Jonathan Weth authored 3 years ago
  
  6a92a2ee
May 04, 2021
- Merge branch '51-pdf-export-for-timetables' into 'master' · 577c6da3
  Nik | Klampfradler authored 3 years ago
  
  Resolve "PDF export for timetables" Closes #51 See merge request !77
  577c6da3
- Merge branch 'master' into 51-pdf-export-for-timetables · 9f9be1fc
  Lloyd Meins authored 3 years ago
  
  9f9be1fc
- Remove trailing newlines · 2d354396
  Lloyd Meins authored 3 years ago
  
  2d354396
Apr 30, 2021
- Merge branch '130-show-print-timetable-button-on-mobile-devices' into 'master' · 810c363e
  Jonathan Weth authored 3 years ago
  
  Resolve "Show print timetable button on mobile devices" Closes #130 See merge request !154
  810c363e
- Remove hiding of print button on mobile devices · 07420270
  Hangzhi Yu authored 3 years ago
  
  07420270
Apr 28, 2021
- Reformat in order for the pipeline to succeed · b253cd36
  Lloyd Meins authored 3 years ago
  
  b253cd36
- Remove unnecessary template names · 4c4e04bc
  Lloyd Meins authored 3 years ago
  
  4c4e04bc
- Reuse proper term for colour · 57606698
  Lloyd Meins authored 3 years ago
  
  57606698
- Resolve unrelated changes and remove superfluous lines · 224de424
  Lloyd Meins authored 3 years ago
  
  224de424
Apr 25, 2021
- Merge branch 'master' into 51-pdf-export-for-timetables · f5c1befe
  Jonathan Weth authored 3 years ago
  
  f5c1befe
Apr 16, 2021
- Use render_pdf for the substitutions print view, too · 3c824401
  Jonathan Weth authored 3 years ago
  
  3c824401
Apr 13, 2021
- Merge branch 'nik-master-patch-76991' into 'master' · 69fda47f
  Jonathan Weth authored 3 years ago
  
  Denote Teckids e.V. as licensor as defined by EUPL See merge request !152
  69fda47f
- Denote Teckids e.V. as licensor as defined by EUPL · b985d566
  Nik | Klampfradler authored 3 years ago
  
  This is important to clarify the jurisdiction and court location in case of license disputes.
  b985d566
Apr 12, 2021
- Merge branch 'big-autofield-django-32' into 'master' · 91c06e71
  Nik | Klampfradler authored 3 years ago
  
  Prepare django 3.2 update, update JSONStore migration See merge request !151
  91c06e71
Apr 08, 2021
- Prepare django 3.2 update, update JSONStore migration · ef0bb8f6
  Tom Teichler authored 3 years ago
  
  ef0bb8f6
- Add some (convering) indexes to speed up database queries · 05b034dd
  Jonathan Weth authored 3 years ago
  
  05b034dd
- Prefer alias instead of annotate and remove superfluous annotations · 7206d283
  Jonathan Weth authored 3 years ago
  
  7206d283
- Limit selected fields in build_timetable · af46a31c
  Jonathan Weth authored 3 years ago
  
  af46a31c
- Update poetry.lock · 59886687
  Jonathan Weth authored 3 years ago
  
  59886687
- [Printout] Remove static_prefix for static files · 8a81a899
  Jonathan Weth authored 3 years ago
  
  8a81a899
- Merge remote-tracking branch 'origin/master' into 51-pdf-export-for-timetables · 2d7c8af0
  Jonathan Weth authored 3 years ago
  
  2d7c8af0
Apr 02, 2021
- Merge branch '108-selecting-a-calendarweek-throws-error-404' into 'master' · eb7baabd
  Nik | Klampfradler authored 3 years ago
  
  Resolve "Selecting a calendarweek throws error 404" Closes #108 See merge request !148
  eb7baabd
- Fix json url generation for week select · 26801aad
  Hangzhi Yu authored 3 years ago and Tom Teichler committed 3 years ago
  
  26801aad
- Merge branch 'update-poetry-lock' into 'master' · bd06038a
  Jonathan Weth authored 3 years ago
  
  Update lockfile See merge request !149
  bd06038a
- Update lockfile · e0b7684a
  Tom Teichler authored 3 years ago
  
  e0b7684a
Mar 28, 2021
- Add absolute URL to all static URLs for printing via electron-pdf · 241ea05f
  Jonathan Weth authored 3 years ago
  
  241ea05f
- Merge branch 'master' into 51-pdf-export-for-timetables · f839aae1
  Jonathan Weth authored 3 years ago
  
  f839aae1
Mar 27, 2021
- Merge branch 'fix/next-lesson-timetable-builder' into 'master' · 8edc56a5
  Nik | Klampfradler authored 3 years ago
  
  Add some bug fixes for next_lesson and timetable builder See merge request !147
  8edc56a5
- Add some bug fixes for next_lesson and timetable builder · 6709ab83
  Jonathan Weth authored 3 years ago
  
  6709ab83
Mar 26, 2021

Merge branch '122-next_lesson-doesn-t-correctly-work-with-changing-validity-ranges-and-probably-also-year-changes' into 'master'

Resolve "next_lesson doesn't correctly work with changing validity ranges and probably also year changes"

Closes #122

See merge request !144

606c9b22

Merge branch 'master' into... · df9366d3

Jonathan Weth authored 3 years ago

Merge branch 'master' into 122-next_lesson-doesn-t-correctly-work-with-changing-validity-ranges-and-probably-also-year-changes

df9366d3