1167 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pierre-antoine Comby	935ebf291a	use note id , not alias id	2020-03-28 21:31:22 +01:00
Pierre-antoine Comby	aaf49c9b99	balance on a second line	2020-03-28 21:30:55 +01:00
Yohann D'ANELLO	691a03ecad	Add some initial permissions for activities	2020-03-28 19:05:21 +01:00
Pierre-antoine Comby	6ea59a4603	Merge branch 'master' into tranfer_front	2020-03-28 17:47:20 +01:00
Pierre-antoine Comby	948263a867	color codes from note balances	2020-03-28 17:44:22 +01:00
Pierre-antoine Comby	f3656f367c	default picture is 200x200	2020-03-28 17:44:03 +01:00
Pierre-antoine Comby	d8949a993a	get alias and note infos together	2020-03-28 17:42:29 +01:00
Yohann D'ANELLO	c8b72cf1ff	Guests can pay with CB or coins, lot of other improvements	2020-03-28 16:52:58 +01:00
Yohann D'ANELLO	81cfaf12fa	People can join activities	2020-03-28 13:38:31 +01:00
Yohann D'ANELLO	a805e41367	Fix CI	2020-03-28 02:09:10 +01:00
Yohann D'ANELLO	08ed694438	Update translations	2020-03-28 02:08:29 +01:00
Yohann D'ANELLO	a8422411bc	Entry page (we can search people)	2020-03-28 01:45:13 +01:00
Yohann D'ANELLO	8c1d902c30	Open and validate activities	2020-03-27 22:48:20 +01:00
Yohann D'ANELLO	d6e202a26f	Display guests list	2020-03-27 21:18:27 +01:00
Yohann D'ANELLO	0d43d74c60	Display activity details	2020-03-27 19:47:43 +01:00
Yohann D'ANELLO	34949f0859	Fix activity in Guest model	2020-03-27 19:16:38 +01:00
Yohann D'ANELLO	ceb5690838	Invite people	2020-03-27 18:02:22 +01:00
Yohann D'ANELLO	4f4bbf6d0e	Fix server starting	2020-03-27 16:32:46 +01:00
Yohann D'ANELLO	f09364d3d8	Custom auto-complete fields, remove DAL requirement	2020-03-27 16:19:33 +01:00
Yohann D'ANELLO	823bcfe781	Fix CI	2020-03-27 14:19:55 +01:00
Yohann D'ANELLO	dadd840645	Merge remote-tracking branch 'origin/master' into activity	2020-03-27 14:16:10 +01:00
Pierre-antoine Comby	8b4c39269c	Merge branch 'front_club' into 'master' ... Finitions sur l'interface club See merge request bde/nk20!70	2020-03-27 14:11:28 +01:00
Pierre-antoine Comby	09fb0e1470	Merge branch 'master' into front_club	2020-03-27 14:07:22 +01:00
Pierre-antoine Comby	ee3d441a56	add parent club link	2020-03-27 14:04:30 +01:00
Pierre-antoine Comby	ed746f39b2	Merge branch 'devalidation_reason' into 'master' ... Motif de dévalidation See merge request bde/nk20!67	2020-03-27 13:56:39 +01:00
ynerant	bef4958759	Merge branch 'master' into 'devalidation_reason' ... # Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po	2020-03-27 13:52:48 +01:00
Yohann D'ANELLO	f81e2b5b5b	Use custom inputs for date picker and amounts	2020-03-27 13:50:02 +01:00
Pierre-antoine Comby	e27b456aea	Merge branch 'parent-club' into 'master' ... Resolve "Club Parent" Closes #42 See merge request bde/nk20!65	2020-03-27 13:29:43 +01:00
Pierre-antoine Comby	a3a8fd601c	revert to ReadProtectedViewset	2020-03-27 13:26:47 +01:00
Yohann D'ANELLO	45b14ed1bd	Create activities	2020-03-27 01:31:54 +01:00
Yohann D'ANELLO	213e5a8369	Fix CI	2020-03-27 00:40:35 +01:00
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
Pierre-antoine Comby	c50e17c555	error handling up to client	2020-03-26 23:05:37 +01:00
Pierre-antoine Comby	f7a66920e0	move common script to alias.js	2020-03-26 23:05:08 +01:00
Pierre-antoine Comby	49dd88dbb7	add errMsg function	2020-03-26 23:04:51 +01:00
Pierre-antoine Comby	61b6aceb36	crappy name -> crappy behavior	2020-03-26 23:04:14 +01:00
Yohann D'ANELLO	a00e43bc26	Fix alias deletion	2020-03-26 21:04:32 +01:00
Pierre-antoine Comby	e125601f52	almost working javascript	2020-03-26 17:48:17 +01:00
Pierre-antoine Comby	92ca835d0e	switch to template column	2020-03-26 17:47:49 +01:00
Pierre-antoine Comby	271fab3b75	use small btn in table	2020-03-26 17:46:38 +01:00
Pierre-antoine Comby	04b39f09af	remove forms	2020-03-26 17:45:49 +01:00
Pierre-antoine Comby	757dfdd914	serializer config	2020-03-26 17:45:24 +01:00
Pierre-antoine Comby	d9cdb01350	remove alias handling backend, gonna use DRF	2020-03-26 17:44:01 +01:00
Pierre-antoine Comby	7568abb681	some minor cleaning	2020-03-26 17:41:11 +01:00
ynerant	e8cbd46374	Merge branch 'remove-noteuser-fixture' into 'master' ... Something is wrong in the fixtures See merge request bde/nk20!69	2020-03-26 16:04:09 +01:00
Yohann D'ANELLO	01410d2b23	Store used aliases in transactions	2020-03-26 15:59:51 +01:00
Yohann D'ANELLO	41aa6964d2	Store used aliases in transactions	2020-03-26 14:45:48 +01:00
Pierre-antoine Comby	1b26df6481	move template_category to own fixture ... TemplateCategory are not essential for running a base instance.	2020-03-26 14:08:18 +01:00
Benjamin Graillot	59cd166b79	[member] tabs --> spaces	2020-03-25 18:05:46 +01:00
Pierre-antoine Comby	33e3657120	add aliases view to clubs	2020-03-25 18:00:40 +01:00