727 Commits

Author	SHA1	Message	Date
Sylvain	7dd5979d64	texts for projects elements and statistics tours	2020-02-24 17:17:51 +01:00
Sylvain	e6f2e60997	spaces tour	2020-02-24 16:57:41 +01:00
Sylvain	76c1b69b7a	machines tour	2020-02-24 16:51:03 +01:00
Sylvain	c13ba85230	events tour	2020-02-24 16:21:12 +01:00
Sylvain	7b955f616e	fix i18n syntax + missing transaltion	2020-02-24 15:25:15 +01:00
Sylvain	f8f1dde14a	pricing tour	2020-02-24 15:02:45 +01:00
Sylvain	807a9596a8	invoices tour	2020-02-24 11:55:13 +01:00
Sylvain	9f68375ae9	admin calendar tour	2020-02-24 10:33:27 +01:00
Sylvain	496e926abd	fix members tour if no member	2020-02-19 14:39:45 +01:00
Sylvain	bc63465a84	members tour	2020-02-19 14:30:56 +01:00
Sylvain	906decb620	[ongoing] members tour	2020-02-19 13:00:38 +01:00
Sylvain	05a29a54b3	trainings tour	2020-02-19 10:22:32 +01:00
Sylvain	5b46edd748	welcome tour + save completed tours in database	2020-02-18 17:36:45 +01:00
Sylvain	fd471be40a	angular-ui-tour: fixed positionning problem + some more steps in the tour + centering the welcome message	2020-02-12 17:18:11 +01:00
Du Peng	b559d10b87	improve slot is only subscription	2020-02-12 12:58:17 +01:00
Sylvain	d56422de5b	typo	2020-02-11 18:04:31 +01:00
Sylvain	e1902b42ac	remove confusing quotes in translations yml	2020-02-11 15:49:43 +01:00
Sylvain	71290420bb	ui-tour 3 steps	2020-02-11 15:49:43 +01:00
Sylvain	b7dda83060	Merge branch 'edit_event_recurrent' into dev	2020-02-11 15:43:29 +01:00
Sylvain	db26533d94	alert on date change	2020-02-11 15:42:43 +01:00
Sylvain	372d7f936b	typos & syntax	2020-02-11 11:46:40 +01:00
Sylvain	392ddc6aa5	wording	2020-02-11 11:01:24 +01:00
Du Peng	74cc69d1bd	Ability to configure reservation slot restrict for plans	2020-02-07 17:37:00 +01:00
Du Peng	7c86adde4b	Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time	2020-02-05 16:53:47 +01:00
Sylvain	b1a98d3574	improved texts	2020-01-29 17:44:17 +01:00
Du Peng	35d9bec8a5	update event recurrent	2020-01-29 17:20:19 +01:00
Sylvain	72f3d8fd1e	updated crowdin in-context keys	2020-01-28 10:59:19 +01:00
Sylvain	3364dcf4d0	Merge branch 'dev' of github.com:sleede/fab-manager into dev	2020-01-28 10:40:24 +01:00
Sylvain	81a42e5935	customize home page : full texts	2020-01-28 10:12:29 +01:00
Du Peng	b1419271e6	edit event recurrent in progress	2020-01-27 18:21:46 +01:00
Sylvain	656a603d6c	customize home page css	2020-01-27 17:10:29 +01:00
Sylvain	b85c7ac00b	admin set its customized html template for the home page & can reset it to factory value	2020-01-22 11:53:40 +01:00
Sylvain	15ab3c1305	Ability to customize the title of the link to the about page	2020-01-21 16:16:12 +01:00
Sylvain	45e4b5c4bc	Create machine availabilities: select all/none in a click	2020-01-21 12:09:24 +01:00
Sylvain	97660924cb	fix typo and wording	2020-01-21 11:16:49 +01:00
Du Peng	3c26c6d4bd	disable add plan with reserve slot in the past	2020-01-20 16:17:10 +01:00
Sylvain	7929d3b198	detailled view of collected data in fabanalytics	2020-01-15 12:48:55 +01:00
Sylvain	059096c2dd	privacy option for fab-analytics	2020-01-15 10:46:04 +01:00
Sylvain	c450312276	fix yml syntax issue	2020-01-14 17:36:09 +01:00
Sylvain	1f3d9cf88d	display upgrade infos directly on the interface	2020-01-14 17:12:36 +01:00
Sylvain	54be21729b	batch delete periodic events	2020-01-07 17:18:49 +01:00
Sylvain	1c4f144b8d	Merge branch 'members-filters' into dev	2020-01-07 10:44:55 +01:00
Sylvain	f778ee9016	fix syntax + add missing translations	2020-01-07 10:44:29 +01:00
Sylvain	3c3e806a29	Merge branch 'user-confirmation' into dev	2020-01-07 10:34:25 +01:00
Sylvain	3eec4f25bb	New translations en.yml (Spanish)	2020-01-03 11:38:14 +01:00
Sylvain	034b5d5707	New translations en.yml (Spanish)	2020-01-03 11:19:14 +01:00
Sylvain	e550fd6dbc	New translations en.yml (Spanish)	2020-01-03 11:11:53 +01:00
Sylvain	801f73d375	New translations en.yml (Spanish)	2020-01-03 10:57:56 +01:00
Sylvain	1bc25940b5	New translations en.yml (Spanish)	2019-12-31 11:02:37 +01:00
Sylvain	7c8fdf6ffd	New translations en.yml (Spanish)	2019-12-31 09:44:00 +01:00
Sylvain	3448acc764	New translations en.yml (Spanish)	2019-12-31 09:27:06 +01:00
Sylvain	cb66584d3b	New translations en.yml (Spanish)	2019-12-31 09:07:31 +01:00
Sylvain	8ea5762f02	New translations en.yml (Spanish)	2019-12-31 09:00:17 +01:00
Sylvain	ca8f948bd1	New translations en.yml (Spanish)	2019-12-31 08:14:05 +01:00
Sylvain	1324fbc025	New translations rails.en.yml (Spanish)	2019-12-30 16:18:12 +01:00
Sylvain	392c125d44	New translations rails.en.yml (Spanish)	2019-12-30 16:08:19 +01:00
Sylvain	8917085025	New translations rails.en.yml (Spanish)	2019-12-30 16:02:48 +01:00
Sylvain	aaa63e3e41	New translations app.public.en.yml (Spanish)	2019-12-30 15:48:55 +01:00
Sylvain	bfb5174efa	New translations app.admin.en.yml (Spanish)	2019-12-30 15:48:53 +01:00
Sylvain	a766a60535	New translations app.shared.en.yml (Spanish)	2019-12-30 15:37:12 +01:00
Sylvain	3b7c973409	New translations app.admin.en.yml (Spanish)	2019-12-30 15:37:10 +01:00
Sylvain	f161c1ff24	New translations app.public.en.yml (Spanish)	2019-12-30 15:18:21 +01:00
Sylvain	c6575de1e5	New translations app.admin.en.yml (Spanish)	2019-12-30 15:18:19 +01:00
Sylvain	1af9d1a7f2	New translations app.public.en.yml (Spanish)	2019-12-30 14:58:03 +01:00
Sylvain	4be8dd6892	New translations app.public.en.yml (Spanish)	2019-12-30 14:46:58 +01:00
Nicolas Florentin	60e063a15b	fix currentUser value after successfull sign up when confirmation is needed, plus improves translations	2019-12-30 13:45:25 +01:00
Nicolas Florentin	0b899fe183	Merge branch 'dev' into user-confirmation	2019-12-30 09:36:43 +01:00
Sylvain	8a7b10e746	updated crowdin pseudo-language for in-context translation	2019-12-24 12:10:06 +01:00
Sylvain	d4f7ff3603	fixes comments syntax for crowdin compat	2019-12-24 11:47:31 +01:00
Sylvain	1b5014e7a6	fix datetime parsing formats for ach locale	2019-12-23 16:02:33 +01:00
Sylvain	b65c76beb3	fix datetime parsing formats for ach locale	2019-12-23 15:18:18 +01:00
Nicolas Florentin	62c979cfc0	members filters, translations for other languages are still needed	2019-12-20 15:47:42 +01:00
Sylvain	bcd0e6833d	integrate crowdin in-context translation code	2019-12-18 16:50:16 +01:00
Nicolas Florentin	0a3a6d034a	env variable USER_CONFIRMATION_NEEDED_TO_SIGN_IN can force user to confirm his account to sign in	2019-12-18 16:02:47 +01:00
Sylvain	c67de56405	remove missing translation tags - useless with a TMS	2019-12-18 15:23:52 +01:00
Sylvain	3a458871eb	harmonize front translations in portuguese with new model	2019-12-18 15:21:44 +01:00
Sylvain	997e60edb4	harmonize front translations in spanish with new model	2019-12-18 15:02:10 +01:00
Sylvain	ff8319b166	harmonize front translations in english with new model	2019-12-18 14:35:29 +01:00
Sylvain	c5604bbdf8	harmonize admin.en	2019-12-18 13:26:37 +01:00
Sylvain	14c3abb449	refactoring i18n keys: trainings + modals + various missings	2019-12-18 13:04:38 +01:00
Sylvain	1124159f2e	refactoring i18n keys: projects	2019-12-18 11:08:14 +01:00
Sylvain	a7b423b151	refactoring i18n keys - admin	2019-12-17 18:06:56 +01:00
Sylvain	88c48e4e69	[ongoing] refactoring i18n keys - admin	2019-12-17 12:40:36 +01:00
Sylvain	d21f616283	[ongoing] refactoring i18n keys	2019-12-16 16:54:40 +01:00
Sylvain	c565d9ff2b	unified front-end i18n interpolations syntax to messageformat	2019-12-16 10:16:11 +01:00
Sylvain	0c11f61010	Prevent event reservation in the past	2019-12-10 12:16:26 +01:00
Sylvain	6aa3c0caeb	Notify all admins on the creation of a refund invoice	2019-12-09 11:55:31 +01:00
Sylvain	510c802ab1	messages variations depending on slot duration	2019-12-09 10:27:50 +01:00
Sylvain	538b5cef78	add/remove ical imports in public agenda ... also: a little of refacftoring in CalendarController	2019-12-03 11:27:20 +01:00
Sylvain	32e7fc3900	confirm delete icalendar imports + fix display + add translations	2019-12-03 10:48:53 +01:00
Sylvain	22be9f6a08	display external calendars list in public calendar + pull availabilities	2019-12-02 16:49:20 +01:00
Sylvain	55d2c88134	delete & sync ical sources	2019-12-02 12:19:30 +01:00
Sylvain	36eba99808	[bug] report errors on admin creation	2019-12-02 10:39:42 +01:00
Sylvain	97d93cd622	added a name to imported calendar	2019-11-27 17:39:19 +01:00
Sylvain	9e2134c9cf	ics sources configuration interface	2019-11-27 16:17:42 +01:00
Sylvain	91008b3df1	improved calendar legend	2019-11-27 11:52:37 +01:00
Sylvain	68b17cbe9a	Ability to show the scheduled events in the admin calendar	2019-11-25 14:49:39 +01:00
Sylvain	5d358efb9f	correct conjugation for event canceled	2019-11-25 10:50:32 +01:00
Sylvain	ce366beaa2	display that an event reservation was canceled ... also: fixed transtions files	2019-11-21 11:15:05 +01:00
Sylvain	b725a5a071	Merge branch 'cancel' into dev	2019-11-20 10:27:56 +01:00
Sylvain	9ec736e6b5	delete recursive slots	2019-11-18 17:29:51 +01:00
Sylvain	a60a39ff9e	[ongoing] create multiple availabilities according to UI	2019-11-13 12:13:22 +01:00
Sylvain	0d740c95a9	recapitulative screen	2019-11-13 10:59:10 +01:00
Sylvain	22251e6516	summary screen ... TODO: eventModal.html.erb:167	2019-11-12 16:28:10 +01:00
Sylvain	2cccbd3486	recurrence UI	2019-11-12 14:25:28 +01:00
Sylvain	1ed3eba129	[feature] export last connection date to members.xlsx	2019-10-29 11:09:17 +01:00
Sylvain	f94d8feba6	[feature] admin can delete an user	2019-10-29 09:59:21 +01:00
Sylvain	35fb991cdb	Improved user experience in defining slots in the calendar management	2019-10-23 17:48:31 +02:00
Sylvain	d7aed3fa1f	Improved notification email to the member when a rolling subscription is taken	2019-10-23 11:43:42 +02:00
Sylvain	e8930924e4	[bug] do not display each days in invoices for multiple days event reservation	2019-10-16 16:11:37 +02:00
Sylvain	2897eec723	various bugfixes ... - in profile_complete form, the user's group is not selected by default - missing asterisks on some required fields in profile_complete form - renamed default DatabaseProvider from Fablab to FabManager	2019-10-09 14:41:32 +02:00
Sylvain	7dbfbc4868	fix typo	2019-10-07 17:12:49 +02:00
Sylvain	927479733b	migrated links to /users/auth from GET to POST ... see https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284 for more info	2019-10-02 14:37:47 +02:00
Sylvain	0d3cc0fe40	[feature] Ability to disable invoices generation and interfaces	2019-09-30 15:29:20 +02:00
Sylvain	8bd1d72fdf	improved results page	2019-09-30 12:49:50 +02:00
Sylvain	ff5de97c92	import new users from CSV and view results in app ... TODO: - update users though CSV	2019-09-26 17:05:57 +02:00
Sylvain	4deaf1f75a	[ongoing] import members from csv	2019-09-25 16:37:42 +02:00
Sylvain	ad1b7baa05	import members interface	2019-09-24 15:21:18 +02:00
Sylvain	e7bb41f38d	[ongoing] import users from csv file: admin inteface	2019-09-24 12:21:19 +02:00
Sylvain	7d26932f6c	configure accounting codes & labels for wallet clients and other means clients	2019-09-19 11:51:14 +02:00
Sylvain	c76563f22f	wallet label in accounting export	2019-09-19 11:25:12 +02:00
Sylvain	276a99c068	improved VAT history service + display dates when VAT was enabled in invoice configuration panel + do not render vat row in accouting export if vat was disabled	2019-09-18 13:28:53 +02:00
Sylvain	aef4cc49f2	fixes accounting codes setting + improved error handling	2019-09-17 13:00:25 +02:00
Sylvain	3348539fdf	export labels: user name + reference + summary, only on client line. Also: handling new export parameters (decimal separator, label length, export zeros)	2019-09-17 12:35:34 +02:00
Sylvain	f06bdaaf21	provide additional settings to export api	2019-09-16 16:31:16 +02:00
Sylvain	02d28e0b8c	improved accounting codes settings page (1 click saves all) + improved export file name	2019-09-16 14:39:47 +02:00
Sylvain	224b0d6dee	Merge branch 'sca' into dev	2019-09-12 12:53:56 +02:00
Sylvain	52afb6ef07	[bug] extend a current subscription for a member, does not reset his credits	2019-09-12 11:37:03 +02:00
Sylvain	539eb08b89	ability to disable the online payments through an env var	2019-09-11 17:08:00 +02:00
Sylvain	04f17d44d8	handle sca in js frontend	2019-09-10 12:46:02 +02:00
Sylvain	e9e27663cd	quick coding rules checking with rubocop	2019-09-09 18:04:31 +02:00
Sylvain	967f539ad9	[ongoing] update to stripe-js:v3 to use strong customer authentication	2019-09-04 17:20:18 +02:00
Sylvain	acacd9a19e	fixed accounting codes interface + fixed csv generation	2019-08-01 10:24:34 +02:00
Sylvain	26c98394ac	fixed export service	2019-08-01 09:49:09 +02:00
Sylvain	fa6a54a422	export notifications	2019-07-31 12:37:31 +02:00
Sylvain	a7f68b59dd	connect the export modal to the api	2019-07-31 12:00:52 +02:00
Sylvain	a9ea4057f3	interface to customize accounting codes and labels	2019-07-30 16:06:35 +02:00
Sylvain	ab295f064d	service to export invoices into a given period to CSV lines for an accounting sofware	2019-07-29 17:51:53 +02:00
Sylvain	f69703f0a0	allow user to change his choice about cookies	2019-06-13 12:52:56 +02:00
Sylvain	249e59bb2a	get user consent about cookies	2019-06-13 11:28:55 +02:00
Sylvain	7fc03af6bc	[ongoing] cookies consent modal	2019-06-12 16:53:37 +02:00
Sylvain	d0cd5a90d2	handle deleted users in notifications	2019-06-12 15:49:35 +02:00
Sylvain	ddce997e12	display data collection purpose on each input field + fix notifications on deleted user	2019-06-12 15:34:03 +02:00
Sylvain	0e18defe53	handle deleted user in statistics	2019-06-12 12:40:43 +02:00
Sylvain	a53c6e80e7	move invoice->operator to invoicing_profile + minor fixes to handle user deletion	2019-06-12 12:22:38 +02:00
Sylvain	86ded2b8d2	[ongoing] fixes for invoices pdf files	2019-06-11 16:56:11 +02:00
Sylvain	cfd33c3a52	migrate projects to statistic_profile	2019-06-06 16:34:53 +02:00
Sylvain	52992ac9d5	move gender & birthday to statistic_profile	2019-06-04 13:33:00 +02:00
Sylvain	b423d9fce7	add link to interface in abuse report mail	2019-05-21 12:38:07 +02:00
Sylvain	9c2598d405	ability to delete processed reports	2019-05-21 12:24:45 +02:00
Sylvain	7bbea22e76	display reports in interface	2019-05-21 11:49:50 +02:00
Sylvain	630809b91f	moved abuses panel to admin zone + fix loading template	2019-05-21 11:16:12 +02:00
Sylvain	dd4b6e2cb1	[ongoing] abuses management interface	2019-05-09 18:27:19 +02:00
Sylvain	10a87eb4cb	refactored project list translations	2019-05-09 16:09:20 +02:00
Sylvain	21c7484396	notify admin about notifications sent	2019-04-25 12:04:16 +02:00
Sylvain	162a56250a	notify users after privacy policy update + hide undefined content	2019-04-25 11:40:26 +02:00
Sylvain	c0c9b2a980	privacy policy: fixed admin view after update + display last update date	2019-04-23 12:58:01 +02:00
Sylvain	d0f0a293f3	save as draft or publish	2019-04-18 16:55:50 +02:00
Sylvain	7a2fc7c42e	[ongoing] save as draft or publish	2019-04-18 15:57:56 +02:00
Sylvain	8fae8b104d	admin interface to customize privacy policy page	2019-04-18 12:30:00 +02:00
Sylvain	5bdaebb2f2	privacy policy public page	2019-04-18 12:00:57 +02:00
Sylvain	43ff06c35d	fixed and improved translations	2019-04-18 11:35:09 +02:00
Sylvain	44479b5597	allow filtering coupons list	2019-04-04 18:00:19 +02:00
Sylvain	9f8d24ec4f	paginate list of coupons	2019-04-04 17:28:29 +02:00
Sylvain	c786ba6edb	notify user about archiving	2019-04-04 11:37:23 +02:00
Sylvain	8a6ff0c093	prevent closing a period not in the past	2019-04-03 17:27:25 +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	ea2a73cdc1	add asterisks on required fields	2019-03-26 17:20:10 +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	7b0824a4a3	notify admins when no accounting period closed for 1 year	2019-03-18 14:33:30 +01:00
Sylvain	857b1cebba	fix accounting period checksum + improved period validation	2019-03-12 15:26:17 +01:00
Sylvain	b940ae0327	display complete info set on accounting archives	2019-03-11 16:11:49 +01:00
Sylvain	9854a4b965	prevent memory saturation with periodic checks	2019-02-26 15:18:19 +01:00
Sylvain	cf23fae73c	Merge branch 'dev' into host	2019-02-14 16:35:38 +01:00
Sylvain	0d0c378b33	missing translations in new authentication provider form	2019-02-14 10:00:19 +01:00
Sylvain	ffe5516d10	prevent closing an accounting period if any checksum error in period	2019-02-12 17:38:44 +01:00
Sylvain	da672ea8b6	Merge branch 'dev' into host	2019-01-21 16:34:06 +01:00
Sylvain	d2c4773ac9	[bug] unable to delete an admin who has changed a setting	2019-01-16 17:09:27 +01:00
Sylvain	b9e7276394	fix missing translation	2019-01-16 12:08:27 +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	a1ba272538	Merge branch 'dev' into host	2019-01-14 13:00:24 +01:00
Sylvain	a2eb10331e	[ongoing] remove invoicing disabled per user	2019-01-10 16:50:54 +01:00
Sylvain	35638d611b	validates invoice&avoir creation to prevent any creation in closed period	2019-01-09 16:54:09 +01:00
Sylvain	5bee554fa5	Merge branch 'dev' into us78	2019-01-09 10:55:22 +01:00
Sylvain	3536ae95b1	[bug] invalid rails DSB locale	2019-01-08 17:34:12 +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	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	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	6637832d00	refactored frontend invoices translations	2019-01-03 17:39:50 +01:00
Sylvain	9fe828f51c	improved translations	2019-01-02 17:11:18 +01: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	1b33f3c865	display the machine reservation user name to other members	2018-07-24 12:24:51 +02:00
Juan Pedro Torres	3a1dd822f5	Solved sign_up/sign_in error ... Changed traduction on Sign_up and Sign_in.	2018-01-24 14:31:39 +01:00
jmrodriguesgoncalves	40f6796743	Missing translation fixed	2017-12-12 10:14:21 -05:00
jmrodriguesgoncalves	7e640b9508	Removed #translation_fixed comments	2017-12-12 09:57:13 -05:00
jmrodriguesgoncalves	0a1b64f1de	Added missing translation bits	2017-12-11 18:56:38 -05:00
Sylvain	12c6cd2a70	Merge branch 'siteswapjuggler-master' into dev ... also: align translations and mark missings	2017-11-20 11:43:40 +01:00
Sylvain	5438fa4b16	added newlines at end of files	2017-11-20 09:58:37 +01:00
Sylvain	aa2f45ee6e	Merge branch 'clemclemmm-master' into dev	2017-11-20 09:52:36 +01:00
Sylvain	a8803cb7bc	Merge branch 'master' of https://github.com/clemclemmm/fab-manager into clemclemmm-master	2017-11-20 09:52:17 +01:00
Sylvain	e043e76f47	add newline at end of file	2017-11-20 09:48:35 +01:00
Sylvain	06cf85d733	fix rails.fa-CM.yml syntax	2017-11-20 09:39:05 +01:00
Sylvain	8500bff648	Merge branch 'dev' of https://github.com/alexcvcoelho/fab-manager into alexcvcoelho-dev	2017-11-20 09:34:11 +01:00
Sylvain	c4e93eeb27	Merge branch 'master' of https://github.com/bmohamet/fab-manager into bmohamet-master	2017-11-20 09:29:33 +01:00
bmohamet	5809f9d6db	Create rails.fr-CM.yml ... Adding FCA currency for Cameroon and Central Africa	2017-11-17 12:10:28 +01:00
Alex Coelho	1316550f40	Update Portuguese translations	2017-11-16 01:08:34 -02:00
Alex Coelho	5241801a3b	Merge branch 'dev' of github.com:alexcvcoelho/fab-manager	2017-11-15 23:36:43 -02:00
Clément CHADEYRON	4a3995604c	add spanish translation ... translation made spain by : Smart Open Lab	2017-11-06 14:15:22 +01: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	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	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	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
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	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	03b5b8bfae	fix typo in FR	2017-09-18 11:00:42 +02:00
siteswapjuggler	52071c7b83	Merge remote-tracking branch 'LaCasemate/master'	2017-09-10 12:01:59 +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	d092a1c5ea	admin can lock and unlock availbilities	2017-09-06 15:01:41 +02:00
siteswapjuggler	e13817176f	event monitor improvement ... Many imrovement for the event monitoring admin module.	2017-09-04 00:09:08 +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	2ccc9e9dbd	[bug] missing translation for EN and PT	2017-08-24 12:46:58 +02:00
Sylvain	6cbdbc932c	fix interpolation variable in portuguese	2017-06-07 17:20:57 +02:00
Sylvain	3ca6b9c9c1	fix about title concordance in portuguese	2017-06-07 16:51:11 +02:00
Sylvain	b4332c9bc7	fix html closing tags in portuguese translations	2017-06-07 16:46:42 +02:00
Sylvain	3bf91efe8f	fixed messageformat syntax in Portuguese	2017-06-07 16:26:39 +02:00
Sylvain	3a6af68b67	Merge branch 'dev' into alexcvcoelho-master	2017-06-07 16:03:31 +02:00
Alex Coelho	1ef80f8bd8	Prtuguese translations in app.*.pt.yml files	2017-06-01 14:33:16 -03:00
Sylvain	54154b1713	[feature] ability for admins to create users or organizations	2017-05-16 10:23:25 +02:00
Alex Coelho	f3634e6891	Translate pt-BR	2017-05-11 14:15:23 -03:00
Alex Coelho	0ac53733c9	Translate pt-BR for version 2.5.4	2017-05-11 11:31:12 -03:00
Alex Coelho	e8cacb36a1	Update branch	2017-05-11 11:00:37 -03:00
Sylvain	ca012322fb	fixed rails locales files	2017-04-27 17:08:17 +02:00
Sylvain	1f7bf2a591	Rails l10n support for 115 new locations	2017-04-27 14:22:07 +02:00
Sylvain	5abc85ae0a	[feature] weekly plans	2017-03-21 13:06:02 +01:00
Sylvain	8e206cd3c5	[bug] subscription name is not shown in invoices	2017-03-15 16:31:51 +01:00
Sylvain	796f0a87ae	ability to remove an unused custom price for an event (#61)	2017-03-02 18:36:54 +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	1503e9b83f	fix typo	2017-03-01 14:20:50 +01:00
Sylvain	cf9181770b	export space statistics	2017-03-01 12:56:11 +01:00
Sylvain	b48451f9f8	improved space reservation optional explication message	2017-03-01 11:47:20 +01:00
Sylvain	a0e7e7951f	[ongoing] display spaces in public calendar	2017-02-28 11:59:48 +01:00
Sylvain	b48557fd96	invoice generation for space reservation	2017-02-27 17:42:36 +01:00
Sylvain	8e86c4b212	[ongoing] spaces reservation calendar	2017-02-23 17:45:55 +01:00
Sylvain	32a2a220bf	clean trainings reservation locales	2017-02-23 12:52:54 +01:00
Sylvain	71a3c8b41f	pluralize selection helper in cart	2017-02-22 16:53:58 +01:00
Sylvain	c2c400107d	improved tag management in cart	2017-02-22 11:23:32 +01:00
Sylvain	ce087ae778	refacto wording to make cart reservableType agnostic	2017-02-22 10:51:07 +01:00
Sylvain	7a21a907a8	offer slot from cart + [ongoing] refacto cart translations	2017-02-22 09:44:15 +01:00
Sylvain	a463ad6a2a	[ongoing] refacto cart translations	2017-02-21 17:45:53 +01:00
Sylvain	d463d4dd5a	display spaces in admin calendar	2017-02-15 13:18:03 +01:00
Sylvain	1855935322	interface to create space availabilities	2017-02-15 11:32:29 +01:00
Sylvain	30454c4262	manage space info message + refactor settings translations mapping	2017-02-15 09:48:27 +01:00
Sylvain	36a0eafef3	interface to set credits for spaces	2017-02-14 17:29:52 +01:00
Sylvain	ec4a06a0e4	interface to configure space price per plan + refactored plans interface code	2017-02-14 17:06:42 +01:00
Sylvain	42819b18cb	refactor plan form translations mapping	2017-02-14 16:19:10 +01:00
Sylvain	1554cfe65d	refactor plan translations mapping	2017-02-14 16:09:07 +01:00
Sylvain	93bceb5517	define spaces prices for non-subscribers	2017-02-14 15:25:28 +01:00
Sylvain	334201e551	refactor admin pricing translations mapping	2017-02-14 14:58:16 +01:00
Sylvain	0adb9e29c6	space edition interface	2017-02-14 13:36:10 +01:00
Sylvain	73a5689140	inteface to display spaces	2017-02-14 12:41:51 +01:00
Sylvain	da95e6e0d8	space creation interface	2017-02-14 11:28:07 +01:00
Sylvain	9d367f95db	[ongoing] new space interface	2017-02-13 17:18:06 +01:00
Sylvain	40952600e7	basic interface structure for space management	2017-02-13 17:00:27 +01:00
Sylvain	560bb46383	space db model	2017-02-13 14:38:28 +01:00
Alex Coelho	09af61ab3f	Translate to portuguese-br rails	2017-02-03 15:28:14 -02:00
Alex Coelho	592d7be448	Translate to portuguese-br mails	2017-02-03 15:27:01 -02:00
Alex Coelho	9911566d51	Translate to portuguese-br pt-BR	2017-02-03 15:25:57 -02:00
Alex Coelho	8f40eee51a	Translate to portuguese-br devise	2017-02-03 15:25:25 -02:00
Alex Coelho	d613ab7fb2	Translate to portuguese-br app.shared	2017-02-03 15:24:04 -02:00
Alex Coelho	6b2b15b4c3	Translate to portuguese-br app.public	2017-02-03 15:23:03 -02:00
Alex Coelho	91d5b23dad	Translate to portuguese-br app.logged	2017-02-03 15:22:11 -02:00