1468 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
erdnaxe	8c364c769e	Merge branch 'turbolinks' into 'master' ... Turbolinks See merge request bde/nk20!15	2020-02-22 11:18:12 +01:00
erdnaxe	ae90a957ce	Merge branch 'master' into 'turbolinks' ... # Conflicts: # apps/note/views.py	2020-02-22 11:09:45 +01:00
erdnaxe	9ef2bc8bc3	Merge branch 'fix_overflow' into 'master' ... Fix y-overflow on accordion showing during transition See merge request bde/nk20!16	2020-02-22 11:08:13 +01:00
erdnaxe	f68523cd33	Merge branch 'page_conso' into 'master' ... Dynamic tabs on conso view See merge request bde/nk20!17	2020-02-22 11:08:07 +01:00
Alexandre Iooss	a39bbea2d4	Add shadow and fix jquery hack	2020-02-22 10:17:24 +01:00
Alexandre Iooss	3597e79dc1	Dynamic tabs on conso view	2020-02-21 22:40:58 +01:00
Alexandre Iooss	24c994f2a5	Fix y-overflow on accordion showing during transition	2020-02-21 21:33:49 +01:00
Alexandre Iooss	82355135b0	Remove SmoothNavigation Middleware	2020-02-21 21:15:49 +01:00
Yohann D'ANELLO	9a0d74c18b	Fix no cache in ConsoView	2020-02-21 19:46:56 +01:00
Yohann D'ANELLO	d8b510a0be	Use django-material's middleware	2020-02-21 18:54:05 +01:00
Yohann D'ANELLO	db1e3eb98d	Remove django-turbolinks dependency	2020-02-21 18:45:18 +01:00
Yohann D'ANELLO	3fd99ebac7	Ability to disable cache storage	2020-02-21 18:28:21 +01:00