Commits · 0193a4d8988cc565bac9e57753e0e0705bb9d631 · BDE / nk20 · GitLab

Snippets Groups Projects

Mar 06, 2020
- Merge branch 'cas' into 'master' · 0193a4d8
  ynerant authored 5 years ago
```
CAS

See merge request !29
```
  0193a4d8
Mar 05, 2020
- Merge branch 'static_files' into 'master' · 3c22d3b8
  Pierre-antoine Comby authored 5 years ago
```
Static files

See merge request !24
```
  3c22d3b8
Feb 27, 2020
- Merge branch 'fix_profile' into 'master' · f1cedc90
  Pierre-antoine Comby authored 5 years ago
```
fix #27

Closes #27

See merge request !30
```
  f1cedc90
- fix #27 · 0ea0d777
  Pierre-antoine Comby authored 5 years ago
  
  0ea0d777
- Merge branch 'no_money_created' into 'master' · c372b658
  Pierre-antoine Comby authored 5 years ago
```
Fix #25

Closes #25

See merge request !27
```
  c372b658
- Update translations · ea9cda0d
  ynerant authored 5 years ago
  
  ea9cda0d
- Fix money creation, closes #25 · 3764bc44
  ynerant authored 5 years ago
  
  3764bc44
- Don't create automatically a new user on login · c22e73a8
  ynerant authored 5 years ago
  
  c22e73a8
- Merge remote-tracking branch 'origin/cas' into cas · 202fc655
  ynerant authored 5 years ago
  
  202fc655
- Add default initial fixture for CAS server · 8503bf9d
  ynerant authored 5 years ago
  
  8503bf9d
- Merge remote-tracking branch 'origin/master' into cas · 94d32782
  ynerant authored 5 years ago
  
  94d32782
- Add default initial fixture for CAS server · f319c217
  ynerant authored 5 years ago
  
  f319c217
- Merge branch 'master' into cas · 04e40e9a
  ynerant authored 5 years ago
  
  04e40e9a
- Merge branch '26-menu-principal-ne-s-ouvre-pas-sur-telephone' into 'master' · 94c0971a
  Pierre-antoine Comby authored 5 years ago
```
Resolve "Menu principal ne s'ouvre pas sur téléphone"

Closes #26

See merge request !26
```
  94c0971a
- Fix id name · a348178d
  Pierre-antoine Comby authored 5 years ago
  
  a348178d
Feb 26, 2020
- don't use STATICFILES_DIRS · 92d12e6d
  Pierre-antoine Comby authored 5 years ago
  
  92d12e6d
- Merge branch 'form_improve' into 'master' · c93bd3c4
  Pierre-antoine Comby authored 5 years ago
```
Form improve

Closes #28

See merge request !25
```
  c93bd3c4
Feb 25, 2020
- fix #28 · 707770a5
  Pierre-antoine Comby authored 5 years ago
  
  707770a5
- autofocus of signup form on first field · eb6f142b
  Pierre-antoine Comby authored 5 years ago
  
  eb6f142b
- add static files · 70c09da9
  Pierre-antoine Comby authored 5 years ago
  
  70c09da9
- set STATIC_ROOT · 2de5a803
  Pierre-antoine Comby authored 5 years ago
  
  2de5a803
- Merge branch 'import_nk15' into 'master' · 25fc35c8
  Pierre-antoine Comby authored 5 years ago
```
Import nk15

See merge request !23
```
  25fc35c8
- remove `name` Field of TemplateTransaction · 0cd0b11f
  Pierre-antoine Comby authored 5 years ago
```
Redundant with `reason` from Transaction
```
  0cd0b11f
- add last_negative field to note · 33eba8a4
  Pierre-antoine Comby authored 5 years ago
  
  33eba8a4
- Correction typos + ajout d'acl + passage à python3-venv · 414ef0fb
  Michaël Paulon authored 5 years ago
  
  414ef0fb
Feb 24, 2020
- Merge branch 'import_nk15' into 'master' · 4e5e8097
  Pierre-antoine Comby authored 5 years ago
```
Import nk15: rm import_nk15

See merge request !22
```
  4e5e8097
- Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 · 5421943f
  Pierre-antoine Comby authored 5 years ago
  
  5421943f
- Merge branch 'fix_form' into 'master' · f25bfc87
  Benjamin Graillot authored 5 years ago
```
[note] no transaction_type

See merge request !21
```
  f25bfc87
- [note] no transaction_type · 640e48b5
  Benjamin Graillot authored 5 years ago
  
  640e48b5
- Merge branch 'import_nk15' into 'master' · 9039c6fb
  Pierre-antoine Comby authored 5 years ago
```
Import nk15

See merge request !19
```
  9039c6fb
- import script is move to new repository · 6ad79746
  Pierre-antoine Comby authored 5 years ago
  
  6ad79746
- Merge branch 'polymorphic_transaction' into 'import_nk15' · 277f4847
  Pierre-antoine Comby authored 5 years ago
```
Polymorphic transaction

See merge request !20
```
  277f4847
- Polymorphic transaction · c2fbb1bc
  Benjamin Graillot authored 5 years ago and Pierre-antoine Comby committed 5 years ago
  
  c2fbb1bc
Feb 23, 2020
- add aliases import · 9207c5cd
  Pierre-antoine Comby authored 5 years ago
  
  9207c5cd
- clean code, dont activate user · e850c575
  Pierre-antoine Comby authored 5 years ago
  
  e850c575
- fix typo · f5a80dd0
  Pierre-antoine Comby authored 5 years ago
  
  f5a80dd0
- Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 · 4de817bd
  Pierre-antoine Comby authored 5 years ago
  
  4de817bd
- transaction_type -> category · 7230f9c5
  Pierre-antoine Comby authored 5 years ago
  
  7230f9c5
- add boutons import · b18e5b03
  Pierre-antoine Comby authored 5 years ago
  
  b18e5b03
- [note] TransactionCategory --> TemplateCategory · 40a7d3b2
  Benjamin Graillot authored 5 years ago
  
  40a7d3b2