1167 Commits

Author	SHA1	Message	Date
Sylvain	21a5f5591a	[ongoing] generate achives async	2019-04-03 17:57:21 +02:00
Sylvain	0f622d1aec	fixed ruby style	2019-04-03 17:39:45 +02:00
Sylvain	4be597ba9d	fixed ruby style	2019-04-03 17:33:43 +02:00
Sylvain	8a6ff0c093	prevent closing a period not in the past	2019-04-03 17:27:25 +02:00
Sylvain	9e39a0517c	[bug] vat rat in archives may be wrong	2019-04-03 16:56:47 +02:00
Sylvain	8e895e6b6a	force user to use datepicker in close period modal	2019-04-03 14:47:39 +02:00
Sylvain	79c3cfaa27	prevent the user to close the modal modal while closing a period	2019-04-03 14:31:39 +02:00
Sylvain	722d5d36e7	check server-side that periods match length requirements + explain requirements to user before closing	2019-04-03 13:04:19 +02:00
Sylvain	93ff761e64	[bug] Error :syntax when using quote in event category name	2019-04-02 16:19:23 +02:00
Sylvain	7cdacb3164	print date in archive	2019-04-01 13:36:45 +02:00
Sylvain	7a317b7e45	[bug] unable to add a file attachment to an event	2019-03-28 11:30:25 +01:00
Sylvain	a50bb63b64	prevent double validation while closing period	2019-03-27 17:37:36 +01:00
Sylvain	fc04886e89	prevent generate refund before first accounting period	2019-03-27 16:46:08 +01:00
Sylvain	be6b82fda1	improved VAT history + updated changelog + added instruction on watermark localisation	2019-03-27 15:50:38 +01:00
Sylvain	ea2a73cdc1	add asterisks on required fields	2019-03-26 17:20:10 +01:00
Sylvain	75310d599f	Merge branch 'host' into dev	2019-03-26 14:33:30 +01:00
Sylvain	fcc78d3930	apply coding rules to openAPI doc	2019-03-26 14:27:39 +01:00
Sylvain	b31bb272cc	unbranding LaCasemate	2019-03-26 14:04:45 +01:00
Sylvain	01ac73a1a1	removed capistrano & unicorn + cleaned lacasemate brading	2019-03-26 10:40:58 +01:00
Sylvain	2ac0336adb	Merge branch 'dev' into host	2019-03-25 16:17:23 +01:00
Sylvain	5cdaa014ef	[security] updated devise + updated rails	2019-03-25 14:57:48 +01:00
Sylvain	fd55c8d315	use SHA-3 (256 bits) to compute checksums + simplify accounting period integrity check UI	2019-03-21 17:15:41 +01:00
Sylvain	8530a6f655	superadmin + fixed free space notification	2019-03-20 16:49:38 +01:00
Sylvain	bf526458b4	add label to accounting period button	2019-03-20 11:56:03 +01:00
Sylvain	940ea3051b	chain historyValues with sha256 footprints	2019-03-20 11:01:53 +01:00
Sylvain	03c0c0d4fb	close periods at 1 year minus 1 day + fix alert reminder transalation	2019-03-18 14:45:21 +01:00
Sylvain	7b0824a4a3	notify admins when no accounting period closed for 1 year	2019-03-18 14:33:30 +01:00
Sylvain	c356f35f29	add operator_id to invoices	2019-03-18 11:11:09 +01:00
Sylvain	b439c643cb	zip archives, include checksum, chained zips	2019-03-13 17:48:35 +01:00
Sylvain	9fcb4277cd	Merge branch 'dev' into host	2019-03-13 16:49:11 +01:00
Sylvain	402be18bdf	model documentation	2019-03-13 16:49:03 +01:00
Sylvain	857b1cebba	fix accounting period checksum + improved period validation	2019-03-12 15:26:17 +01:00
Sylvain	4f418cc3fb	compute total without taxes + fix close period date pickers + improved archived % number format	2019-03-12 13:36:10 +01:00
Sylvain	b9e427a9fc	include VAT in archives	2019-03-12 12:15:14 +01:00
Sylvain	4e7a62bc2b	[ongoing] close period for max 1 year + force contiguous periods + fix totals	2019-03-12 09:14:20 +01:00
Sylvain	2a32bc4752	date the archives	2019-03-11 16:25:51 +01:00
Sylvain	b940ae0327	display complete info set on accounting archives	2019-03-11 16:11:49 +01:00
Sylvain	e35c50e42b	multilingual watermark on invoices	2019-03-11 14:47:52 +01:00
Sylvain	811d7288e7	fix chain_record methods	2019-03-11 13:49:16 +01:00
Sylvain	ae7a939cba	Merge branch 'dev' into host	2019-03-11 12:48:14 +01:00
Sylvain	20e91ede4e	Limit members search to 50 results to speed up queries	2019-03-11 12:47:46 +01:00
Sylvain	e78831e3cf	enlight watermark	2019-03-11 12:41:58 +01:00
Sylvain	e543f1fe3e	add watermark to invoices in dev/staging/test environment	2019-02-27 17:44:52 +01:00
Sylvain	672029876a	Merge branch 'dev' into host	2019-02-27 15:30:23 +01:00
Sylvain	a30513d59e	refactored invoice generation	2019-02-26 16:27:26 +01:00
Sylvain	a2ce0c3753	refactored invoice pdf generation script	2019-02-26 16:11:37 +01:00
Sylvain	9854a4b965	prevent memory saturation with periodic checks	2019-02-26 15:18:19 +01:00
Sylvain	1c8e82df14	added free disk space notification to oss release to prevent collision	2019-02-26 11:13:57 +01:00
Sylvain	8f210bb713	Merge branch 'dev' into host	2019-02-26 10:45:34 +01:00
Sylvain	1b97c39645	refactored notificationcenter to accept meta_data	2019-02-26 10:45:12 +01:00
Sylvain	279a958e46	download accounting period archive through interface	2019-02-25 17:22:54 +01:00
Sylvain	f11f629bcf	compute, secure and archive period total and cumulative total of each accounting period	2019-02-25 14:51:19 +01:00
Sylvain	1321e196f2	Merge branch 'dev' into host	2019-02-25 14:41:00 +01:00
Sylvain	e9b52a4c42	added sass variables for bootstrap upgrade	2019-02-25 14:40:39 +01:00
Sylvain	cf23fae73c	Merge branch 'dev' into host	2019-02-14 16:35:38 +01:00
Sylvain	7b573dd37f	restored deprecated notification	2019-02-14 13:05:09 +01:00
Sylvain	9f765009a8	[bug] unable to create oauth2 sso ... [bug] application failed when sso activated [bug] missing translations in oauth2 forms	2019-02-14 12:25:37 +01:00
Sylvain	06f2c3626c	refactored rake tasks	2019-02-13 12:59:28 +01:00
Sylvain	ffe5516d10	prevent closing an accounting period if any checksum error in period	2019-02-12 17:38:44 +01:00
Sylvain	9f4d026f30	fix last archive infos in closed accounting period	2019-02-12 16:19:11 +01:00
Sylvain	2ba3890325	display records integrity status	2019-02-12 16:00:36 +01:00
Sylvain	f9364b3872	chains invoice and invoiceItem records. save them in archives	2019-02-12 14:45:21 +01:00
Sylvain	cc124a0dee	[ongoing] chain invoice records	2019-02-11 13:57:07 +01:00
Sylvain	6e274afe3b	accounting archive: insert code checksum and previous archive checksum	2019-01-31 12:19:50 +01:00
Sylvain	55ae979213	Merge branch 'dev' into host	2019-01-30 10:04:12 +01:00
Sylvain	a528fc3766	infos about deprecated notification	2019-01-30 10:03:53 +01:00
Sylvain	6e89df045d	[bug] some reservation slots are not shown on the user calendars (#127)	2019-01-29 11:29:14 +01:00
Sylvain	da672ea8b6	Merge branch 'dev' into host	2019-01-21 16:34:06 +01:00
Sylvain	da4c9cf26f	[bug] invalid translation of title in new partner modal + refactored plans controller	2019-01-21 16:27:59 +01:00
Sylvain	75eaf4d4d0	improved member autocompletion with multiple words + refactored members controller	2019-01-21 15:17:56 +01:00
Sylvain	62410da9e1	add test for member autocomplete	2019-01-21 11:49:35 +01:00
Sylvain	80aab9f17c	fixed: create event with custom price	2019-01-21 11:26:42 +01:00
Sylvain	c4b3c1eab5	[bug] unable to search in user autocomplete	2019-01-21 09:42:51 +01:00
Sylvain	65892684a8	fixed availabilities controller	2019-01-17 16:55:25 +01:00
Sylvain	5a09453ac2	refactored availabilities controller	2019-01-17 16:26:03 +01:00
Sylvain	da25e16c50	refactored events controller	2019-01-17 09:53:28 +01:00
Sylvain	d2c4773ac9	[bug] unable to delete an admin who has changed a setting	2019-01-16 17:09:27 +01:00
Sylvain	0cd841da33	rubocop api controllers ... TODO: - events controller - availabilies controller - members controller - plans controller	2019-01-16 16:28:25 +01:00
Sylvain	c6cf86fa5c	rubocop api controllers	2019-01-16 13:07:19 +01:00
Sylvain	526b9aab0c	[bug] unable to create/edit plan of 12 months/53 weeks	2019-01-16 12:10:07 +01:00
Sylvain	27f3296719	rubocop coupon	2019-01-16 11:07:09 +01:00
Sylvain	eb69822ce0	Merge branch 'dev' into host	2019-01-14 15:00:55 +01:00
Sylvain	77797db2f1	display VAT rates history	2019-01-14 15:00:33 +01:00
Sylvain	7ca72f53f2	refactored ApplicationController + rubymine stub for devise	2019-01-14 14:45:23 +01:00
Sylvain	068f4c829b	fixed user's role method call	2019-01-14 14:32:00 +01:00
Sylvain	a1ba272538	Merge branch 'dev' into host	2019-01-14 13:00:24 +01:00
Sylvain	f6e236aeb5	refactored roles methods to match ruby conventions	2019-01-14 12:57:31 +01:00
Sylvain	0927336956	fixed reservation after removing disable_invoicing + updated vcr cassettes	2019-01-14 12:45:17 +01:00
Sylvain	a2eb10331e	[ongoing] remove invoicing disabled per user	2019-01-10 16:50:54 +01:00
Sylvain	1db5e76bc9	tests on accounting periods + force reload periods when opening periods/avoir modal	2019-01-10 15:12:22 +01:00
Sylvain	4b5bd74188	add invoice_items in accounting archive	2019-01-10 13:05:57 +01:00
Sylvain	b42d1614fd	export to flat json files closed periods	2019-01-10 10:52:29 +01:00
Sylvain	2f17d90054	remove button 'generate refund' for invoices within closed periods	2019-01-09 17:07:15 +01:00
Sylvain	35638d611b	validates invoice&avoir creation to prevent any creation in closed period	2019-01-09 16:54:09 +01:00
Sylvain	5e8172af35	Merge branch 'dev' into us78	2019-01-09 16:28:36 +01:00
Sylvain	5ab0333176	rubocop invoice & avoir	2019-01-09 16:28:23 +01:00
Sylvain	dafeb668e0	Merge branch 'dev' into us78	2019-01-09 12:07:47 +01:00
Sylvain	56829190d6	refactored invoices controller	2019-01-09 12:07:31 +01:00
Sylvain	9fac706da8	validates accounting periods on creation + prevent refunding on closed periods (client only)	2019-01-08 17:32:45 +01:00
Sylvain	84aa0c75ff	fix date on period closing + improved confirmation msg	2019-01-08 11:58:37 +01:00
Sylvain	ccff40b226	handle dates default values and limits in close period modal	2019-01-08 11:19:07 +01:00
Sylvain	12c25389fa	Merge branch 'dev' into us78	2019-01-08 09:56:22 +01:00
Sylvain	d4cddc92fb	code comments	2019-01-08 09:56:07 +01:00
Sylvain	859544565b	[bug] first day of week is ignored in statistics custom filter	2019-01-08 09:38:35 +01:00
Sylvain	d8c8e4f72f	set default dates in close modal pickers	2019-01-07 17:21:32 +01:00
Sylvain	5b13c59496	list existing closings in close period modal	2019-01-07 16:45:31 +01:00
Sylvain	d89f9e9301	close an accounting period from interface to db through api	2019-01-07 15:33:09 +01:00
Sylvain	b1b5edbfb4	Merge branch 'dev' into us78	2019-01-07 12:48:47 +01:00
Sylvain	4ab0b52294	rubocop controllers	2019-01-07 12:48:22 +01:00
Sylvain	4af3e19cd0	accounting periods API	2019-01-07 12:47:53 +01:00
Sylvain	0a684c8e13	rails DB model for accounting periods	2019-01-07 12:29:52 +01:00
Sylvain	0a59dc6b5d	display previous closings in modal	2019-01-07 10:50:10 +01:00
Sylvain	c35029d205	i18n for close period modal	2019-01-03 17:51:24 +01:00
Sylvain	3fda7562d4	Merge branch 'dev' into us78	2019-01-03 17:40:04 +01:00
Sylvain	6637832d00	refactored frontend invoices translations	2019-01-03 17:39:50 +01:00
Sylvain	bd6584f529	code improvement	2019-01-03 16:50:50 +01:00
Sylvain	105bcf6236	[ongoing] interface to close an accounting period	2019-01-03 16:48:52 +01:00
Sylvain	ea0ec47268	[bug] error handling does not work in some cases	2019-01-03 12:22:34 +01:00
Sylvain	93dd1491cd	[bug] unable to create or edit a plan	2019-01-02 16:49:09 +01:00
Sylvain	39ab5a7ba9	[bug] unable to fetch projects from OpenProjects (#126)	2019-01-02 13:53:27 +01:00
Sylvain	9d831ef44a	rubocop code style	2018-12-27 14:55:55 +01:00
Sylvain	96e980e7b2	removed dead code + improved test suite	2018-12-27 14:53:11 +01:00
Sylvain	10e3d4c3e4	fix update setting from client	2018-12-27 14:15:58 +01:00
Sylvain	688b57e537	fixed data migration for settings -> history_values	2018-12-18 10:21:35 +01:00
Sylvain	ed65976c41	[ongoing] save settings history	2018-12-17 16:02:02 +01:00
Sylvain	d01a93e0f0	[ongoing] members tests	2018-12-12 17:24:31 +01:00
Sylvain	811b7193f7	improved & fixed test suite	2018-12-12 13:49:14 +01:00
Sylvain	f2eaf4e4e1	improved tests and bug fixes	2018-12-11 17:27:25 +01:00
Sylvain	ad69b647f7	fix reservation + subscription	2018-12-11 15:07:32 +01:00
Sylvain	7822ab4572	[ongoing] fix reservation processes	2018-12-10 17:20:23 +01:00
Sylvain	8e60545753	extend subscription and offer free days will keep track of previous subscription	2018-12-10 13:24:00 +01:00
Sylvain	bef3118649	[ongoing] refactor user.subscriptions to save history ... TODO: - refactor subscription.save_with_payment (stripe) - offer free days - extend the subscription - renew a subscription - buy subscription + reservation	2018-12-06 18:26:01 +01:00
Sylvain	6794b12555	force gawk during elastic upgrade & rubocop	2018-12-03 15:10:04 +01:00
Sylvain	5828513a3a	handle error while polling notifications fails	2018-11-27 16:51:30 +01:00
Sylvain	f6cd552c66	migrate to angular 1.6	2018-11-27 16:26:21 +01:00
Sylvain	ab334d504b	migrate to angular 1.5	2018-11-27 15:16:23 +01:00
Sylvain	ad3105cbc9	migrate to angular 1.4	2018-11-27 13:57:41 +01:00
Sylvain	ffbe3e0b4a	updated procedure to setup development env, using docker	2018-11-26 15:14:43 +01:00
Sylvain	56a56565ae	[bug] create transverse plan: do not create one for the admins group	2018-11-26 11:33:48 +01:00
Sylvain	0c63405b4d	migrate from bower to yarn	2018-11-22 17:09:33 +01:00
Sylvain	2801ab0039	fix controllers imports issues due es6 convertion	2018-11-21 15:29:35 +01:00
Sylvain	0aa75488fa	store and retrieve app version in package.json	2018-11-21 11:42:04 +01:00
Sylvain	6e56ac4286	javascript fixes	2018-11-21 11:32:50 +01:00
Sylvain	f528b2021d	added semicolons	2018-11-21 11:08:53 +01:00
Sylvain	8cd533b5a6	eslint problems autofixes	2018-11-21 10:59:07 +01:00
Sylvain	d250dfa1d3	convert coffeescript comments to valid jsdoc	2018-11-21 09:42:31 +01:00
Sylvain	8a03b0b4f2	fix events page + fix disableAnimation directive	2018-11-20 16:25:15 +01:00
Sylvain	c1b1b701ae	fixes and improvements after coffeescript migration	2018-11-20 14:44:41 +01:00
Sylvain	bf1a3ce913	fix ERB JS services	2018-11-20 13:46:28 +01:00
Sylvain	0814f8c2fa	fix ERB JS directives	2018-11-20 13:44:53 +01:00
Sylvain	cfedb643b5	fix angular router file	2018-11-20 12:57:10 +01:00
Sylvain	74b6afd166	fix ERB JS controllers	2018-11-20 12:26:06 +01:00
Sylvain	aac0e8125c	[ongoing] fix erb js controllers	2018-11-19 16:52:48 +01:00
Sylvain	185ea30db3	Merge branch 'erb' into es6	2018-11-19 16:20:46 +01:00
Sylvain	6352087f70	fix comments in erb files	2018-11-19 16:17:49 +01:00
Sylvain	12f74d5d08	fixed javascript for events controllers	2018-11-07 16:37:28 +01:00
Sylvain	39b18933b6	fixed javascript for application controller	2018-11-07 16:36:10 +01:00
Sylvain	e7031c90d5	restablished erb files	2018-10-25 17:08:13 +02:00
decaffeinate	5da4bf6317	decaffeinate: Run post-processing cleanups on about.coffee and 95 other files	2018-10-25 16:51:20 +02:00
decaffeinate	2c4dd31869	decaffeinate: Convert about.coffee and 95 other files to JS	2018-10-25 16:50:16 +02:00
decaffeinate	c4a2635cd9	decaffeinate: Rename about.coffee and 95 other files from .coffee to .js	2018-10-25 16:49:04 +02:00
Sylvain	944fa5f9b9	fixed erb syntax for decaffeinate	2018-10-25 13:10:39 +02:00
Sylvain	41847d75a2	removed erb suffixes	2018-10-25 13:06:09 +02:00
Sylvain	8d4b354199	[bug] change group button overflow	2018-10-15 16:51:44 +02:00
Sylvain	2126a199e0	Ability to set a neutral gender for the fablab's title (#108)	2018-09-18 16:40:50 +02:00
Sylvain	1e3066f6f4	Ability to parametrize machines order on the booking page	2018-09-18 15:30:54 +02:00
Sylvain	a26e8edf19	fix rendering issues in settings	2018-09-18 14:38:43 +02:00
Sylvain	1b33f3c865	display the machine reservation user name to other members	2018-07-24 12:24:51 +02:00
Sylvain	afc6ef40d2	fixed User.to_json	2018-07-24 11:19:30 +02:00
Sylvain	9af1e5c658	fixed User.to_json	2018-07-24 11:13:05 +02:00
Sylvain	a7cc1711aa	Merge branch 'elastic5' into dev	2018-07-12 12:50:52 +02:00
Sylvain	407c18075c	[bug] event catgories not correct in statistics	2018-07-12 12:48:50 +02:00
Sylvain	05bd65dfb2	migrate es api: top 10 aggregations	2018-07-12 11:26:13 +02:00
Sylvain	7afe62522f	refactor User.as_json to use jbuilder template	2018-07-04 14:05:44 +02:00
Sylvain	17b7e96b67	[ongoing] fix top 10 aggregation	2018-06-12 12:59:23 +02:00
Sylvain	38551e8ac2	[ongoing] migrate es api: graphs (see FIXME)	2018-06-08 17:22:03 +02:00
Sylvain	f66ca9165e	migrate es api: statistics	2018-06-08 12:27:11 +02:00
Sylvain	697ea87e37	[bug] unable to filter statistics from age 0	2018-06-08 12:06:22 +02:00
Sylvain	d69007c6c9	[ongoing] migrate es api	2018-06-05 12:30:08 +02:00
Sylvain	1aad974782	Ensure elasticSearch indices are started with green status on new installations	2018-04-04 14:05:48 +02:00
Sylvain	c174f22c00	fix social sharing of trainings	2018-01-09 16:53:27 +01:00
Sylvain	679ccfec99	ability to share trainings on social medias	2018-01-09 15:09:48 +01:00
Sylvain	290b2ad513	[bug] facebook sharing of event has HTML tags in description	2018-01-09 15:02:45 +01:00
Sylvain	bdf799f79e	[bug] a reminder notification were sent for canceled reservations	2018-01-09 14:44:19 +01:00
Sylvain	72634162c6	[bug] unable to create training credit	2017-12-21 11:49:51 +01:00
Nicolas Florentin	a29ba926c0	fix events/index order, frontend js code was conflicting with server-side behaviour	2017-12-18 16:15:38 +01:00
Nicolas Florentin	2f4dd4642a	adds polyfill for Object.assign, fix for IE11	2017-12-18 14:54:46 +01:00
Sylvain	77e218aa7e	fix test suite ... - update VCR cassettes - fix test fixtures to allow pass test suite at the end of the week	2017-12-14 16:40:01 +01:00
Sylvain	a5b718d981	fix tests with invoices	2017-12-14 15:52:34 +01:00
Sylvain	e091b81187	fix events pagination	2017-12-13 15:20:51 +01:00
Sylvain	0b3192c3ab	[bug] subscription refund generate PDF with wrong dates	2017-12-13 13:16:32 +01:00
Sylvain	12c6cd2a70	Merge branch 'siteswapjuggler-master' into dev ... also: align translations and mark missings	2017-11-20 11:43:40 +01:00
Sylvain	639610dc7a	[bug] unable to display profiles of users whom any reservation is associated with a deleted object	2017-11-13 11:15:33 +01:00
Sylvain	497ad71591	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2017-11-02 15:34:09 +01:00
Sylvain	73a62bd9a0	[feature] allow setting decimal prices	2017-11-02 15:33:56 +01:00
Sylvain	90fe4e313b	hide reserve button on machine details page is machine is disabled	2017-10-16 14:04:55 +02:00
Sylvain	f4fd919dde	display disabled status for machines & trainings in openAPI	2017-10-11 16:03:04 +02:00
Sylvain	cc94a19ba6	hide disabled spaces in admin pricing area	2017-10-11 15:50:18 +02:00
Sylvain	02a155e7af	prevent create availability for disabled space	2017-10-11 15:23:42 +02:00
Sylvain	1631e4ae5c	hide disabled spaces & machines in public calendar	2017-10-11 15:18:44 +02:00
Sylvain	f8f45bcb69	filter and hide disabled spaces in list	2017-10-11 15:15:30 +02:00
Sylvain	1c8d362f11	ability to disable space	2017-10-11 14:58:38 +02:00
Sylvain	02baf9097e	hide disabled machine in admin pricing zone + prevent creating negative credits	2017-10-11 14:48:03 +02:00
Sylvain	ad288628cc	hide disabled trainings in pricing admin zone	2017-10-11 13:09:52 +02:00
Sylvain	0ab01091cd	prevent create availabilities for disabled machines	2017-10-11 13:02:54 +02:00
Sylvain	45465e8b59	prevent associate disabled machines w/ training	2017-10-11 13:00:46 +02:00
Sylvain	c9c7fe00c5	filter disabled machines in list + improve responsiveness	2017-10-11 12:54:13 +02:00
Sylvain	c67360771a	ability to disable machine	2017-10-11 12:10:05 +02:00
Sylvain	5ce6d4486e	fix profile complete mail template for non imported users	2017-10-11 11:56:43 +02:00
Sylvain	41eef71ead	fix c/p issue + prevent link disabled training to user	2017-10-11 11:40:21 +02:00
Sylvain	4d7a317315	prevent create new availability with disabled training	2017-10-10 18:17:22 +02:00
Sylvain	0e38574ef8	hide disabled trainings in public calendar	2017-10-10 18:13:30 +02:00
Sylvain	4752fce762	disable required training modal for machines associated with disabled trainings	2017-10-10 18:12:07 +02:00
Sylvain	4090fe2119	filter trainings list by status	2017-10-10 17:38:01 +02:00
Sylvain	05d9e62dd2	ability to disabled training	2017-10-10 17:16:43 +02:00
Sylvain	14592c1e18	prevent user from switching to disabled group	2017-10-10 16:30:28 +02:00
Sylvain	33b146d243	hide disabled groups	2017-10-10 15:44:17 +02:00
Sylvain	189665e53b	[ongoing] prevent disable group with users + [ongoing] hide disabled groups	2017-10-05 17:54:44 +02:00
Sylvain	fb092afc8c	filter enabled/disabled groups	2017-10-05 17:12:22 +02:00
Sylvain	c5f0501df2	enable/disable group	2017-10-05 16:48:18 +02:00
Sylvain	40bf22279e	add warning on plan disabling	2017-10-05 15:44:06 +02:00
Sylvain	a9cce55855	plan disabling: hide everywhere + filter in admin filter	2017-10-05 15:32:20 +02:00
Sylvain	26d79e5b12	disable a plan	2017-10-04 18:56:39 +02:00
Sylvain	25eb24e516	Confirmation and error handling while deleting an event	2017-10-02 13:14:15 +02:00
Sylvain	bbae623cac	[bug] image deformed on small device	2017-09-26 16:32:55 +02:00
Sylvain	601ac177b6	[bug] rendering for social networks shares	2017-09-26 15:48:47 +02:00
Sylvain	dbff2d1745	events list: change buttons to anchors to allow opening in background tab	2017-09-26 09:44:55 +02:00
Sylvain	ce0887e2ec	add missing jsdoc	2017-09-25 15:58:45 +02:00
Sylvain	f874748f74	[bug] fix events monitoring pagination	2017-09-25 15:48:21 +02:00
siteswapjuggler	70cf6ebfa8	cancel and sold out badge in event list ... Public event list prompte cancelled and sold out badge for more clarity to the public users. Correction for « sold_out » test in home, show and public list. 0 subscriber with 0 free_place should be a free entry case and it appears to be sold out. Another error occurs (negative free place) if an admin change the number of free places or decide to go free entry with an event. Home and public list better display with access and price separate.	2017-09-24 21:51:58 +02:00
siteswapjuggler	cda13540f9	limit parameter removed ... as requested	2017-09-24 18:39:32 +02:00
siteswapjuggler	5fe1a53237	double slashes correction in open API event JSON ... correction of the double slash as requested	2017-09-24 18:37:08 +02:00
siteswapjuggler	22982a2356	Merge remote-tracking branch 'LaCasemate/master'	2017-09-24 18:17:58 +02:00
siteswapjuggler	3e2e5f5972	cancelled event management on front page ... Cancelled event (nb_total_places = -1) are not prompted anymore on the homepage >> no need to push them to the final user. They are still display in the event module for continuity	2017-09-24 18:17:40 +02:00
siteswapjuggler	37bdfcb96f	pull request modification ... Modification as requested for the pull request.	2017-09-24 15:12:46 +02:00
Sylvain	8d92f8492a	removed full-calendar hack, improved remove slot precess	2017-09-18 12:42:45 +02:00
Sylvain	54d686f1ac	[bug] home events overflow	2017-09-11 14:10:52 +02:00
siteswapjuggler	52071c7b83	Merge remote-tracking branch 'LaCasemate/master'	2017-09-10 12:01:59 +02:00
Sylvain	f5e2a44dcf	[bug] in public calendar, availabilities are not shown to visitors	2017-09-07 11:44:50 +02:00
Sylvain	404101ccd4	english and portuguese translations	2017-09-07 10:47:18 +02:00
Sylvain	273ec5317d	disallow locking availabilities if it has any non-cancelled reservations	2017-09-06 18:07:56 +02:00
Sylvain	57228f4eec	hide slots in members calendars if locked	2017-09-06 17:10:10 +02:00
Sylvain	9caa3ff56f	hide slots in members calendars if locked	2017-09-06 17:09:40 +02:00
Sylvain	d092a1c5ea	admin can lock and unlock availbilities	2017-09-06 15:01:41 +02:00
Sylvain	82511aa781	[feature] prevent creation of irregular yearly plans	2017-09-05 17:01:09 +02:00
Sylvain	53c1a72060	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2017-09-05 10:43:24 +02:00
Sylvain	31cdc5c695	[bug] reccursive events have difference with requested time when crossing DST (#77)	2017-09-04 16:50:07 +02:00
siteswapjuggler	e13817176f	event monitor improvement ... Many imrovement for the event monitoring admin module.	2017-09-04 00:09:08 +02:00
siteswapjuggler	73c9e301fb	open api events improvement ... new data available: start_at, end_at, event_image new controllers: id, upcoming, limit	2017-09-03 13:55:38 +02:00
Sylvain	112b174e5f	[bug] invalid time for reccurent events after Daylight Saving Time change	2017-08-31 17:32:04 +02:00
Nicolas Florentin	d602055e67	In login modal, displays an alert if Caps lock key is pressed	2017-08-31 17:11:46 +02:00
Sylvain	3d4260a3f7	[bug] unable to delete standard group	2017-08-30 14:57:06 +02:00
Sylvain	9c6143bd5e	tooltip about images insertion in medium editor	2017-08-29 17:50:57 +02:00
Sylvain	dcf55d8351	[bug] invalid notification text when sending amount coupon	2017-08-29 16:10:16 +02:00
Sylvain	cf6afb817d	[feature] configuration of max visibility for reservations	2017-08-24 18:34:18 +02:00
Sylvain	eb4f97000d	[bug] admin cannot see all space availabilities	2017-08-24 16:53:27 +02:00
Sylvain	295dc3749b	[bug] filename too long on events&prices API + updated axlsx	2017-08-16 12:05:04 +02:00
Sylvain	00d157dc3b	[bug] filename too long error on GET api/groups	2017-07-26 10:15:47 +02:00
Sylvain	3e44d62aac	[bug] filename too long error on GET api/trainings	2017-07-18 10:55:41 +02:00
Sylvain	17544225b5	[bug] invoices generation failed for subscription days offered	2017-07-12 11:38:51 +02:00
Sylvain	42d2c2ee31	[bug] hide spaces in public calendar when disabled	2017-06-13 19:31:48 +02:00
Sylvain	7ff46db808	[bug] confirmation message after admin creation	2017-06-13 19:26:32 +02:00
Peng DU	2ff47f3204	add task Id: 3713, reference: 1706002/VL, stripe id: in_1ASRQy2sOmf47Nz9Xpxtw46A, invoice total: 30.0, stripe invoice total: 80.0, date: 2017-06-08 16:16:26 +0200 ... Id: 3716, reference: 1706005/VL, stripe id: in_1ASRye2sOmf47Nz9utkjPDve, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:51:15 +0200 Id: 3717, reference: 1706006/VL, stripe id: in_1ASS1X2sOmf47Nz93Xn2UxVh, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:54:14 +0200 Id: 3718, reference: 1706007/VL, stripe id: in_1ASSBI2sOmf47Nz9Ol0gEEfC, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 17:04:19 +0200 allow find the invoices incoherent	2017-06-09 11:08:08 +02:00
Peng DU	c6fedf3f20	Merge branch 'fix_issus_77' into dev	2017-06-08 19:40:30 +02:00
Peng DU	eca141f902	fix bug #77: reservation amount total isnt equal stripe invoice amount that be paid by client	2017-06-08 19:38:19 +02:00
Sylvain	8531168ba2	improve RSS with project author and image + event dates image and category	2017-05-17 12:18:20 +02:00
Sylvain	7960964aed	set organization name in invoice object, if any (#64)	2017-05-16 10:44:52 +02:00
Sylvain	54154b1713	[feature] ability for admins to create users or organizations	2017-05-16 10:23:25 +02:00
Sylvain	b403f86187	[bug] price init for new groups & delete group	2017-05-15 15:25:27 +02:00
Sylvain	89e30980e0	[bug] unable to set locale other than fr or en	2017-04-27 18:35:00 +02:00
cyril	d1a1b63db5	Project view: added responsive support on external images	2017-04-13 14:26:29 +02:00
cyril	3fcf61de24	hide spaces in admin's credit management if spaces are disabled	2017-03-28 20:13:18 +02:00
Peng DU	1d53e3b5b7	fix json template of training reservation	2017-03-28 19:53:48 +02:00
Peng DU	2cc8096236	fix bug: cant get list of training reservation	2017-03-28 19:45:36 +02:00
Sylvain	ff8e804750	Merge branch 'week' into dev	2017-03-21 15:51:52 +01:00
Sylvain	f4187d0b4b	[bug] news plans statistics are not shown	2017-03-21 15:47:25 +01:00
Sylvain	5abc85ae0a	[feature] weekly plans	2017-03-21 13:06:02 +01:00
Sylvain	21560dd5d9	show space details on image-click	2017-03-21 12:06:58 +01:00
Sylvain	2c1b65eab9	Merge branch 'hotfix' into dev	2017-03-15 13:07:28 +01:00
Sylvain	8d5966396d	[bug] editing a plan remove the rolling attribute	2017-03-15 12:50:19 +01:00
Sylvain	38ce1b23b7	fix duplicates SLOT_DURATION declarations	2017-03-13 10:21:41 +01:00
Sylvain	796f0a87ae	ability to remove an unused custom price for an event (#61)	2017-03-02 18:36:54 +01:00
Sylvain	0f6358011f	improved space explications style	2017-03-02 17:04:47 +01:00
Sylvain	20ccc809aa	prevent polling notifications when the page is in background	2017-03-02 16:50:02 +01:00
Sylvain	853a3160d3	add notice about availabilities export	2017-03-02 13:39:49 +01:00
Sylvain	d8b8c39cb3	add day of week to availabilities export	2017-03-02 13:31:12 +01:00
Sylvain	c21f7ed5dc	export events availabilities	2017-03-02 13:05:29 +01:00
Sylvain	056060a88d	export spaces availabilities	2017-03-02 12:57:07 +01:00
Sylvain	d9b30fa2b0	export trainings availabilities	2017-03-02 12:44:59 +01:00
Sylvain	504fe49964	export machines availabilities	2017-03-02 12:34:28 +01:00
Sylvain	4d09ed37a3	export machines availabilities	2017-03-02 12:34:16 +01:00
Sylvain	f5ac9b1913	[bug] month navigation in client calendar (#59)	2017-03-01 17:23:46 +01:00
Sylvain	b9dcf5a512	[bug] delete event with custom price (#61)	2017-03-01 17:09:37 +01:00
Sylvain	2e094a501f	init spaces prices on plan creation	2017-03-01 16:45:05 +01:00
Sylvain	6df0a4090e	hide spaces in admin's price management and in plan edition if spaces are disabled	2017-03-01 15:58:40 +01:00
Sylvain	7ba50a72b7	reorganize spaces menu entries	2017-03-01 15:51:13 +01:00
Sylvain	13689fd707	set spaces disabled by default	2017-03-01 15:50:49 +01:00
Sylvain	f208caf5b0	fix change space reservation when many users on the slot does not change the good user	2017-03-01 14:47:59 +01:00
Sylvain	3c6bcccd0d	reset reservation modification on user change	2017-03-01 14:38:29 +01:00
Sylvain	30c6954464	prevent modify reservation to a complete slot	2017-03-01 14:35:07 +01:00