Commits · e9d975150351626024053c1014142ec6686ce5c5 · AlekSIS® / Official / AlekSIS-Core

Jan 03, 2020
- Update README for new name · e9d97515
  mirabilos authored 5 years ago and mirabilos committed 5 years ago
  
  Rest comes later
  Verified
  
  e9d97515
- Merge branch 'merge/remove-cache-system' into 'master' · 0fb4721d
  Nik | Klampfradler authored 5 years ago
  
  [MERGE] Remove unnecessary stuff See merge request BiscuIT/BiscuIT-ng!88
  0fb4721d
- Remove unnecessary stuff · 5c726f0a
  Jonathan Weth authored 5 years ago
  
  Verified
  
  5c726f0a
- Load any_js; gone missing by merge · 9dddaad8
  Nik | Klampfradler authored 5 years ago
  
  Verified
  
  9dddaad8
- Remove cruft that will not be merged here. · 5f9b08aa
  Nik | Klampfradler authored 5 years ago
  
  Cf. #134
  Verified
  
  5f9b08aa
- Merge branch 'school-apps' into 'master' · 9e5b936b
  Nik | Klampfradler authored 5 years ago
  
  Merge school-apps See merge request BiscuIT/BiscuIT-ng!86
  9e5b936b
- Merge branch 'school-apps' · 98421708
  mirabilos authored 5 years ago and mirabilos committed 5 years ago
  
  Verified
  
  98421708
- Not necessary after merging · f8752bdf
  mirabilos authored 5 years ago
  
  Verified
  
  f8752bdf
- Use the same “util” namespace for utils · bd9e682b
  mirabilos authored 5 years ago
  
  Verified
  
  bd9e682b
- Drop files not necessary after merge · eef3a4aa
  mirabilos authored 5 years ago
  
  Verified
  
  eef3a4aa
- Merge branch 'master' of edugit.org:BiscuIT/BiscuIT-ng into merge-preparation · 85ad1d3c
  mirabilos authored 5 years ago and mirabilos committed 5 years ago
  
  Verified
  
  85ad1d3c
- merged · dda0c4b6
  mirabilos authored 5 years ago
  
  Verified
  
  dda0c4b6
- Merge branch '114-migrate-to-materialize-css' into 'master' · 16ef28f2
  Nik | Klampfradler authored 5 years ago
  
  Resolve "Migrate to materialize-css" Closes #114 See merge request BiscuIT/BiscuIT-ng!85
  16ef28f2
- Re-enable debug toolbar · 3c6941b3
  Nik | Klampfradler authored 5 years ago
  
  Verified
  
  3c6941b3
- Remove django_cron again · 54d04f3e
  Nik | Klampfradler authored 5 years ago
  
  Previously broken by merge.
  Verified
  
  54d04f3e
- Install more Yarn packages needed after the merge · 5f814992
  mirabilos authored 5 years ago and mirabilos committed 5 years ago
  
  Verified
  
  5f814992
- Mark generated files and their sources · 2b9ebc2d
  mirabilos authored 5 years ago
  
  Verified
  
  2b9ebc2d
- Use django-anyjs to load all JS dependencies · 5fd00b1e
  Nik | Klampfradler authored 5 years ago
  
  Verified
  
  5fd00b1e
- Move embedded code copy to dependency (yarn: prop-types) · 570a9798
  mirabilos authored 5 years ago
  
  Verified
  
  570a9798
- Move embedded code copy to dependency (yarn: react-dom) · 65790604
  mirabilos authored 5 years ago
  
  Verified
  
  65790604
- Move embedded code copy to dependency (yarn: react) · f956b7f2
  mirabilos authored 5 years ago
  
  Verified
  
  f956b7f2
- Drop old GPL mentions · 74d8f932
  mirabilos authored 5 years ago
  
  Verified
  
  74d8f932
- Move embedded code copy to dependency (yarn: moment) · 21d1d245
  mirabilos authored 5 years ago
  
  Verified
  
  21d1d245
- Move embedded code copy to dependency (yarn: jquery) · cf129068
  mirabilos authored 5 years ago
  
  Verified
  
  cf129068
- Move embedded code copy to dependency (yarn: highlight.js) · 470e82e7
  mirabilos authored 5 years ago
  
  Verified
  
  470e82e7
- Drop paper.css, already extant · 9fc81a35
  mirabilos authored 5 years ago
  
  Verified
  
  9fc81a35
- Move embedded code copy to dependency (yarn: materialize-css) · d0521f44
  mirabilos authored 5 years ago
  
  Verified
  
  d0521f44
- Move embedded code copy to dependency (yarn: @mdi/font) · caaa1ec2
  mirabilos authored 5 years ago
  
  Verified
  
  caaa1ec2
- Move embedded code copy to dependency (yarn: manup) · aa6c5391
  mirabilos authored 5 years ago
  
  Verified
  
  aa6c5391
- Fix permission again · 6450709f
  mirabilos authored 5 years ago
  
  Verified
  
  6450709f
- Update list of authors · 9dedf128
  mirabilos authored 5 years ago and mirabilos committed 5 years ago
  
  Verified
  
  9dedf128
- Drop dependencies already listed in pyproject.toml · 9f5a1458
  mirabilos authored 5 years ago
  
  Verified
  
  9f5a1458
- Update and sort (by last name¹) list of authors · 009b6ad7
  mirabilos authored 5 years ago
  
  ① or nickname Also, place an actual link to EUPL website; mention minimum version
  Verified
  
  009b6ad7
- Begin merging · e6ff8071
  mirabilos authored 5 years ago
  
  Verified
  
  e6ff8071
- Apply suggestion to .gitignore · 489faa48
  Nik | Klampfradler authored 5 years ago
  
  489faa48
- Merge branch 'master' into '114-migrate-to-materialize-css' · 8ce8fa68
  Jonathan Weth authored 5 years ago
  
  # Conflicts: # biscuit/core/templates/registration/login.html
  8ce8fa68
- Merge branch 'fix-whitespace' into 'master' · bcb6aec7
  Nik | Klampfradler authored 5 years ago
  
  Fix trailing whitespace and space before tab in indent See merge request BiscuIT/BiscuIT-ng!83
  bcb6aec7
- Fix trailing whitespace and space before tab in indent · 40ecc42d
  mirabilos authored 5 years ago and mirabilos committed 5 years ago
  
  (everywhere but in LICENCE which has a separate fixup branch; keep docs/make.bat in CR-LF line endings)
  Verified
  
  40ecc42d
- Move to proposed directory structure for merging · 3b87a5f9
  mirabilos authored 5 years ago and mirabilos committed 5 years ago
  
  Verified
  
  3b87a5f9
- Refactor style.scss and remove non-core specific parts, add secondary color · 268ed715
  Jonathan Weth authored 5 years ago
  
  Additionally change icon of admin menu entry
  Verified
  
  268ed715