rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity
6,340 Commits 15 Branches 273 Tags 82 MiB
428867bb6d
Commit Graph

1300 Commits

Author SHA1 Message Date
Sylvain
1cf2dc6f09 Merge branch 'dev' for release 2.5.13 2017-09-11 16:39:53 +02:00
Sylvain
b4ad300a2c Version 2.5.13 2017-09-11 16:39:00 +02:00
Sylvain
30acf4de19 updated changelog 2017-09-11 16:37:21 +02:00
Sylvain
98c8e3a906 Merge branch 'dev' for release 2.5.12 2017-09-11 14:17:42 +02:00
Sylvain
c7b88c29b2 Version 2.5.12 2017-09-11 14:17:26 +02:00
Sylvain
54d686f1ac [bug] home events overflow 2017-09-11 14:10:52 +02:00
Sylvain
b594486d0b updated deploy instructions for 2.5.11 2017-09-11 12:29:22 +02:00
Sylvain
8ac716af55 [bug]ActiveRecord::RecordNotFound during fix:recursive_events_over_DST 2017-09-11 10:39:40 +02:00
Sylvain
75cb28e401 Version 2.5.11 2017-09-07 15:02:10 +02:00
Sylvain
f5e2a44dcf [bug] in public calendar, availabilities are not shown to visitors 2017-09-07 11:44:50 +02:00
Sylvain
a822481d39 updated changelog 2017-09-07 10:54:42 +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
c43d0d816f updated changelog 2017-09-05 10:42:14 +02:00
Sylvain
1af07f5e54 [ongoing] rake task to fix existing recursive events 2017-09-04 17:27:18 +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
9f235d5c3b ArchLinux compatibility 2017-08-24 16:08:42 +02:00
Sylvain
b279b14318 updated changelog & version 2017-08-24 12:48:03 +02:00
Sylvain
fe58409326 Version 2.5.10 2017-08-16 12:07:08 +02:00
Sylvain
295dc3749b [bug] filename too long on events&prices API + updated axlsx 2017-08-16 12:05:04 +02:00
Sylvain
36dfbe9159 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2017-07-26 10:16:45 +02:00
Sylvain
00d157dc3b [bug] filename too long error on GET api/groups 2017-07-26 10:15:47 +02:00
Nicolas Florentin
2b4864af74 updates CHANGELOG.md, adding the docker/README.md update 2017-07-21 14:22:28 +02:00
Sylvain
3e44d62aac [bug] filename too long error on GET api/trainings 2017-07-18 10:55:41 +02:00
Nicolas Florentin
1ac8092ba4 Version 2.5.9 2017-07-13 10:11:19 +02:00
Sylvain
65a56ac2f4 updated version 2017-07-12 15:56:12 +02:00
Sylvain
2a588937ee Version 2.5.8 2017-07-12 11:47:24 +02:00
Sylvain
17544225b5 [bug] invoices generation failed for subscription days offered 2017-07-12 11:38:51 +02:00
Sylvain
0d82186a78 [bug] db:seed throw an error about admin creation 2017-06-14 17:28:36 +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
cyril
6d05765880 Version 2.5.7 2017-06-08 20:19:32 +02:00
Sylvain
5fbe22ef63 updated dev version 2017-06-07 16:39:24 +02:00
Sylvain
9297376ad3 Version 2.5.6 2017-05-18 10:37:41 +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
e17c715249 Version 2.5.5 2017-05-15 16:46:58 +02:00
Sylvain
b403f86187 [bug] price init for new groups & delete group 2017-05-15 15:25:27 +02:00
Sylvain
5fcc36e959 next release 2017-05-09 09:30:16 +02:00
Sylvain
565aafb455 Version 2.5.4 2017-05-04 12:59:04 +02:00
Sylvain
89e30980e0 [bug] unable to set locale other than fr or en 2017-04-27 18:35:00 +02:00
Sylvain
5981aa342d Version 2.5.3 2017-04-27 14:23:06 +02:00
Sylvain
1f7bf2a591 Rails l10n support for 115 new locations 2017-04-27 14:22:07 +02:00
cyril
d63969daea update changelog 2017-04-13 14:27:11 +02:00
cyril
2971fd25b8 release 2.5.2 2017-04-12 20:31:52 +02:00
cyril
a4721b9656 update changelog 2017-04-03 17:08:47 +02:00
cyril
4245bda9fd Version 2.5.1 2017-03-28 20:26:32 +02:00
Sylvain
966ada599d Version 2.5.0 2017-03-28 13:44:02 +02:00
Sylvain
c65525de60 updated changelog 2017-03-21 15:55:41 +01:00
Sylvain
1c483944b9 updated changelog 2017-03-21 15:48:13 +01:00
Sylvain
f4187d0b4b [bug] news plans statistics are not shown 2017-03-21 15:47:25 +01:00
Sylvain
8e206cd3c5 [bug] subscription name is not shown in invoices 2017-03-15 16:31:51 +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
796f0a87ae ability to remove an unused custom price for an event (#61) 2017-03-02 18:36:54 +01:00
Sylvain
462dbcf75b updated changelog 2017-03-02 16:52:20 +01:00
Sylvain
daefe626db replace letter_opener by MailCatcher 2017-03-02 10:29:17 +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
6e10377624 updated change log 2017-03-01 15:52:42 +01:00
Sylvain
2419a96010 spaces stats index in elastic 2017-02-28 17:49:19 +01:00
Sylvain
26bf520c4d fix typo 2017-02-22 18:09:41 +01:00
Sylvain
49951034f2 updated changelog 2017-02-22 17:55:31 +01:00
Sylvain
23b9851218 allow enable/disable spaces -> disabled by default 2017-02-15 15:41:25 +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
5783f82418 fixed deploy procedure for 2.4.10 2017-01-09 15:13:28 +01:00
Sylvain
ea1dfacaf0 Version 2.4.10 2017-01-09 10:57:46 +01:00
Sylvain
4f3c5e963c [bug] change plan price lost stats 2017-01-09 10:54:30 +01:00
Sylvain
8b8d161edd updated dev version 2017-01-05 18:21:09 +01:00
Sylvain
ab53b621d1 [bug] navigation to about page duplicates admin's links in left menu 2017-01-05 18:03:54 +01:00
Sylvain
fedfc866a9 [bug] ReservationReminderWorker crash with undefined method find_by 2017-01-05 15:15:31 +01:00
Sylvain
c479502dd0 [bug] too many unread notifications cause system memory overflow 2017-01-05 15:06:54 +01:00
Sylvain
7f98cdb76d Version 2.4.9 2017-01-04 15:30:21 +01:00
Sylvain
b5246ae1cf [bug] AvailabilityIndexerWorker crash availabilities deleted just after their creation 2017-01-04 15:20:54 +01:00
Sylvain
e656b7d784 [bug] regenerate statistics does not remove all previous values 2017-01-04 14:46:43 +01:00
Sylvain
8119f54e4c Statistics about hours available for machine reservations and tickets available for training reservations, now handle custom filtering on date and type 2017-01-03 17:07:23 +01:00
Sylvain
9edf723373 [bug] wrong statistics about hours available for reservation 2017-01-03 13:35:36 +01:00
Sylvain
5b7e8474d4 asterisk on group select in member form 2017-01-03 12:07:16 +01:00
Sylvain
906bb5b26e add upgrade instructions 2017-01-03 11:27:58 +01:00
Sylvain
d5c5e36965 [bug] compute age of users born on 29/02, lead to app crash on non-leap years 2017-01-03 11:24:14 +01:00
Sylvain
1f0da1194b [bug] fix VAT amount in invoice config 2017-01-02 11:08:40 +01:00
Sylvain
9bfaaaccd9 improved numerous notifications display 2016-12-19 17:08:11 +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
34e04845bb Version 2.4.7 2016-12-14 10:41:17 +01:00
Sylvain
ecbe8a58a2 coupon edition: display internationalized errors 2016-12-13 12:46:00 +01:00
Sylvain
4817da75d6 [bug] unable to create or edit percentage coupons 2016-12-13 10:08:19 +01:00
Sylvain
ed2d3b4ff0 updated changelog & version 2016-12-12 11:22:37 +01:00
Sylvain
3fad06c886 Version 2.4.6 2016-11-30 17:28:51 +01:00
Sylvain
16ed469c72 add deploy instructions for 2.4.5 2016-11-29 17:56:56 +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
b75cbc17d7 fix training reservation calendar witch shows all trainings slots 2016-11-29 15:48:39 +01:00
Sylvain
fd93f3cefd updated changelog 2016-11-29 12:03:38 +01:00
Sylvain
f91959af81 updated changelog 2016-11-29 11:54:56 +01:00
Sylvain
aa7748f8eb Merge branch 'cash' into dev 2016-11-28 12:05:18 +01:00
Sylvain
5231beb6e1 updated changelog 2016-11-28 10:11:52 +01:00
Sylvain
762d85f378 Version 2.4.4 2016-11-24 16:48:05 +01:00
Sylvain
a37dc5ab97 updated changelog 2016-11-24 16:44:47 +01:00
Peng DU
63a3bcf19a Fix a bug: invoice of reservation show payment by debit card when user pay with wallet 2016-11-24 14:09:34 +01:00
Sylvain
9721872b2a updated changelog 2016-11-24 09:50:56 +01:00
Sylvain
2a029255c9 updated changelog 2016-11-23 15:10:07 +01:00
Sylvain
1747157c6b Version 2.4.3 2016-11-21 14:16:55 +01:00
Sylvain
e38afc0d4b updated changelog 2016-11-21 12:00:03 +01:00
Sylvain
38653d22d1 fix events description on the home page 2016-11-16 16:55:56 +01:00
Sylvain
d46e6cf9c9 [members excel export] invoicing disabled 2016-11-16 15:08:24 +01:00
Sylvain
da71ba783c [bug] exports for events reservation always have seats=1 (fixes #54) 2016-11-09 15:01:58 +01:00
Sylvain
a80df7f993 updated changelog 2016-11-09 14:36:28 +01:00
Sylvain
d5a5b6dd29 updated changelog 2016-11-09 13:14:53 +01:00
Sylvain
7c328af357 Version 2.4.2 2016-11-08 16:24:34 +01:00
Peng DU
99cca406d5 fix bug: event date period dant show correct in invoice 2016-11-03 12:17:19 +01:00
Peng DU
f1b749d5f2 Image max size is configutable, size by default is 2 megabytes 2016-11-02 15:36:22 +01:00
Peng DU
ba5e5752a4 allow add more picture for project step 2016-11-02 14:58:06 +01:00
Sylvain
f9220d44a0 fix i_accept_to_receive_information_from_the_fablab in sign-up modal 2016-10-26 16:35:10 +02:00
Sylvain
42f7b3c75c add HTML in event description 2016-10-26 16:33:21 +02:00
Sylvain
1449ca2b82 updated changelog 2016-10-24 09:33:46 +02:00
Sylvain
1bb05da16a Version 2.4.1 2016-10-11 16:11:20 +02:00
Sylvain
e7b03599ce updated changelog 2016-10-11 16:09:04 +02:00
Sylvain
592c250b49 updated changelog 2016-10-05 11:12:14 +02:00
Sylvain
977f3dac91 Version 2.4.0 2016-10-04 16:39:10 +02:00
Sylvain
9791c7e0fe updated changelog 2016-09-29 12:07:18 +02:00
Sylvain
c6cf40f7cc updated changelog 2016-09-29 10:04:37 +02:00
Sylvain
5211880ed5 updated CHANGELOG 2016-09-28 11:37:36 +02:00
Sylvain
60d60fdd65 use slugs in projects URL opened from notifications 2016-09-27 16:58:57 +02:00
Sylvain
c27c4372b0 updated CHANGELOG 2016-09-27 15:34:30 +02:00
Sylvain
d45ca7213f updated changelog 2016-09-27 14:10:00 +02:00
Sylvain
36524d4cd9 display list of allowed extensions in project's CAD attachments 2016-09-27 14:08:04 +02:00
Sylvain
bf9ea40648 [feature #40] project images will show in full-size on a click 2016-09-27 11:50:05 +02:00
Sylvain
d793af5012 updated changelog 2016-09-27 10:45:53 +02:00
Sylvain
1195451863 [bug] embedded video not working in tranings/machines descriptions 2016-09-27 10:45:07 +02:00
Sylvain
24a0f5533c fix unable to view dashboard nav buttons on small devices + fix responsive issues on admin views 2016-09-27 09:55:24 +02:00
Peng DU
82838ceb6e update CHANELOG 2016-09-26 10:39:14 +02:00
Sylvain
6401b321ef [feature] display fab-manager's version, when logged as admin 2016-09-22 16:46:14 +02:00
Peng DU
f883f8c344 update Changelog 2016-09-20 12:02:08 +02:00
Sylvain
64bae54bce [Bug] move event reservation is not limited by admin settings (prior-delay & disable) 2016-09-15 18:43:27 +02:00
Sylvain
32a79bec1b [bug] clicking on the text in stripe's payment modal, does not validate the checkbox 2016-09-15 18:22:52 +02:00
Sylvain
9bc6fb5b7a updated changelog and documentation 2016-09-15 17:45:59 +02:00
Sylvain
e3cb5456ed updated CHANGELOG 2016-09-13 13:05:36 +02:00
Sylvain
254612dbdc fix typo 2016-09-07 16:17:22 +02:00
Sylvain
e2bf7bf2ad updated CHANGELOG 2016-09-07 16:07:07 +02:00
Sylvain
87eb75801d updated changelog 2016-09-07 15:58:41 +02:00
Sylvain
ef5701dac6 updated changelog 2016-09-06 17:22:49 +02:00
Peng DU
6880ba9aa3 allow load locales for subdirectories 2016-09-05 16:26:28 +02:00
Sylvain
434234c235 [Bug] machine slots with tags are not displayed correctly on reservation calendar 2016-09-01 14:31:21 +02:00
Sylvain
cb42b46790 [Bug] machine name is not shown in plan edition 2016-08-31 17:01:01 +02:00
Sylvain
9212ef7c4a updated changelog 2016-08-31 15:50:05 +02:00
Sylvain
0ffe5733d6 fix typo & completed deployment process in changelog 2016-08-31 15:44:23 +02:00
Sylvain
14ab4c7033 updated changelog 2016-08-23 10:49:02 +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
a63c1830cd better fix for events categories 2016-08-11 11:33:55 +02:00
Sylvain
0c3a2a7832 fix events categories 2016-08-11 11:07:49 +02:00
Sylvain
5b5394725f updated changelog 2016-08-02 16:50:03 +02:00
Sylvain
6c428008c7 updated changelog 2016-07-27 12:05:58 +02:00
Sylvain
74154cf1f3 Merge branch 'xls' into dev 
Conflicts:
	CHANGELOG.md
	app/helpers/application_helper.rb
	config/locales/en.yml
	config/locales/fr.yml
 2016-07-25 16:56:22 +02:00
Sylvain
32d239f723 [Bug #28] Event type disappear when editing the event 2016-07-25 16:16:25 +02:00
Peng DU
2d31bb1a5f update changelog 2016-07-21 16:32:58 +02:00
Peng DU
43740b2364 update changelog 2016-07-18 18:16:54 +02:00
Sylvain
91f4694175 updated changelog 2016-07-13 18:41:08 +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
a4d301b3c8 updated changelog 2016-07-13 18:29:34 +02:00
Sylvain
f5b435895e updated changelog 2016-07-13 16:15:50 +02:00
Sylvain
730eda0820 updated changelog 2016-07-13 16:11:31 +02:00
Sylvain
a45a648b4a updated changelog 2016-07-13 16:05:13 +02:00
Sylvain
320999e9f9 updated changelog 2016-07-13 16:02:29 +02:00
Sylvain
4dcab27af2 API generate valid xlsx files 2016-07-05 16:13:11 +02:00
Sylvain
5750aec326 updated changelog 2016-06-30 14:20:17 +02:00
Sylvain
7d02fa9d9a rename Courses/Workshops to Events 2016-06-28 11:42:20 +02:00
Sylvain
7126843eda updated changelog for 2.3.0 2016-06-28 10:23:39 +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
Peng DU
6db26e7a19 fix conflt 2016-06-27 12:47:03 +02:00
Peng DU
df8dbfae8c fix conflt of changelog 2016-06-27 12:42:57 +02:00
Peng DU
07f231cb1f update changelog 2016-06-27 12:41:54 +02:00
Sylvain
98edd345b1 updated changelog for v2.2.2 2016-06-23 11:49:48 +02:00
Sylvain
18c1f19840 updated changelog for v2.2.1 2016-06-22 09:19:40 +02:00
Sylvain
3138097be2 updated chagelog 2016-06-21 15:24:25 +02:00
Sylvain
be3a3e2b03 updated changelog for 2.2.0 2016-06-16 17:22:44 +02:00
Sylvain
f7d8d18bc8 [feature] paginate public list of members 2016-06-16 16:09:22 +02:00
Sylvain
c30b43f14a updated readme 2016-06-16 13:03:10 +02:00
Sylvain
90f77ca929 updated changelog 2016-06-15 12:05:04 +02:00
Sylvain
e503d6edd8 optimize trainings API 2016-06-14 15:42:28 +02:00
Sylvain
f924144fda [feature] member select with lazy loading 2016-06-14 09:57:39 +02:00
Sylvain
65328451ac updated changelog 2016-05-31 10:06:18 +02:00
Sylvain
7f050223eb Merge branch 'hotfix' into dev 
Conflicts:
	CHANGELOG.md
 2016-05-24 14:59:07 +02:00
Sylvain
f056c1eb91 updated changelog for 2.1.2 2016-05-24 14:56:58 +02:00
Sylvain
cab70654d6 updated change log 2016-05-18 17:33:42 +02:00
Sylvain
cbaf1d8610 updated change log 2016-05-18 17:30:33 +02:00
Nicolas Florentin
7f032526cb implements open_api various endpoints 2016-05-04 18:17:50 +02:00
Sylvain
dc5c125cdb updated changes log 2016-05-03 16:39:05 +02:00
Sylvain
ff316f7bdd updated changes log 2016-05-03 16:33:06 +02:00
cyril
ce6979729a add changelog file 2016-05-02 17:14:21 +02:00