Commits · 224420bde11c074c96349f8fd7ca07cd98059524 · AlekSIS® / Official / AlekSIS-Core

Jan 06, 2020
- Merge branch 'master' into 30-dashboard · 224420bd
  Tom Teichler authored 5 years ago
  
  224420bd
- Fix view if person is not authenticated. · 1b484b4b
  Tom Teichler authored 5 years ago
  
  1b484b4b
Jan 05, 2020
- Merge branch 'master' of edugit.org:AlekSIS/AlekSIS · ae110cb8
  Tom Teichler authored 5 years ago
  
  ae110cb8
- Update migration name to a reasonable one · c6b3d34d
  Jonathan Weth authored 5 years ago
  
  c6b3d34d
- Update dashboard views to use person model instead of user model · 5b444ff9
  Jonathan Weth authored 5 years ago
  
  5b444ff9
- Merge branch 'master' of edugit.org:AlekSIS/AlekSIS · a162bb4d
  Tom Teichler authored 5 years ago
  
  a162bb4d
- Merge branch 'master' into 30-dashboard · ece7161e
  Jonathan Weth authored 5 years ago
  
  ece7161e
- Update submodules. · 93a14902
  Tom Teichler authored 5 years ago
  
  93a14902
- Merge branch 'link-act-not-to-person' into 'master' · c27ce08c
  Jonathan Weth authored 5 years ago
  
  Link activities and notifications to persons See merge request AlekSIS/AlekSIS!98
  c27ce08c
- Add migrations for the change from User to Person model in dashboard models · f6e9cd68
  Jonathan Weth authored 5 years ago
  
  f6e9cd68
- Merge branch 'file-refs' · e837b7a8
  Tom Teichler authored 5 years ago
  
  e837b7a8
- Update copyright years from git · 987f708f
  mirabilos authored 5 years ago
  
  (including, for the main AlekSIS module, trimmed history for School-Apps code moved into separate AlekSIS äpps)
  987f708f
- Update LICENCE → LICENCE.rst · 91df1b91
  mirabilos authored 5 years ago
  
  91df1b91
- Nuke file no longer relevant · cd28c2c1
  mirabilos authored 5 years ago
  
  This references nonexistent files, so it’s preferable to remove it now.
  cd28c2c1
- Update dashboard template · 3ad44c4d
  Jonathan Weth authored 5 years ago
  
  Reformat and add notifications a second time for showing new notifications in a special way
  3ad44c4d
- Fix way for marking notifications as read · 0c7d5a4f
  Jonathan Weth authored 5 years ago
  
  0c7d5a4f
- Merge branch 'master' into 30-dashboard · f1f890f5
  Tom Teichler authored 5 years ago
  
  f1f890f5
- Add function to mark notifications as read. · 9b99b876
  Tom Teichler authored 5 years ago
  
  9b99b876
- Merge branch '125-migrate-missing-templates-to-materialize' into 'master' · b40be365
  Nik | Klampfradler authored 5 years ago
  
  Resolve "Migrate missing templates to materialize" Closes #125 See merge request AlekSIS/AlekSIS!104
  b40be365
- Merge branch 'master' into '125-migrate-missing-templates-to-materialize' · 170459c0
  Jonathan Weth authored 5 years ago
  
  # Conflicts: # aleksis/core/settings.py
  170459c0
- Migrate group and person templates to materialize · 17440e81
  Jonathan Weth authored 5 years ago
  
  Close #125
  17440e81
- Add menu icons for person and group views · 6da0201e
  Jonathan Weth authored 5 years ago
  
  6da0201e
- Reformat settings.py · 186a86e0
  Jonathan Weth authored 5 years ago
  
  186a86e0
- Add django-tables2 template for materialize · 41484ca9
  Jonathan Weth authored 5 years ago
  
  41484ca9
Jan 04, 2020
- Merge branch 'master' of edugit.org:AlekSIS/AlekSIS · 838ccd0e
  Tom Teichler authored 5 years ago
  
  838ccd0e
- Update submodules. · eef62b6f
  Tom Teichler authored 5 years ago
  
  eef62b6f
- Merge branch 'make-licence-legible' into 'master' · d920755a
  Nik | Klampfradler authored 5 years ago
  
  Convert EUPL to reStructuredText to match Python documentation style See merge request AlekSIS/AlekSIS!103
  d920755a
- Convert EUPL to reStructuredText to match Python documentation style · 7daf59bc
  mirabilos authored 5 years ago
  
  7daf59bc
- Merge branch 'stats' into 'master' · ea6a2799
  Nik | Klampfradler authored 5 years ago
  
  Add committer statistics See merge request AlekSIS/AlekSIS!102
  ea6a2799
- Make the entire script use mksh in its shebang · 8f8860c6
  mirabilos authored 5 years ago
  
  Nik “rather one more dependency than these extra switches”
  8f8860c6
- Add committer statistics as requested by Nik · 02f728e2
  mirabilos authored 5 years ago
  
  02f728e2
- Merge branch 'master' of edugit.org:AlekSIS/AlekSIS · 22bbc294
  Tom Teichler authored 5 years ago
  
  22bbc294
- Update submodules. · 2e31868b
  Tom Teichler authored 5 years ago
  
  2e31868b
- Merge branch 'master' of edugit.org:AlekSIS/AlekSIS · 9b9e7626
  Nik | Klampfradler authored 5 years ago
  
  9b9e7626
- Use all directories in gource · cdddf6cb
  Nik | Klampfradler authored 5 years ago
  
  cdddf6cb
- Merge branch 'add-mailmap' into 'master' · f427ceec
  Nik | Klampfradler authored 5 years ago
  
  Add .mailmap to harmonise contributor names See merge request AlekSIS/AlekSIS!101
  f427ceec
- Add .mailmap to harmonise contributor names · 441332e9
  mirabilos authored 5 years ago
  
  Documented in: git help shortlog Supported by git log as well
  441332e9
- Make strings translatable. · c651ef22
  Tom Teichler authored 5 years ago
  
  c651ef22
- Remove superflous stuff from dashboard. · d0fc5044
  Tom Teichler authored 5 years ago
  
  d0fc5044
- Merge branch 'merge/pwa' into 'master' · 3ce2dfc9
  Nik | Klampfradler authored 5 years ago
  
  Add PWA to AlekSIS Closes #67 See merge request AlekSIS/AlekSIS!99
  3ce2dfc9