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
7,613 Commits 15 Branches 273 Tags 82 MiB
fb2b762015
Commit Graph

431 Commits

Author SHA1 Message Date
vincent
6e38e72851 (ui) Add editorial text block 2023-02-15 10:27:57 +01:00
vincent
98e10dc774 (ui) Uniform layout for settings and form 2023-02-15 10:27:57 +01:00
vincent
a0508e689e (feat) Add characters count to form input 2023-02-15 10:27:56 +01:00
vincent
7edec2bd69 (ui) Training form 2023-02-15 10:27:56 +01:00
vincent
17c70e0c81 (ui) Trainings settings + style cleanup 2023-02-15 10:27:55 +01:00
vincent
47229d9fff (ui) Fix layout 2023-02-15 10:27:55 +01:00
vincent
554ed083d0 (ui) Update layout 2023-02-15 10:27:54 +01:00
Karen
b9d86aecdc (quality) status property :label is now :name for better coherence 2023-02-15 10:27:54 +01:00
Karen
96ddb40c59 (feat) Add Status Settings in Projects Settings 2023-02-15 10:27:53 +01:00
Karen
d80cc4769a (feat) filter for status in project gallery 2023-02-15 10:27:49 +01:00
Karen
7209dfbe7b (ui) create status project component 2023-02-15 10:27:13 +01:00
Sylvain
28b64f3c6d (feat) buy a new prepaid pack from the dashboard 2023-02-15 10:27:12 +01:00
vincent
eb7c4de0ce (ui) Dashboard inte 2023-02-15 10:26:14 +01:00
Sylvain
dde6782475 (bug) wrong times in admin/event monitoring 2023-02-14 11:37:07 +01:00
Sylvain
193407e0da (bug) filter statistics by slot date 2023-02-02 11:02:33 +01:00
vincent
5001098f85 (ui) Move Add machine button 2023-01-09 14:57:38 +01:00
Sylvain
e24fca7f9d (bug) event is over before the end 2023-01-09 11:37:58 +01:00
Sylvain
8ce1ceb345 (quality) translate validation messages 2023-01-04 11:12:02 +01:00
Sylvain
43f45c383f (feat) cancel subscription 2023-01-03 17:17:39 +01:00
Du Peng
e7615b70a6 (feat) use switch instant of checkbox in show slots unavailables calendar filter 2023-01-03 15:26:32 +01:00
Sylvain
5630872b5f (bug) update VAT name in front after change 2023-01-03 10:25:41 +01:00
Du Peng
29b92475bb (feat) Ability to filter uniq slots reserved in admin calendar 2023-01-02 19:20:02 +01:00
Sylvain
7fc79d44e5 (feat) machines reservable or not 2022-12-27 16:14:29 +01:00
Sylvain
898ce07509 (merge) Merge branch 'staging' into dev 2022-12-27 12:20:18 +01:00
Sylvain
f8904dfb9c (feat) customize VAT name 2022-12-27 12:13:24 +01:00
Sylvain
574974c239 (merge) Merge branch 'machine_category' into staging 2022-12-27 10:59:36 +01:00
Sylvain
e139067954 (feat) prevent generate invoices at 0 2022-12-23 14:14:42 +01:00
Du Peng
774ce35fa8 (feat) add accordion for calendar filter 2022-12-22 15:18:53 +01:00
Sylvain
4b84963d7f (feat) optional external id 2022-12-21 14:14:29 +01:00
Sylvain
13eeff5964 (ui) enable advanced accounting button in separate box 2022-12-21 14:12:15 +01:00
Sylvain
37f30e26a9 (feat) enable/disable advanced accounting 2022-12-21 14:05:16 +01:00
Sylvain
be8ae01ba4 (ui) refactor plan form 
Also: add advanced accounting to plans
 2022-12-21 14:05:16 +01:00
