rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Code Issues Releases Activity
7,288 Commits 15 Branches 273 Tags 83 MiB
ae67a371f5
Commit Graph

397 Commits

Author SHA1 Message Date
Sylvain
f80eb230ca refactored code to use Setting.get 2020-05-25 12:54:19 +02:00
Sylvain
0d52b36850 Version 4.4.0 2020-05-12 11:13:47 +02:00
Sylvain
0ea68af329 updated schema 2020-05-11 14:56:25 +02:00
Sylvain
10825e198c prevent recreate periods in the future 2020-05-11 11:28:09 +02:00
Sylvain
1fdea63828 correct some errors due to Price.compute refactoring 2020-05-11 10:56:23 +02:00
Sylvain
06502cde33 [bug] accounting periods totals are wrong for periods closed after 2019-08-01 2020-05-11 10:10:52 +02:00
Sylvain
3319e68526 Auto-adjusts text colors based on the selected theme colors 2020-05-04 13:20:57 +02:00
Sylvain
29e7ac2f08 [bug] background image of the profile is not shown and wrong menu hover color 2020-05-04 12:10:13 +02:00
Sylvain
fc0f153e8a fixed strings 2020-04-20 10:20:42 +02:00
Sylvain
ff75a96ecc Ability to define, per availability, a custom duration for the reservation slots 2020-04-15 18:08:02 +02:00
Sylvain
5f6c293046 fixes in-context translation + fixes migration 20160704095606 2020-04-08 15:55:08 +02:00
Sylvain
422e3c6236 [bug] migration 20160704095606 cannot run due to GDPR refactoring 2020-04-08 15:00:22 +02:00
Sylvain
a13c3af88c [bug] migration 20160704095606 cannot run due to GDPR refactoring 2020-04-08 14:14:50 +02:00
Sylvain
f2a76732e5 Compatible database with Fab-manager v1, to allow upgrades 2020-04-08 12:58:59 +02:00
Sylvain
e3ea83fce2 [bug] default twitter feed is invalid 2020-04-06 16:59:28 +02:00
Sylvain
df8ff77597 fix migrations for rails 5 + use maildev instead of mailcatcher + fix tests script 2020-03-25 12:35:08 +01:00
Sylvain
279012e595 [bug] default invoice logo is broken and prevent invoice generation + updated seeds 2020-03-03 14:38:09 +01:00
Sylvain
f5955b74d2 reposition tour modals to prevent screen overflow 
also: fix issue on tour completed
+ fix issue on statistics when no plans created
+ info area on statistics when no plans created
 2020-03-03 11:20:17 +01:00
Sylvain
a44bf85014 Merge branch 'slot_is_only_subscriptions' into dev 2020-03-02 16:27:26 +01:00
Sylvain
147a78de96 Merge branch 'tour' into dev 2020-03-02 15:39:45 +01:00
Sylvain
d833f6d812 harmonize Fab-manager trademark syntax 2020-02-26 10:19:43 +01:00
Sylvain
4db219b204 [ongoing] FEATURE_TOUR_DISPLAY 2020-02-25 18:02:41 +01:00
Sylvain
5b46edd748 welcome tour + save completed tours in database 2020-02-18 17:36:45 +01:00
Sylvain
df6879da77 fix seeds file due to i18n refactoring 2020-02-17 12:37:25 +01:00
Sylvain
372d7f936b typos & syntax 2020-02-11 11:46:40 +01:00
Du Peng
74cc69d1bd Ability to configure reservation slot restrict for plans 2020-02-07 17:37:00 +01:00
Du Peng
767a8cd332 fix _t function in seed 2020-02-03 11:31:33 +01:00
Sylvain
656a603d6c customize home page css 2020-01-27 17:10:29 +01:00
Sylvain
34a3286870 fix homepage layout 2020-01-22 14:16:35 +01:00
Sylvain
75c49c06f2 move homepage components to standalone directives 
- events
 2020-01-22 12:52:51 +01:00
