153 Commits

Author	SHA1	Message	Date
Yohann D'ANELLO	841d56d5b3	Merge remote-tracking branch 'origin/master' into activity ... # Conflicts: # note_kfet/urls.py # templates/base.html	2020-03-27 00:32:22 +01:00
ynerant	57a01c48a8	Merge branch 'master' into 'tresorerie' ... # Conflicts: # apps/note/fixtures/initial.json # templates/base.html	2020-03-25 00:30:14 +01:00
Pierre-antoine Comby	da63bd75f1	this is not the place for cas config	2020-03-22 22:22:51 +01:00
Yohann D'ANELLO	18f6daf2ac	Merge remote-tracking branch 'origin/master' into tresorerie ... # Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # note_kfet/settings/base.py # templates/base.html	2020-03-22 01:04:03 +01:00
Pierre-antoine Comby	6445acedc7	Merge branch 'master' into rights	2020-03-22 00:00:18 +01:00
Yohann D'ANELLO	71346476df	Starting treasury app	2020-03-21 00:30:49 +01:00
Pierre-antoine Comby	fa5334a741	use the OPTIONALS_APPS from secrets.py	2020-03-20 20:40:26 +01:00
Yohann D'ANELLO	24ea4c0a52	Comment code	2020-03-20 15:58:14 +01:00
Yohann D'ANELLO	091c427707	Restructurate code	2020-03-20 14:43:35 +01:00
Yohann D'ANELLO	7794210cc8	Being superuser is not enough (must have the correct mask), add some initial fixtures	2020-03-19 18:53:06 +01:00
Yohann D'ANELLO	95315cdbe2	Implements permission masks	2020-03-19 16:12:52 +01:00
Yohann D'ANELLO	057f42fdb6	Handle permissions (and it seems working!)	2020-03-18 14:42:35 +01:00
Yohann D'ANELLO	112d4b6c5a	Merge branch 'consos' into rights ... # Conflicts: # apps/logs/signals.py # note_kfet/settings/base.py	2020-03-17 21:11:14 +01:00
Yohann D'ANELLO	daef806507	More envs	2020-03-11 15:54:12 +01:00
Yohann D'ANELLO	58ea6abce4	Fix template tags to make tox happy	2020-03-11 15:13:34 +01:00
Yohann D'ANELLO	a128ed4803	Use environment rather than hardcoding strings, closes #36	2020-03-11 13:24:48 +01:00
Yohann D'ANELLO	417cd5da04	Improve REST API with filters	2020-03-11 11:15:03 +01:00
Yohann D'ANELLO	bc97eb1eb4	Add logs to the API (this right should only be given to superusers)	2020-03-11 10:08:28 +01:00
Yohann D'ANELLO	0f1d662d25	Anonymous users don't have any access to the API (fix it later with rights...), fix CI	2020-03-11 00:47:43 +01:00
Yohann D'ANELLO	20e2d41563	Use a middleware rather than inspect the stack to get current user and IP	2020-03-10 00:01:40 +01:00
Yohann D'ANELLO	83b1ad4751	Multi-connexions	2020-03-09 22:23:47 +01:00
Yohann D'ANELLO	462a9e0f2d	Fix CAS settings	2020-03-09 22:13:11 +01:00
Pierre-antoine Comby	dad1889c8d	move cas fixture to own file	2020-03-09 18:24:31 +01:00
Pierre-antoine Comby	3990009400	remove django guardian settings	2020-03-09 18:08:23 +01:00
Pierre-antoine Comby	6aa6a5499a	Merge branch 'modular_settings' into 'master' ... modular settings start See merge request bde/nk20!47	2020-03-09 12:00:10 +01:00
Pierre-antoine Comby	7d616eb1c9	api should stay mandatory	2020-03-09 11:48:39 +01:00
Pierre-antoine Comby	30fb311b2e	modular settings start	2020-03-08 23:03:35 +01:00
Benjamin Graillot	c7ba0e470e	Split requirements into files	2020-03-08 22:42:22 +01:00
Maxime Bombar	aaa958d146	Import used modules ...	2020-03-07 18:24:33 -05:00
Maxime Bombar	f17104770b	Delete comby.xyz from ALLOWED_HOSTS	2020-03-07 23:55:35 +01:00
Yohann D'ANELLO	d0206fb790	Make erdnaxe be happy	2020-03-07 22:28:59 +01:00
ynerant	099c761321	Merge branch 'master' into 'fix_signin' ... # Conflicts: # note_kfet/settings/development.py	2020-03-07 18:21:56 +01:00
Yohann D'ANELLO	8f1caddbe0	Add signup link, customize templates	2020-03-07 18:18:35 +01:00
Pierre-antoine Comby	762585134c	fix static files config for development enviromnent	2020-03-07 17:47:34 +01:00
Pierre-antoine Comby	55a7754277	use localhost in dev	2020-03-07 17:27:28 +01:00
Yohann D'ANELLO	30ce17b644	Update a lot of things	2020-03-07 13:12:17 +01:00
Yohann D'ANELLO	0884270474	Merge branch 'master' into rights ... # Conflicts: # note_kfet/settings/base.py	2020-03-07 10:42:51 +01:00
ynerant	6f7374710b	Merge branch 'master' into 'logging' ... # Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po	2020-03-07 10:32:17 +01:00
Pierre-antoine Comby	ab8888a085	Merge branch 'master' into 'alias' ... # Conflicts: # note_kfet/settings/base.py # note_kfet/urls.py	2020-03-06 21:49:46 +01:00
ynerant	0193a4d898	Merge branch 'cas' into 'master' ... CAS See merge request bde/nk20!29	2020-03-06 21:38:57 +01:00
Pierre-antoine Comby	08b97e722b	add support for cropping image. WIP.	2020-03-05 23:32:01 +01:00
Pierre-antoine Comby	13055c393a	Merge branch 'master' into alias	2020-03-05 21:43:06 +01:00
Pierre-antoine Comby	211859e940	add default profile pic	2020-03-03 14:24:07 +01:00
Pierre-antoine Comby	d5f718fbba	start activity view and urls	2020-03-01 17:55:48 +01:00
Yohann D'ANELLO	079e423343	Merge branch 'master' into logging	2020-02-27 14:36:27 +01:00
Yohann D'ANELLO	c22e73a86e	Don't create automatically a new user on login	2020-02-27 14:11:00 +01:00
Yohann D'ANELLO	8503bf9d57	Add default initial fixture for CAS server	2020-02-27 14:00:20 +01:00
Yohann D'ANELLO	94d327821a	Merge remote-tracking branch 'origin/master' into cas	2020-02-27 13:59:52 +01:00
Yohann D'ANELLO	04e40e9a91	Merge branch 'master' into cas	2020-02-27 13:39:22 +01:00
Pierre-antoine Comby	92d12e6d59	don't use STATICFILES_DIRS	2020-02-26 19:32:12 +01:00
Pierre-antoine Comby	2de5a8030e	set STATIC_ROOT	2020-02-25 22:14:56 +01:00
Yohann D'ANELLO	fd529a53c8	Logging support	2020-02-24 18:18:44 +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
Yohann D'ANELLO	85881a5cc5	Client CAS	2020-02-22 23:44:24 +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
Yohann D'ANELLO	4b7f40a046	CAS Server support	2020-02-22 14:20:22 +01:00
Alexandre Iooss	82355135b0	Remove SmoothNavigation Middleware	2020-02-21 21:15:49 +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	5977d88ed6	Test turbolinks	2020-02-21 15:24:29 +01:00
Alexandre Iooss	20953ff214	Change default site name with project fixture	2020-02-20 22:15:28 +01:00
Yohann D'ANELLO	e28b19b353	Import NK15 passwords	2020-02-20 10:26:00 +01:00
Alexandre Iooss	4bbd464f9c	Unify file headers	2020-02-18 21:30:26 +01:00
Yohann D'ANELLO	62bfd9a044	Remove redundant ; and import local settings	2020-02-18 13:03:58 +01:00
Yohann D'ANELLO	559445c8b4	Add some decoration	2020-02-17 19:44:56 +01:00
Yohann D'ANELLO	55977bcbe7	Token authentication	2020-02-17 19:25:33 +01:00
Yohann D'ANELLO	c053235996	Autocomplete	2020-02-08 20:23:17 +01:00
Yohann D'ANELLO	f4a665cb7f	API	2020-02-06 23:29:17 +01:00
Yohann D'ANELLO	318e81d149	German translation	2020-02-06 21:42:17 +01:00
Pierre-antoine Comby	69dd8b50a5	Merge branch 'master' of gitlab.crans.org:bde/nk20	2020-02-03 13:58:29 +01:00
ynerant	74189f1f4e	Docker	2020-02-03 11:50:42 +01:00
Pierre-antoine Comby	a14d9cf38b	default redirection after login	2020-02-02 15:43:34 +01:00
Pierre-antoine Comby	3ddc757e25	add ALLOWED_HOSTS to local variables	2020-02-02 13:41:43 +01:00
Pierre-antoine Comby	f6dfadd101	env variable are loaded from not-gitted .env file	2020-01-29 17:21:46 +00:00
Pierre-antoine Comby	14486074b4	the server is running	2020-01-28 19:56:04 +00:00
Pierre-antoine Comby	62c7e886e9	typo, making the CI breaks	2020-01-28 09:28:29 +00:00
Pierre-antoine Comby	0296686ed3	use defaults if no secrets is provided	2020-01-28 09:16:08 +00:00
Pierre-antoine Comby	0b8eee6da9	the password of pgsql is a secret	2020-01-27 21:23:40 +00:00
Pierre-antoine Comby	a39cb56e0d	split settings config between development and production	2020-01-27 20:49:02 +00:00
Benjamin Graillot	55d984435d	Remove django-guardian	2019-09-18 16:46:26 +02:00
Benjamin Graillot	67d1d9f7b7	Added permission app	2019-09-18 14:26:42 +02:00
Alexandre Iooss	b76d4d69e0	Remove custom CSS from base.html	2019-08-14 15:17:14 +02:00
Pierre-antoine Comby	f88ca61b34	use django_tables2	2019-08-13 18:22:19 +02:00
Pierre-antoine Comby	633663f95d	add signup view	2019-08-11 16:22:52 +02:00
Pierre-antoine Comby	4a732498b9	add crispy forms and freeze	2019-08-11 16:21:25 +02:00
Pierre-antoine Comby	0362e23638	oupsi la typo	2019-08-11 14:50:12 +02:00
Pierre-antoine Comby	fd9b9c34c7	move apps to own dir	2019-08-11 14:47:44 +02:00
Pierre-antoine Comby	28a747ac17	start frontend	2019-08-10 19:00:16 +02:00
Benjamin Graillot	f865a6ac7c	[note] Handle alias creation and uniqueness	2019-07-23 02:13:09 +02:00
Benjamin Graillot	9ecc40adeb	[note_kfet] Disable Guardian AnonymousUser	2019-07-23 02:11:24 +02:00
Alexandre Iooss	7bafbeb93a	The beginning of transfer view	2019-07-17 13:34:07 +02:00
Alexandre Iooss	5110d6a16b	Use model polymorphism	2019-07-17 11:17:50 +02:00
Alexandre Iooss	ba0a4519e3	Add Django Revision in deps	2019-07-16 15:47:19 +02:00
Alexandre Iooss	fbe2e7f59a	Not so atomic, sorry	2019-07-16 12:43:23 +02:00
Alexandre Iooss	b1d96fae3f	Fix identation	2019-07-16 09:05:51 +02:00
Pierre-antoine Comby	566b221536	start note app	2019-07-08 14:30:58 +02:00
Alexandre Iooss	f8c972d49c	Add Django guardian	2019-07-08 14:22:41 +02:00
Pierre-antoine Comby	a60dc70172	importError fix	2019-07-08 12:13:06 +00:00
Alexandre Iooss	eaa9b78d56	Demo	2019-07-08 14:00:57 +02:00
Alexandre Iooss	6ec6f96b41	Clean up master	2019-07-08 13:51:15 +02:00