1473 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sylvain	0107861314	Merge branch 'dev' for release 2.4.8	2016-12-15 17:12:28 +01:00
Sylvain	7926d7a04a	Version 2.4.8	2016-12-15 17:12:07 +01:00
Sylvain	12aaa7007c	fix a bug about notification email for refunf invoices	2016-12-15 14:27:58 +01:00
Sylvain	6ecce5b608	updated changelog	2016-12-15 14:19:55 +01:00
Sylvain	afa68db4a2	Merge branch 'sso_edits' into dev	2016-12-15 14:17:01 +01:00
Sylvain	102eecdc8a	ability to send again auth migration code	2016-12-15 14:16:24 +01:00
Sylvain	5e1b85832c	[ongoing] resend sso fusion token	2016-12-14 17:14:53 +01:00
Sylvain	a7fdc4d741	fix potentital issue with sso + enterprise profile	2016-12-14 15:55:12 +01:00
Sylvain	d8b6848b1b	sso wording	2016-12-14 15:14:33 +01:00
Sylvain	531a89945b	member form: add asterisks on mendatory fields	2016-12-14 13:05:42 +01:00
Sylvain	96259ab257	Merge branch 'dev' for release 2.4.7	2016-12-14 10:41:46 +01:00
Sylvain	34e04845bb	Version 2.4.7	2016-12-14 10:41:17 +01:00
Sylvain	df411b10b2	test wallet credit with refund invoice generation	2016-12-13 16:00:12 +01:00
Sylvain	c582d4665d	improved cash coupon test	2016-12-13 15:37:43 +01:00
Sylvain	76c1412177	Merge branch 'wallet_avoir' into dev	2016-12-13 15:33:56 +01:00
Sylvain	853cc67ee3	add nomal coupon test	2016-12-13 15:33:24 +01:00
Sylvain	3cdbecf74a	add invoice item to refund invoices for wallet credit	2016-12-13 15:05:40 +01:00
Sylvain	ecbe8a58a2	coupon edition: display internationalized errors	2016-12-13 12:46:00 +01:00
Sylvain	85ee73f0e0	ability to edit coupon expiration	2016-12-13 12:01:54 +01:00
Sylvain	4817da75d6	[bug] unable to create or edit percentage coupons	2016-12-13 10:08:19 +01:00
Sylvain	5a1abe409a	tests for price compute API	2016-12-12 16:44:56 +01:00
Sylvain	9190e61f5f	basic avoir invoice for wallet credit	2016-12-12 15:32:01 +01:00
Sylvain	b44089a33d	interface & api to build avoir for a wallet credit	2016-12-12 14:20:26 +01:00
Sylvain	ed2d3b4ff0	updated changelog & version	2016-12-12 11:22:37 +01:00
Sylvain	c2f638934e	added info notice about operation's time of admin delete	2016-12-12 11:18:24 +01:00
Sylvain	db8cf69771	[bug #55] unable to run rake db:migrate on first install	2016-12-08 12:09:04 +01:00
Sylvain	4c68f815e7	added coveralls	2016-12-01 13:08:41 +01:00
Sylvain	a738cfa650	do not versionate coverall config	2016-12-01 12:22:01 +01:00
Sylvain	070a836cb5	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2016-12-01 12:12:51 +01:00
Sylvain	2a92b06ef6	test invoice with VAT	2016-12-01 12:12:44 +01:00
cyril	33566b551d	update docker doc	2016-12-01 12:01:44 +01:00
Sylvain	10080b8676	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2016-12-01 11:37:18 +01:00
Sylvain	cf1c868546	test suite is now testing pdf files content	2016-12-01 11:37:09 +01:00
Sylvain	5067ecd3ac	prevent elasticsearch from logging during tests (clearer output)	2016-12-01 11:36:35 +01:00
cyril	bb4c3bdd35	update docker Readme	2016-11-30 21:48:46 +01:00
Sylvain	b23ebfdcaa	Merge branch 'dev' for release 2.4.6	2016-11-30 17:29:06 +01:00
Sylvain	3fad06c886	Version 2.4.6	2016-11-30 17:28:51 +01:00
Sylvain	4c8b661750	display coupon application result in inline message instead of growl notification	2016-11-30 10:17:05 +01:00
Sylvain	16ed469c72	add deploy instructions for 2.4.5	2016-11-29 17:56:56 +01:00
Sylvain	920270e602	add deploy instructions for 2.4.5	2016-11-29 17:56:41 +01:00
Sylvain	aeb770868a	Merge branch 'dev' for release 2.4.5	2016-11-29 17:07:24 +01:00
Sylvain	25a668bb30	Version 2.4.5	2016-11-29 17:06:56 +01:00
Sylvain	10fc7b69e9	Ability to display optional information message on event reservation page	2016-11-29 16:46:19 +01:00
Sylvain	c10298359f	no newline at end of version-file	2016-11-29 16:01:05 +01:00
Sylvain	b75cbc17d7	fix training reservation calendar witch shows all trainings slots	2016-11-29 15:48:39 +01:00
Sylvain	852437ebf8	remove coupon from memory after payment	2016-11-29 15:35:54 +01:00
Sylvain	82fa5416ce	fix creation of prices with float values	2016-11-29 15:23:36 +01:00
Sylvain	a9e593a840	fix statistics generation with cash coupon	2016-11-29 14:57:43 +01:00
Sylvain	6c933857f4	fix statistics generation with cash coupon	2016-11-29 14:57:21 +01:00
Sylvain	1ebab285f3	fix statistic generation with cash coupons	2016-11-29 12:07:22 +01:00