Sylvain
1968ba601d [ongoing] move homepage components to standalone directives 2020-01-22 12:23:51 +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
059096c2dd privacy option for fab-analytics 2020-01-15 10:46:04 +01:00
Sylvain
64764e5498 check version on hub & [ongoing] health endpoint 2020-01-13 17:05:53 +01:00
Sylvain
510c802ab1 messages variations depending on slot duration 2019-12-09 10:27:50 +01:00
Sylvain
60755a2c2a Merge remote-tracking branch 'origin/fix-time-now' into dev 2019-12-03 15:51:22 +01:00
Sylvain
cca6b14f58 import events asyncronously from icalendar 2019-12-02 15:53:24 +01:00
Nicolas Florentin
77cf8c8218 replaces almost all Time.now by DateTime.current 2019-12-02 11:57:25 +01:00
Sylvain
97d93cd622 added a name to imported calendar 2019-11-27 17:39:19 +01:00
Sylvain
baf8cfb487 iCalendar server api & db model 2019-11-27 17:05:19 +01:00
Sylvain
a60a39ff9e [ongoing] create multiple availabilities according to UI 2019-11-13 12:13:22 +01:00
Sylvain
1cc1bd23b7 Ability to fully rebuild the projets index in ElasticSearch with rake fablab🇪🇸build_projects_index 2019-10-16 14:37:43 +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
a7a929ddbc integration unit test for imports + fixed import result colors in UI + fixed test fixtures 2019-10-01 14:32:30 +02:00
Sylvain
4deaf1f75a [ongoing] import members from csv 2019-09-25 16:37:42 +02:00
Sylvain
a532efd198 upload csv file to the server through the API and save it on the disk 2019-09-24 17:42:50 +02:00
Sylvain
1fa36d4029 renamed avoir_mode to payment_method 2019-09-17 14:48:06 +02:00
Sylvain
224b0d6dee Merge branch 'sca' into dev 2019-09-12 12:53:56 +02:00
Sylvain
d977838d52 fix tests according to changes for stripe SCA 2019-09-11 16:20:47 +02:00
Sylvain
4d0ac9b3ca using stp_payment_intent_id instead of stp_invoice_id on new invoices 2019-09-10 16:45:45 +02:00
Sylvain
26c98394ac fixed export service 2019-08-01 09:49:09 +02:00
Sylvain
f772bc3509 api endpoint and worker to export accounting data 2019-07-30 11:43:51 +02:00
Sylvain
ca61e4e08e [bug] SubscriptionExpireWorker cannot run due to wrong expiration column in SQL query 2019-07-10 10:52:29 +02:00
Sylvain
718d163d13 Version 4.0.1 2019-06-17 15:32:46 +02:00
Sylvain
f37b4ffca2 [bug] migration 20190523140823 may not run if an admin was deleted 2019-06-17 15:28:54 +02:00
Sylvain
ff784aef1a Version 4.0.0 2019-06-17 12:34:12 +02:00
Sylvain
92381ce4bc update default policy 2019-06-17 10:49:27 +02:00
Sylvain
dd4ad1e935 updated default policy 2019-06-13 17:16:39 +02:00
Sylvain
708c966d61 default policy udpate 2019-06-13 13:47:21 +02:00
Sylvain
12cf9cfd7d privacy policy draft 2019-06-12 14:37:05 +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
37b9e3da60 link statistic profile to invoices 2019-06-11 10:02:48 +02:00
Sylvain
818d1357a9 save user cration date in statistic_profile 2019-06-06 16:54:09 +02:00
Sylvain
cfd33c3a52 migrate projects to statistic_profile 2019-06-06 16:34:53 +02:00
Sylvain
35da65b686 change statistic_service to use statistic_profile + use raw sql in migrations 2019-06-06 13:58:49 +02:00
Sylvain
fe2a6f7120 migrate trainings to statistic_profile and adjust code 2019-06-06 12:00:21 +02:00
Sylvain
f0c5b0eb09 init StatisticProfileTraining 2019-06-05 16:17:56 +02:00
Sylvain
4c033614ae [ongoing] migrate subscriptions & reservations to statistic_profile 2019-06-04 16:50:23 +02:00
Sylvain
52992ac9d5 move gender & birthday to statistic_profile 2019-06-04 13:33:00 +02:00
Sylvain
42e73e4315 [ongoing] statistic profile 2019-06-03 17:25:04 +02:00
Sylvain
9ef2f142bd link HistoryValue to InvoicingProfile + improved invoices tests 2019-06-03 16:51:43 +02:00
Sylvain
7ed97ef35a link wallet & its transactions to invoicingprofile 2019-06-03 16:00:09 +02:00
Sylvain
6011f27268 finish moving organization & address to invoiving profile: fix create & edit user 2019-06-03 12:06:01 +02:00
Sylvain
a211ad39ff moving organization & address to invoicingProfile + refactored doc about postgre 2019-05-29 14:28:14 +02:00
Sylvain
142e07f3c9 update code to use invoicingprofile 2019-05-29 12:01:24 +02:00
Sylvain
0df97cffc5 migrate from Invoice.user_id to Invoice.invoicing_profile_id 2019-05-28 16:02:55 +02:00
Sylvain
3945b760b5 [ongoing] attach invoices to invoicingProfile instead of user 2019-05-27 13:03:44 +02:00
Sylvain
5231e464fe fix invoicingProfile schema + migration script 2019-05-27 13:00:05 +02:00
Sylvain
70bc3d5732 put invoicing data into separate table 2019-05-27 13:00:05 +02:00
Sylvain
75310d599f Merge branch 'host' into dev 2019-03-26 14:33:30 +01:00
Sylvain
10844aa49a updated schema 2019-03-26 14:33:17 +01:00
Sylvain
208e33a890 updated seeds file 2019-03-26 10:06:29 +01:00
Sylvain
cdf8aad34c updated twitter feed 2019-03-25 17:15:19 +01:00
Sylvain
96c3e3173a [ongoing] remove LaCasemate marks 2019-03-25 17:14:26 +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
940ea3051b chain historyValues with sha256 footprints 2019-03-20 11:01:53 +01:00
Sylvain
ccd63ecfe1 include zip archive into tests + fix: allow multiple runs of test suite 2019-03-18 12:09:54 +01:00
Sylvain
c356f35f29 add operator_id to invoices 2019-03-18 11:11:09 +01:00
Sylvain
e543f1fe3e add watermark to invoices in dev/staging/test environment 2019-02-27 17:44:52 +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
b865ec0c5a prevent regenerate footprints 2019-02-13 10:59:44 +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
da672ea8b6 Merge branch 'dev' into host 2019-01-21 16:34:06 +01:00
Sylvain
62410da9e1 add test for member autocomplete 2019-01-21 11:49:35 +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
5b13c59496 list existing closings in close period modal 2019-01-07 16:45:31 +01:00
Sylvain
0a684c8e13 rails DB model for accounting periods 2019-01-07 12:29:52 +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
811b7193f7 improved & fixed test suite 2018-12-12 13:49:14 +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
0c63405b4d migrate from bower to yarn 2018-11-22 17:09:33 +01: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
Sylvain
1c8d362f11 ability to disable space 2017-10-11 14:58:38 +02:00
Sylvain
c67360771a ability to disable machine 2017-10-11 12:10:05 +02:00
Sylvain
05d9e62dd2 ability to disabled training 2017-10-10 17:16:43 +02:00
Sylvain
c5f0501df2 enable/disable group 2017-10-05 16:48:18 +02:00
Sylvain
26d79e5b12 disable a plan 2017-10-04 18:56:39 +02:00
Sylvain
d092a1c5ea admin can lock and unlock availbilities 2017-09-06 15:01:41 +02:00
Sylvain
3d4260a3f7 [bug] unable to delete standard group 2017-08-30 14:57:06 +02:00
Sylvain
cf6afb817d [feature] configuration of max visibility for reservations 2017-08-24 18:34:18 +02:00
Nicolas Florentin
739d9562fd removes ADMIN_EMAIL and ADMIN_PASSWORD from Rails env because they are only used once when seeding the db 2017-07-13 11:07:09 +02:00
Nicolas Florentin
decb7e8159 improves test if there is already an admin, not failing anymore if role doesnt exist 2017-07-13 09:25:32 +02:00
Sylvain
0d82186a78 [bug] db:seed throw an error about admin creation 2017-06-14 17:28:36 +02:00
Nicolas Florentin
004e74e13e extracts first admin created email and password into environment variables 2017-04-03 15:48:32 +02:00
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