278 Commits

Author	SHA1	Message	Date
Sylvain	57ad5ca50e	updated schema	2017-03-28 13:30:10 +02:00
Sylvain	b48451f9f8	improved space reservation optional explication message	2017-03-01 11:47:20 +01:00
Sylvain	c936b283f7	display spaces status in client calendar	2017-02-28 16:51:56 +01:00
Sylvain	0e94f8c3d4	Redo "change DB model to allow many_to_many relationship between Slot and Reservation" ... This reverts commit 4cbfbdc4e0.	2017-02-28 13:23:31 +01:00
Sylvain	4cbfbdc4e0	Revert "change DB model to allow many_to_many relationship between Slot and Reservation" ... This reverts commit 03d922e214.	2017-02-28 12:36:50 +01:00
Sylvain	e86de06c45	fix revert migrations	2017-02-28 12:25:16 +01:00
Sylvain	03d922e214	change DB model to allow many_to_many relationship between Slot and Reservation	2017-02-27 13:15:31 +01:00
Sylvain	e7d18eac81	update setup instructions to fix non-creation of f_unaccent function	2017-02-16 11:21:43 +01:00
Sylvain	64b79e014f	updated db schema	2017-02-16 08:53:51 +01:00
Sylvain	46fbcc06f3	add attachment & characteristics to spaces	2017-02-13 15:53:12 +01:00
Sylvain	560bb46383	space db model	2017-02-13 14:38:28 +01:00
Sylvain	4f3c5e963c	[bug] change plan price lost stats	2017-01-09 10:54:30 +01:00
Sylvain	9edf723373	[bug] wrong statistics about hours available for reservation	2017-01-03 13:35:36 +01:00
Sylvain	a7fdc4d741	fix potentital issue with sso + enterprise profile	2016-12-14 15:55:12 +01:00
Sylvain	db8cf69771	[bug #55] unable to run rake db:migrate on first install	2016-12-08 12:09:04 +01:00
Sylvain	c13f640e81	remove rails find_by_* helpers	2016-11-23 16:30:19 +01:00
Sylvain	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +01:00
Sylvain	b7737be6f3	fix migration rollback	2016-11-23 11:44:48 +01:00
Sylvain	13f416a101	[sso] save and restore field data mapping	2016-09-15 15:58:21 +02:00
Sylvain	c2533c0590	add custom aggs for machine & trainings stats: available bookings	2016-09-06 17:17:15 +02:00
Sylvain	1fec50accf	ability to run custom aggregation with query and append result to query	2016-09-06 14:21:52 +02:00
Sylvain	ea671d03a4	database structure for custom aggregations in statistics	2016-09-05 17:16:23 +02:00
Sylvain	87104a6b97	remove unused recuced_amount from event + allow to rollback migrations + openAPI will display custom prices for events	2016-08-31 11:58:37 +02:00
Sylvain	e281a20ada	database migration to event price category	2016-08-30 18:30:21 +02:00
Sylvain	4f41aa6554	event custom prices: various fixes and removed artifacts	2016-08-30 13:07:47 +02:00
Sylvain	c6a83e98cb	[ongoing] db architecture for custom prices reservation	2016-08-25 18:41:33 +02:00
Sylvain	500a466371	full ability to create price categories	2016-08-24 16:21:43 +02:00
Sylvain	6c3dfab0a9	API for price categories management	2016-08-24 12:30:48 +02:00
Sylvain	26aed7a1b5	ability for the admin to set custom settings for the reservation reminders + fix settings customization confirmation message	2016-08-17 12:49:52 +02:00
Sylvain	a6ded12ee9	create/delete coupons on stripe + adjust schema to match stripe requirements	2016-08-08 14:42:17 +02:00
Sylvain	ce31c1412b	coupons usages are counted with invoices	2016-08-04 09:45:00 +02:00
Sylvain	3a932e75c0	coupon data model & tests	2016-08-03 17:25:00 +02:00
Sylvain	2afd6ade8a	allow user to set his organization on registration	2016-08-02 12:27:45 +02:00
Sylvain	ccc1eaf3a0	database structure for organizations	2016-08-01 17:36:38 +02:00
Sylvain	5f96c9916d	[feature] newsletter : ask conscent + export in xlsx	2016-07-28 12:20:51 +02:00
Sylvain	4d2f46ca95	[feature] Async statistics export to XLSX ... - fix tests due to removal of event_categories - rake task for generating statistics	2016-07-27 11:28:54 +02:00
Sylvain	32d239f723	[Bug #28] Event type disappear when editing the event	2016-07-25 16:16:25 +02:00
Peng DU	909c204af5	show invoice download link in wallet transaction debit operator	2016-07-21 16:32:57 +02:00
Peng DU	f2010e752d	show pay by wallet in invoice	2016-07-21 16:32:56 +02:00
Peng DU	363fd73bc4	add model WalletTransaction	2016-07-21 16:32:53 +02:00
Peng DU	db8a6e8a32	application can show user wallet	2016-07-21 16:32:53 +02:00
Peng DU	1529e4b14e	allow active/disactive a training to show in training lists	2016-07-14 12:18:24 +02:00
Sylvain	6839e8db38	Merge branch 'events' into dev ... Conflicts: CHANGELOG.md config/locales/app.shared.en.yml config/locales/app.shared.fr.yml	2016-07-13 18:32:30 +02:00
Sylvain	90142ae3bb	Merge branch 'training' into dev	2016-07-13 18:15:14 +02:00
Sylvain	f5b435895e	updated changelog	2016-07-13 16:15:50 +02:00
Sylvain	68f9324725	Merge branch 'steps' into dev ... Conflicts: app/assets/javascripts/controllers/projects.coffee.erb db/schema.rb	2016-07-13 16:10:18 +02:00
Sylvain	fda619e422	add info message on categories management + fix existing categories slugs	2016-06-30 16:12:24 +02:00
Sylvain	471fe971bc	remove course & workshop from seeds file	2016-06-30 15:13:58 +02:00
Sylvain	e930e04ed6	add age&theme filters to statistics	2016-06-30 12:48:46 +02:00
Sylvain	c8b42f1b7f	add slugs to event filters + add categories into statistics + prevent remove linked elements in front	2016-06-30 11:24:57 +02:00
Sylvain	79b97eb113	[feature] manage event's age range	2016-06-29 11:21:21 +02:00
Sylvain	cbbd697d38	age_range & theme for event model	2016-06-28 15:56:37 +02:00
Sylvain	4d4248bcca	Merge branch 'dev' into events ... Conflicts: db/seeds.rb	2016-06-28 14:18:15 +02:00
Sylvain	99aa8120fc	i18n statistics	2016-06-28 14:07:59 +02:00
Sylvain	7d02fa9d9a	rename Courses/Workshops to Events	2016-06-28 11:42:20 +02:00
Sylvain	d5b06d08ad	[feature] confirmation on project deletion	2016-06-28 10:02:36 +02:00
Sylvain	8c90eab8ac	updated changelog with TODO DEPLOY	2016-06-27 16:42:27 +02:00
Sylvain	875e513f1c	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00
Sylvain	b08ab236dc	[bug] Unable to run migrations if postgre unaccent was already active	2016-06-27 09:12:16 +02:00
Sylvain	ba4115a1da	Merge remote-tracking branch 'origin/plugin' into dev	2016-06-16 17:13:36 +02:00
Sylvain	a358ef7dbc	Merge branch 'users' into dev	2016-06-16 12:55:29 +02:00
Sylvain	dbeb0717df	fix show existing collaborator name in project edition	2016-06-16 11:11:03 +02:00
Sylvain	92e117d5bd	fix db:rollback on create_unaccent_function	2016-06-16 10:39:00 +02:00
Sylvain	08244d53dc	improve trainings load times ... - do not eager load trainings availabilities in INDEX action if not requsted - in trainings monitoring (font), do not load all availabilities for all traninings by default, by select a training first to load its availabilities	2016-06-15 12:01:09 +02:00
Sylvain	f924144fda	[feature] member select with lazy loading	2016-06-14 09:57:39 +02:00
Sylvain	2b1d1fc4dd	[feature] basic ability manage steps order	2016-06-02 12:49:00 +02:00
Nicolas Florentin	ff20b4c5d3	update schema.rb	2016-05-26 15:14:19 +02:00
Sylvain	0be0935474	[feature] add user's job to profile	2016-05-26 12:34:30 +02:00
Sylvain	d009cf3fc1	[feature] add flickr, lastfm & pinterest	2016-05-26 12:05:28 +02:00
Sylvain	88de9c3c75	[feature] profile website + edition of is_allow_contact	2016-05-16 14:46:57 +02:00
Sylvain	7ec5e5ba03	[feature] allow user to add links to his socials networks	2016-05-16 11:18:30 +02:00
Nicolas Florentin	7f032526cb	implements open_api various endpoints	2016-05-04 18:17:50 +02:00
Nicolas Florentin	92b3471032	creates models open_api client and calls_count_tracing, adds worker to trace calls count	2016-05-04 11:48:14 +02:00
Sylvain	02c72e55d9	test admins	2016-04-13 10:43:25 +02:00
Nicolas Florentin	3e112c13eb	removes model and migrations relative to old model machines_pricings	2016-04-05 10:52:29 +02:00
Sylvain	b8459ef990	fix i18n libs load checkup + fix README	2016-03-24 11:03:26 +01:00
cyril	d1450f65f6	release 2.0 rc	2016-03-23 18:39:41 +01:00
cyril	68eab24fa1	init depot fabmanager	2015-05-05 03:10:25 +02:00