Sylvain
85fcc71d6b (wip) refactor plan form 2022-12-21 14:05:15 +01:00
Sylvain
3d796549f2 (ui) refactor event form 2022-12-21 14:05:14 +01:00
Sylvain
8df60a8712 (ui) refactor space form 2022-12-21 14:05:14 +01:00
Sylvain
3d88266fe6 (ui) refactor training form 2022-12-21 14:05:13 +01:00
Sylvain
4203da097c (ui) refactor machine creation form 2022-12-21 14:05:13 +01:00
Sylvain
4cc6574f58 (ui) refactor machine edition form 2022-12-21 14:05:09 +01:00
Du Peng
f47440c85a (feat) add machine category 2022-12-20 18:45:53 +01:00
Sylvain
795928c07c (feat) Add reservation deadline parameter 2022-12-19 09:58:44 +01:00
Sylvain
66b1db6d0a (bug) phone/adresse required not shown 2022-12-16 15:35:02 +01:00
Sylvain
14b5c40ec8 Merge branch 'feature/reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/reservation-deadlines 2022-12-14 11:30:54 +01:00
Sylvain
575c7c7d62 (feat) updated FabAnalytics reports to include new features 2022-12-01 16:34:14 +01:00
Guilherme Chaguri
dea9663f37 Added reservation deadline parameter 2022-11-29 17:02:01 -03:00
Sylvain
20e50bda13 (bug) fix file/image input components 2022-11-03 09:26:21 +01:00
Du Peng
6d448e0af2 (merge) merge dev and product-store 2022-10-26 09:37:31 +02:00
Sylvain
c9901a89e1 (test) test admin reserves for himself 2022-10-25 14:31:31 +02:00
Sylvain
744b811b62 (feat) remove admins group: allow admins to reserve 2022-10-25 11:57:26 +02:00
Du Peng
b1135f6df0 (feat) save latest product filter when click back button 2022-10-20 19:14:16 +02:00
vincent
d2338dee6a (ui) Fix nav-tabs 2022-10-18 08:42:48 +02:00
Du Peng
5a8aa747e5 Merge branch 'product-store_integration' into product-store 2022-10-13 18:39:29 +02:00
Du Peng
5d0e170b92 (bug) load content when tabs are clicked in admin store 2022-10-13 17:44:44 +02:00
vincent
6dcfd4d99e (i18n) fix placeholder 2022-10-13 16:57:03 +02:00
vincent
c883a27c95 (i18n) fix text 2022-10-13 16:41:23 +02:00
Sylvain
11c8b25357 (feat) hide the store to members/visitors 2022-10-12 16:48:39 +02:00
Sylvain
a63975dd18 (merge) Merge branch 'dev' into product-store 2022-10-05 17:16:04 +02:00
Sylvain
794f6130d2 (security) access to admin/store is restricted to admins & managers 
also, access to admin/store/settings is not allowed to managers
 2022-10-05 16:06:51 +02:00
