Commits · 0d43d74c6085d66b0c0f2de1100b4eaf42b4b24e · BDE / nk20 · GitLab

Snippets Groups Projects

Mar 27, 2020
- Display activity details · 0d43d74c
  ynerant authored 4 years ago
  
  0d43d74c
- Fix activity in Guest model · 34949f08
  ynerant authored 4 years ago
  
  34949f08
- Invite people · ceb56908
  ynerant authored 4 years ago
  
  ceb56908
- Fix server starting · 4f4bbf6d
  ynerant authored 4 years ago
  
  4f4bbf6d
- Custom auto-complete fields, remove DAL requirement · f09364d3
  ynerant authored 4 years ago
  
  f09364d3
- Fix CI · 823bcfe7
  ynerant authored 4 years ago
  
  823bcfe7
- Merge remote-tracking branch 'origin/master' into activity · dadd8406
  ynerant authored 4 years ago
  
  dadd8406
- Merge branch 'front_club' into 'master' · 8b4c3926
  Pierre-antoine Comby authored 4 years ago
```
Finitions sur l'interface club

See merge request !70
```
  8b4c3926
- Merge branch 'master' into front_club · 09fb0e14
  Pierre-antoine Comby authored 4 years ago
  
  09fb0e14
- add parent club link · ee3d441a
  Pierre-antoine Comby authored 4 years ago
  
  ee3d441a
- Merge branch 'devalidation_reason' into 'master' · ed746f39
  Pierre-antoine Comby authored 4 years ago
```
Motif de dévalidation

See merge request !67
```
  ed746f39
- Merge branch 'master' into 'devalidation_reason' · bef49587
  ynerant authored 4 years ago
```
# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
```
  bef49587
- Use custom inputs for date picker and amounts · f81e2b5b
  ynerant authored 4 years ago
  
  f81e2b5b
- Merge branch 'parent-club' into 'master' · e27b456a
  Pierre-antoine Comby authored 4 years ago
```
Resolve "Club Parent"

Closes #42

See merge request !65
```
  e27b456a
- revert to ReadProtectedViewset · a3a8fd60
  Pierre-antoine Comby authored 4 years ago
  
  a3a8fd60
- Create activities · 45b14ed1
  ynerant authored 4 years ago
  
  45b14ed1
- Fix CI · 213e5a83
  ynerant authored 4 years ago
  
  213e5a83
- Merge remote-tracking branch 'origin/master' into activity · 841d56d5
  ynerant authored 4 years ago
```
# Conflicts:
#	note_kfet/urls.py
#	templates/base.html
```
  841d56d5
Mar 26, 2020
- error handling up to client · c50e17c5
  Pierre-antoine Comby authored 4 years ago
  
  c50e17c5
- move common script to alias.js · f7a66920
  Pierre-antoine Comby authored 4 years ago
  
  f7a66920
- add errMsg function · 49dd88db
  Pierre-antoine Comby authored 4 years ago
  
  49dd88db
- crappy name -> crappy behavior · 61b6aceb
  Pierre-antoine Comby authored 4 years ago
  
  61b6aceb
- Fix alias deletion · a00e43bc
  ynerant authored 4 years ago
  
  a00e43bc
- almost working javascript · e125601f
  Pierre-antoine Comby authored 4 years ago
  
  e125601f
- switch to template column · 92ca835d
  Pierre-antoine Comby authored 4 years ago
  
  92ca835d
- use small btn in table · 271fab3b
  Pierre-antoine Comby authored 4 years ago
  
  271fab3b
- remove forms · 04b39f09
  Pierre-antoine Comby authored 4 years ago
  
  04b39f09
- serializer config · 757dfdd9
  Pierre-antoine Comby authored 4 years ago
  
  757dfdd9
- remove alias handling backend, gonna use DRF · d9cdb013
  Pierre-antoine Comby authored 4 years ago
  
  d9cdb013
- some minor cleaning · 7568abb6
  Pierre-antoine Comby authored 4 years ago
  
  7568abb6
- Merge branch 'remove-noteuser-fixture' into 'master' · e8cbd463
  ynerant authored 4 years ago
```
Something is wrong in the fixtures

See merge request !69
```
  e8cbd463
- Store used aliases in transactions · 01410d2b
  ynerant authored 4 years ago
  
  01410d2b
- Store used aliases in transactions · 41aa6964
  ynerant authored 4 years ago
  
  41aa6964
- move template_category to own fixture · 1b26df64
  Pierre-antoine Comby authored 4 years ago
```
TemplateCategory are not essential for running a base instance.
```
  1b26df64
Mar 25, 2020
- [member] tabs --> spaces · 59cd166b
  Benjamin Graillot authored 4 years ago
  
  59cd166b
- add aliases view to clubs · 33e36571
  Pierre-antoine Comby authored 4 years ago
  
  33e36571
- [member] Check membership of parent club · c86ddf17
  Benjamin Graillot authored 4 years ago
  
  c86ddf17
- add member get side information · a41e51e2
  Pierre-antoine Comby authored 4 years ago
  
  a41e51e2
- page title and edit buttons · 26d70c4e
  Pierre-antoine Comby authored 4 years ago
  
  26d70c4e
- Merge branch 'front_club' into 'master' · c4199942
  Pierre-antoine Comby authored 4 years ago
```
Front club

See merge request !68
```
  c4199942