ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-11-03 08:58:47 +01:00
Code Issues Releases Wiki Activity
880 Commits 46 Branches 4 Tags
f38b9801d09f42b7301596203967f975aa6d3d18
Commit Graph

880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohann D'ANELLO
94d327821a Merge remote-tracking branch 'origin/master' into cas 2020-02-27 13:59:52 +01:00
Yohann D'ANELLO
f319c217b0 Add default initial fixture for CAS server 2020-02-27 13:52:39 +01:00
Yohann D'ANELLO
04e40e9a91 Merge branch 'master' into cas 2020-02-27 13:39:22 +01:00
Yohann D'ANELLO
1c762e5444 Trying to get IP 2020-02-27 13:34:38 +01:00
Pierre-antoine Comby
94c0971abf Merge branch '26-menu-principal-ne-s-ouvre-pas-sur-telephone' into 'master' 
Resolve "Menu principal ne s'ouvre pas sur téléphone"

Closes #26

See merge request bde/nk20!26
 2020-02-27 12:06:16 +01:00
Pierre-antoine Comby
a348178d13 Fix id name 2020-02-27 12:00:02 +01:00
Yohann D'ANELLO
10854eb334 Update some excluded models 2020-02-26 23:55:40 +01:00
Yohann D'ANELLO
1c0bf21cbe Content type stored in logs instead of model name 2020-02-26 23:34:27 +01:00
Pierre-antoine Comby
92d12e6d59 don't use STATICFILES_DIRS 2020-02-26 19:32:12 +01:00
Pierre-antoine Comby
c93bd3c458 Merge branch 'form_improve' into 'master' 
Form improve

Closes #28

See merge request bde/nk20!25
 2020-02-26 13:23:54 +01:00
Pierre-antoine Comby
707770a5b4 fix #28 2020-02-25 22:55:27 +01:00
Pierre-antoine Comby
eb6f142bf8 autofocus of signup form on first field 2020-02-25 22:26:43 +01:00
Pierre-antoine Comby
70c09da9f8 add static files 2020-02-25 22:15:46 +01:00
Pierre-antoine Comby
2de5a8030e set STATIC_ROOT 2020-02-25 22:14:56 +01:00
Pierre-antoine Comby
25fc35c857 Merge branch 'import_nk15' into 'master' 
Import nk15

See merge request bde/nk20!23
 2020-02-25 20:31:41 +01:00
Pierre-antoine Comby
0cd0b11fa5 remove name Field of TemplateTransaction 
Redundant with `reason` from Transaction
 2020-02-25 14:15:59 +01:00
Pierre-antoine Comby
33eba8a403 add last_negative field to note 2020-02-25 14:15:36 +01:00
Michaël Paulon
414ef0fb38 Correction typos + ajout d'acl + passage à python3-venv 2020-02-25 10:50:22 +01:00
Pierre-antoine Comby
4e5e80978b Merge branch 'import_nk15' into 'master' 
Import nk15: rm import_nk15

See merge request bde/nk20!22
 2020-02-24 18:48:17 +01:00
Pierre-antoine Comby
5421943fba Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 2020-02-24 18:44:10 +01:00
Benjamin Graillot
f25bfc8706 Merge branch 'fix_form' into 'master' 
[note] no transaction_type

See merge request bde/nk20!21
 2020-02-24 18:38:06 +01:00
Benjamin Graillot
640e48b5df [note] no transaction_type 2020-02-24 18:33:51 +01:00
Pierre-antoine Comby
9039c6fba6 Merge branch 'import_nk15' into 'master' 
Import nk15

See merge request bde/nk20!19
 2020-02-24 18:24:22 +01:00
Yohann D'ANELLO
fd529a53c8 Logging support 2020-02-24 18:18:44 +01:00
Pierre-antoine Comby
6ad7974612 import script is move to new repository 2020-02-24 14:17:48 +01:00
Pierre-antoine Comby
277f4847d9 Merge branch 'polymorphic_transaction' into 'import_nk15' 
Polymorphic transaction

See merge request bde/nk20!20
 2020-02-24 10:36:04 +01:00
Benjamin Graillot
c2fbb1bcdf Polymorphic transaction 2020-02-24 10:36:04 +01:00
Pierre-antoine Comby
9207c5cdec add aliases import 2020-02-23 21:11:42 +01:00
Pierre-antoine Comby
e850c5755b clean code, dont activate user 2020-02-23 21:10:48 +01:00
Pierre-antoine Comby
f5a80dd0a5 fix typo 2020-02-23 21:05:51 +01:00
Pierre-antoine Comby
4de817bd75 Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 2020-02-23 18:56:58 +01:00
Pierre-antoine Comby
7230f9c535 transaction_type -> category 2020-02-23 18:56:03 +01:00
Pierre-antoine Comby
b18e5b03a4 add boutons import 2020-02-23 18:45:21 +01:00
Benjamin Graillot
40a7d3b295 [note] TransactionCategory --> TemplateCategory 2020-02-23 17:27:55 +01:00
Pierre-antoine Comby
126686ab03 add a TransactionType model 2020-02-23 16:50:14 +01:00
Pierre-antoine Comby
f3ec0836f8 add display field to TransactionTemplate 2020-02-23 16:48:35 +01:00
Pierre-antoine Comby
ea5737ac8f refactoring in atomic function 2020-02-23 16:43:13 +01:00
Pierre-antoine Comby
889ddc15f8 handle password the correct way 2020-02-23 14:23:02 +01:00
Pierre-antoine Comby
efe32e45bf Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 2020-02-23 13:54:19 +01:00
Pierre-antoine Comby
8feb2ec52a Merge branch 'patch_passwords' into 'import_nk15' 
Import NK15 passwords

See merge request bde/nk20!12
 2020-02-23 13:54:02 +01:00
Pierre-antoine Comby
f47d803a2c import comptes table 2020-02-23 13:47:12 +01:00
Pierre-antoine Comby
201c5f667c add error_code to Exceptions 2020-02-23 13:46:25 +01:00
Yohann D'ANELLO
85881a5cc5 Client CAS 2020-02-22 23:44:24 +01:00
Pierre-antoine Comby
5af0058858 Merge branch 'master' into import_nk15 2020-02-22 22:15:51 +01:00
Pierre-antoine Comby
c8dd41c1d7 Merge branch 'initial_fixtures' into 'master' 
Initial fixtures

See merge request bde/nk20!13
 2020-02-22 22:00:36 +01:00
Pierre-antoine Comby
f1b442932f Use membership parameters according to BDE status 2020-02-22 21:56:02 +01:00
Pierre-antoine Comby
0db2881468 Merge branch 'master' into import_nk15 2020-02-22 16:34:17 +01:00
Pierre-antoine Comby
c5ebd0297c Make disctinction between club/user/special 2020-02-22 16:33:35 +01:00
Pierre-antoine Comby
cfd881887d add description field to transactionTemplates 2020-02-22 16:33:23 +01:00
Yohann D'ANELLO
4b7f40a046 CAS Server support 2020-02-22 14:20:22 +01:00