Sylvain
51aa967001 (feat) dismiss a user to a lower privileged role 2022-10-03 14:22:15 +02:00
Sylvain
d6fbd90c7c (feat) ability to disable the store 2022-09-27 11:14:27 +02:00
Sylvain
75a4038a60 (feat) save/restore filters in admin/store/products 2022-09-26 17:18:52 +02:00
Sylvain
6b7daade5f (feat) save filters to the URL 2022-09-26 12:41:20 +02:00
Du Peng
010718d53e (merge) store manage the orders by admin 2022-09-16 11:45:58 +02:00
Sylvain
c4baf89c54 (merge) Merge branch 'product-store_stocks' into product-store 2022-09-14 15:15:47 +02:00
Du Peng
32b19ed4f7 (feat) manage orders in admin dashbaord 2022-09-13 19:47:19 +02:00
Sylvain
c381c985d2 (wip) unsaved form alert 2022-09-13 17:18:35 +02:00
Du Peng
dbe4570c30 (feat) client can show orders in dashbaord 2022-09-12 19:44:13 +02:00
Du Peng
50276f5b41 (feat) VAT for store's product and Accounting code/label 2022-09-09 09:31:00 +02:00
Du Peng
cd1bfe976c Merge branch 'product-store-payment' into product-store 2022-09-08 16:49:24 +02:00
Du Peng
334f365c2c (feat) change store cart back url 2022-09-08 16:46:26 +02:00
Du Peng
aeae5f7aa0 (feat) add product to cart in product page 2022-09-08 16:27:34 +02:00
vincent
d5d8a972cf (quality) Refacto orders views 2022-09-08 12:04:37 +02:00
vincent
3f08d831b9 (merge) branch 'product_store-inte' 2022-09-07 15:54:29 +02:00
vincent
23488284e8 (quality) Create state label component 2022-09-07 15:35:46 +02:00
Du Peng
79182fb8c1 Merge branch 'product_store-store' into product-store 2022-09-07 15:00:27 +02:00
vincent
874be0bcb6 (wip) user orders dashboard 2022-09-07 09:22:16 +02:00
Sylvain
8055de38b8 (bug) the events times are not displayed 2022-09-05 12:21:07 +02:00
vincent
a5a45ee1ce Store settings + update text editor options 2022-09-01 18:02:22 +02:00
vincent
27a3bdc308 Admin orders (tmp) 2022-09-01 16:08:37 +02:00
vincent
2e696f94fd (wip) Admin orders list 2022-08-29 19:15:10 +02:00
vincent
78683a31b3 Style cart 2022-08-29 16:32:35 +02:00
vincent
5791e6076d Merge remote-tracking branch 'origin/product_store-store' into product_store-inte 2022-08-29 10:32:14 +02:00
Du Peng
b669316e43 request user login when checkout a cart 2022-08-28 23:31:43 +02:00
vincent
e0dc008d4c Client side product list + product view 2022-08-24 18:34:34 +02:00
Sylvain
9caf401412 (bug) disabling/removing groups 
When disabling a group, another unrelated group maybe disabled/enabled;
When deleting a group, another unrelated group may be deleted,
instead of the requested one
 2022-08-24 12:21:52 +02:00
vincent
29993b0ec9 Cleanup files 2022-08-23 18:55:49 +02:00
Sylvain
a31f3555a1 (Bug) password verification during setup 2022-08-23 17:35:12 +02:00
Du Peng
396248ed2b manage cart session when user login or logout 2022-08-20 20:49:51 +02:00
Du Peng
cfd21adb60 cart button 2022-08-20 18:47:15 +02:00
Du Peng
ab800a519f store cart 2022-08-19 20:03:09 +02:00
Du Peng
16288ae2bd fablab store page 2022-08-16 19:47:27 +02:00
vincent
c5f2b2587e Remove test text 2022-08-03 10:24:27 +02:00
vincent
400f832313 (wip) Style products list and form 2022-08-03 10:23:41 +02:00
vincent
d3d4fdf84d (wip) Style product's components 2022-08-03 10:23:40 +02:00
Du Peng
5e1436eda4 create/edit product form 2022-08-03 10:18:00 +02:00
Du Peng
e23e83000d products page in front 2022-08-03 10:17:58 +02:00
Du Peng
432b60ca9a store product category create/list/update/delete 2022-08-03 10:16:08 +02:00
vincent
c3cdccfb74 Adjust connection modals' style 2022-08-03 09:12:57 +02:00
Du Peng
d399a085ee Merge branch 'improves-password-complexity-check-2pxghn4' into dev 2022-08-01 19:32:29 +02:00
Du Peng
890e3659b4 Merge branch 'prevents-users-enumeration-attack-2pxggdn' into dev 2022-08-01 19:06:13 +02:00
Cyril
be53adb551 Display the tag and theme field on the detail view of a project 2022-08-01 17:44:36 +02:00