89 Commits

Author	SHA1	Message	Date
Yohann D'ANELLO	c14d37eaeb	Fix deletion of consumptions in double consumption mode	2020-07-30 16:06:21 +02:00
Yohann D'ANELLO	9d8c588b78	Buttons list didn't work as well	2020-07-30 15:49:59 +02:00
Yohann D'ANELLO	484560fe4b	Fix emitter button	2020-07-30 15:14:13 +02:00
Yohann D'ANELLO	da1063862e	Merge gift + transfer interfaces	2020-07-29 22:55:12 +02:00
Yohann D'ANELLO	2eb601bd66	💥 Improve performances	2020-07-25 17:25:57 +02:00
Yohann D'ANELLO	c8fe3435de	Some lines of the base.js file mysteriously disappeared...	2020-05-30 16:14:37 +02:00
Yohann D'ANELLO	7bda0bb31f	Fix JS	2020-05-30 15:45:44 +02:00
ynerant	395c52220f	Merge branch 'master' into 'tranfer_front' ... # Conflicts: # apps/activity/views.py # apps/permission/backends.py # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # static/js/base.js # templates/base.html # templates/member/user_list.html	2020-05-07 18:48:35 +02:00
Yohann D'ANELLO	16af9ac0ea	Improve survey, comment code	2020-04-20 01:26:53 +02:00
Yohann D'ANELLO	69ac5cd291	Revert changes on some comments	2020-04-19 20:45:59 +02:00
Yohann D'ANELLO	8113c5cd61	WEI Survey (work in progress)	2020-04-19 20:35:49 +02:00
Yohann D'ANELLO	840376a4f5	Add teams	2020-04-13 06:01:27 +02:00
Yohann D'ANELLO	31d2224b8f	List wei	2020-04-11 23:02:12 +02:00
Yohann D'ANELLO	d96c40a00f	Style was removed when a note was removed	2020-04-10 23:46:16 +02:00
Yohann D'ANELLO	a609d7c995	Fix credit/debit tabs	2020-04-10 23:41:13 +02:00
Alexandre Iooss	7af76899e3	Simplify grids	2020-04-10 23:40:19 +02:00
Alexandre Iooss	46b5f537bc	Fix tooltip inner selecter	2020-04-10 23:04:25 +02:00
Alexandre Iooss	b90ff59d98	Update tooltip position after new emitter	2020-04-10 22:46:57 +02:00
Yohann D'ANELLO	e4a44b0b4a	Better transfer page	2020-04-10 22:43:55 +02:00
Alexandre Iooss	5c3cc607e8	Fix dynamic list layout	2020-04-10 22:37:20 +02:00
Alexandre Iooss	64499b65bb	Better tooltips and icons	2020-04-10 22:22:07 +02:00
Alexandre Iooss	442ac51373	Clean old search container	2020-04-10 21:28:33 +02:00
Alexandre Iooss	3dec49c4d1	Attach tooltip to parent	2020-04-10 21:23:51 +02:00
Alexandre Iooss	682b2b19d7	Use Boostrap tooltips for search	2020-04-10 21:05:06 +02:00
Alexandre Iooss	18c95f2063	Use JQuery addClass and removeClass	2020-04-10 20:12:14 +02:00
Alexandre Iooss	cf67e17e85	Do not use JavaScript to hide double conso after loading	2020-04-10 19:50:42 +02:00
Yohann D'ANELLO	658d402242	Notes of users that don't have validated their email addresses are displayed with a different background	2020-04-10 02:56:56 +02:00
Yohann D'ANELLO	31205b9b5d	Fix devalidation, clear class on note description	2020-04-10 02:42:21 +02:00
Yohann D'ANELLO	751147f254	Don't display a note that we can't see, fix CI, fix distinct fields on PostgresSQL DB	2020-04-10 00:02:22 +02:00
Yohann D'ANELLO	bac81cd13e	Merge branch 'master' into tranfer_front ... # Conflicts: # static/js/base.js	2020-04-09 22:49:52 +02:00
Yohann D'ANELLO	f833f1c46c	Comment code	2020-04-06 08:58:39 +02:00
Yohann D'ANELLO	9d584ae87a	Add shortcuts for transfers and credits in the activity entry page	2020-04-06 07:06:52 +02:00
Yohann D'ANELLO	515edc4459	Credit note for new memberships	2020-04-05 18:37:04 +02:00
ynerant	72e5df0cf5	Merge branch 'new-note-type' into 'master' ... Memberships Closes #43 and #16 See merge request bde/nk20!71	2020-04-05 02:06:19 +02:00
Yohann D'ANELLO	04f9ae51ed	Fix docker setup, remove select2 files (unused)	2020-04-03 04:03:58 +02:00
Yohann D'ANELLO	c384ee02eb	Implement a new type of note (see #45)	2020-03-31 01:03:30 +02:00
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
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
Yohann D'ANELLO	8c1d902c30	Open and validate activities	2020-03-27 22:48:20 +01:00
Yohann D'ANELLO	f09364d3d8	Custom auto-complete fields, remove DAL requirement	2020-03-27 16:19:33 +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	09fb0e1470	Merge branch 'master' into front_club	2020-03-27 14:07:22 +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	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
Yohann D'ANELLO	41aa6964d2	Store used aliases in transactions	2020-03-26 14:45:48 +01:00
Yohann D'ANELLO	5cf75ebf9e	When a transaction can't becreated because the user don't have the permission to take too much money, then we create an invalid transaction	2020-03-25 15:27:38 +01:00