rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-11 22:24:21 +01:00
Code Issues Releases Activity
7,603 Commits 15 Branches 273 Tags 82 MiB
45959b1fa4
Commit Graph

429 Commits

Author SHA1 Message Date
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
Nicolas Florentin
1d6a59dd67 improvement: add complexity check of the user password 2022-07-29 17:37:42 +02:00
Nicolas Florentin
98c7da492d prevents users enumeration attacks by not giving any info about the validity of the email 2022-07-29 16:02:58 +02:00
Sylvain
98b1919de2 Make the username column optionnal (#375) 2022-07-27 09:59:23 +02:00
Sylvain
be5b6af3f1
Merge pull request #375 from Guichaguri/feat/add-admin-member-usernames 
Add username column to the member list
 2022-07-27 09:32:45 +02:00
Sylvain
df0b5628b3 (bug) canceled trainings are still shown on the public profile page 2022-07-26 17:55:45 +02:00
vincent
783e43f3a4 Fix user porfil bio's link display 2022-07-25 15:33:33 +02:00
Sylvain
29b9399ca3 (bug) unable to reserve event 2022-07-20 15:54:04 +02:00
Sylvain
2bd84e623a (bug) missing translations 2022-07-20 15:27:01 +02:00
Sylvain
d26e2ae313 (bug) fix various issues due to slots behavior refactoring 2022-07-19 11:32:12 +02:00
Sylvain
37b24a8d2f refactor slots model 2022-07-18 17:18:01 +02:00
Guilherme Chaguri
d63b8d0dfa Add username column to the member list 2022-07-14 16:11:44 -03:00
vincent
272e105f5a Fix page title's layout 2022-07-11 11:33:31 +02:00
Sylvain
6719469e76 (doc) add more description about the members import feature #364 2022-06-29 16:41:58 +02:00
Sylvain
9b601bc438 (feat) show reservations panel 2022-06-29 15:34:04 +02:00
Sylvain
ea1883e406 factorize front-end API params helper 2022-06-29 15:34:04 +02:00
Sylvain
dac0acbf03 (feat) removed the admins' button to scroll to the featured event 2022-06-28 11:22:17 +02:00
Sylvain
d03a34b894 (bug) unable to update the user profile after toggling the organization switch twice 2022-06-22 17:14:19 +02:00
Sylvain
a131998aa1 Merge branch 'lint-rules' into dev 2022-06-22 14:19:37 +02:00
Sylvain
89c610514d fix styling issues + rename proof of identity 2022-06-22 14:18:33 +02:00
Sylvain
7f1cc92c43 linted supporting-documents/* 2022-06-22 13:01:22 +02:00
Sylvain
4d6af2c1c0 (wip) linting supporting-documents (ex proof-of-identify) 
remaining: type-form, type-modal, types-list
 2022-06-21 17:49:04 +02:00
Sylvain
c0d5da55ce linted all code expected profile-custom-fields/* and proof-of-identity/* 2022-06-21 12:10:00 +02:00
Sylvain
4a8d8796a3 (wip) lint for scoped-translation 2022-06-20 18:06:15 +02:00
vincent
f40f80dd1f Fix canceled event label's translation 2022-06-15 13:48:42 +02:00
vincent
ed34279cef unable non-required [text-setting] 2022-06-15 13:35:46 +02:00
Sylvain
3b63ffa532 (bug) fix events list display 2022-06-15 12:29:44 +02:00
Sylvain
503ae22c0b (feat) admins can scroll to the featured event 2022-06-15 12:26:44 +02:00
Sylvain
96c825769c (wip) fix events style: no more 3 in rows 2022-06-15 12:00:05 +02:00
Sylvain
31fe9dea05 (feat) feature the next event in the event page 2022-06-15 10:55:08 +02:00
Sylvain
a8ca94ce32 (bug) times are not shown in admin/events monitoring page 2022-06-15 09:59:19 +02:00
Sylvain
48e1cf782f (bug) unable to edit an event 2022-06-15 09:42:39 +02:00
Sylvain
61080a5188 (feat) feature the first event 2022-06-14 17:50:04 +02:00
vincent
103bf80e81 Standardize card layout 2022-06-14 16:44:26 +02:00
vincent
f30c501948 (wip) React component [EventCard] 2022-06-14 16:44:26 +02:00
vincent
fcfa9513e8 (wip) React component [EventCard] 2022-06-14 16:44:24 +02:00
Du Peng
4d3fe6aa2a Fix a bug: if multi VAT no value is filled in, the general rate can't apply 2022-06-01 12:41:19 +02:00
vincent
b45b0ed942 Move calendar header's buttons on the left 2022-06-01 09:33:15 +02:00
Sylvain
931e19b331 (bug) hide create account links when public registrations disabled 2022-05-30 14:19:32 +02:00
Du Peng
8d724d7191 Fix a bug: unable to sign up if admin actived organization's additional fields with required 2022-05-27 11:37:31 +02:00
Du Peng
7067757f38 Disable to clicking outside or pressing escape to close sign up modal 2022-05-20 15:58:49 +02:00
Du Peng
e3d2b53767 Fix a bug: when machines module disabled, Associated machines is still shown in trainings list 2022-05-13 12:24:52 +02:00
Du Peng
4d9da0c5f9 hide machines list in edition of training if machines module is disabled 2022-05-12 12:51:52 +02:00
Du Peng
88dc91bcaf fix bug: machine module/statistic module setting style 2022-05-12 12:14:34 +02:00
Du Peng
c46a2ba085 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2022-05-12 11:43:18 +02:00
Du Peng
3e95960903 fix bug: organization custom field requred 2022-05-12 11:25:40 +02:00
vincent
abf101178b Adjust texts on admin settings about 2022-05-12 10:47:28 +02:00
Sylvain
3fd20cd57d (bug) unable to validate account 2022-05-11 18:06:49 +02:00
Du Peng
655f75a394 fix bug: can update machines_module, user_change_group option setting 2022-05-11 16:57:44 +02:00
Du Peng
c719dccd31 add an alert info for modification of fields of organization 2022-05-11 16:57:44 +02:00
Du Peng
3e34b3c7a7 add user validation required setting, user proof of identity upload and organization custom field 2022-05-11 16:57:44 +02:00
Sylvain
e45872956c (ui) Option to prevent users from changing their group 2022-05-11 15:45:49 +02:00
Sylvain
1d2b814d6f (ui) react component to change user's group 2022-05-11 14:37:39 +02:00
Sylvain
ac1d518ddc (ui) option to disable the machines module 2022-05-11 11:54:00 +02:00
Sylvain
0e8230af48 (ui) use user-profile-form in admin/members/new 2022-05-10 11:18:33 +02:00
Sylvain
302c55755e (ui) admin edit user: use new user-profile-form component 2022-05-10 10:23:43 +02:00
Sylvain
040858ac1f (ui) refactored profile-completion screen to use more accurate messages 2022-05-09 14:58:26 +02:00
Sylvain
69d595e9f6 (ui) use user-profile-form in profile completion screen 2022-05-09 12:11:37 +02:00
Sylvain
c5ef505008 (bug) social icons & avatar not shown 2022-05-04 16:17:05 +02:00
Sylvain
9b22286327 Merge remote-tracking branch 'origin/socials-refacto' into profile-form 2022-05-04 15:53:22 +02:00
vincent
521229b87b Add form validation 2022-05-04 14:57:31 +02:00
Sylvain
048ed4b644 (ui) user profile form: confirmation message + save button 2022-05-04 14:12:49 +02:00
Sylvain
11491aeb6c (ui) save profile editions to the API 2022-05-04 14:12:48 +02:00
Sylvain
c1bf5bee14 (wip)(ui) refactor user edition form 2022-05-04 14:07:12 +02:00
Sylvain
0d09ddd2fa (wip)(ui) user edition form 2022-05-04 14:05:36 +02:00
Sylvain
70803ee41b (api) validate auth providers data 
+ remove legacy code
 2022-05-04 12:27:48 +02:00
Sylvain
04ae91a7d1 (ui) improve the appeareance for the auth provider definition form 2022-05-04 12:27:46 +02:00
Sylvain
bf148dd14b (wip) rhf select 2022-05-04 12:17:21 +02:00
Sylvain
b4e53d2039 (db) table to save OpenID connect configuration 
Also refactored OAuth2Mapping to allow usage with any types of providers
 2022-05-04 12:16:38 +02:00
Sylvain
e28c8ab2e9 (front) add is-empty class to the calendar-admin-info side panel if no events are selected 2022-05-04 12:16:38 +02:00
vincent
ca9a564474 Make calendar wider 2022-05-04 12:16:36 +02:00
vincent
cb5dd953ea Edit and display fab's social networks 2022-05-04 10:25:25 +02:00
vincent
5024037ce6 (wip) fab-socials 2022-05-04 10:25:15 +02:00
vincent
e15082a2ef Fix social networks list position 2022-05-04 10:21:37 +02:00
vincent
bf380c45d4 Adjust styles and icons 2022-05-04 10:21:37 +02:00
vincent
7461f6d1d5 (wip) show and edit social networks 2022-05-04 10:21:05 +02:00
Sylvain
654f0880a0 (ui) user profile form: confirmation message + save button 2022-05-03 16:45:06 +02:00
Sylvain
b801999ee3 (ui) save profile editions to the API 2022-05-02 16:29:04 +02:00
Sylvain
aa432d08b3 (wip)(ui) refactor user edition form 2022-04-26 18:05:18 +02:00
Sylvain
b4ae80457e (wip)(ui) user edition form 2022-04-25 17:24:28 +02:00
Sylvain
0dd6f4bff5 Merge branch 'openid' into v5.4 2022-04-25 15:43:03 +02:00
Sylvain
c77e6c8a65 (front) add is-empty class to the calendar-admin-info side panel if no events are selected 2022-04-12 17:22:47 +02:00
Du Peng
b277022f6f Set invoice reference is required 2022-04-12 17:17:39 +02:00
vincent
78be7bb276 Make calendar wider 2022-04-12 15:54:12 +02:00
Sylvain
d2c90f4066 (api) validate auth providers data 
+ remove legacy code
 2022-04-11 17:27:56 +02:00
Sylvain
4da6a5fa72 (ui) improve the appeareance for the auth provider definition form 2022-04-11 16:12:13 +02:00
Du Peng
18c17cc93c Fix a bug: form maxlength count to exclude spaces and newline 2022-04-07 15:22:54 +02:00
Du Peng
08b072e33c Fix a bug: unable to show machine availability slot for admin 2022-04-05 14:21:19 +02:00
Sylvain
431d733ffe (wip) rhf select 2022-04-04 18:19:59 +02:00
Sylvain
8495e2a7a0 (db) table to save OpenID connect configuration 
Also refactored OAuth2Mapping to allow usage with any types of providers
 2022-04-04 16:24:27 +02:00
Sylvain
2fcda8a0ce (feature) Prepaid-packs purchases are exported to the accounting CSV file 2022-03-23 13:14:34 +01:00
Sylvain
0c51aff748 (feat) OAuth2 scopes are now configurable from the interface 
Previously, scopes were supported through OAUTH2_SCOPE since v5.3.1.
BREAKING CHANGE: update your oauth2 provider configuration if you need scopes support
 2022-03-22 16:40:09 +01:00
Sylvain
49dd0d2dab (bug) a sentence was not linked to a translation key 2022-03-08 15:48:06 +01:00
Sylvain
28489e112c renamed PaymentModal to CardPaymentModal 2022-01-18 16:27:12 +01:00
Sylvain
c031f099a5 Merge branch 'oauth2' into dev 2022-01-17 12:46:07 +01:00
Sylvain
634da414f8 (feat) When a payment schedule is in error or canceled, ability to re-enable it with another payment method 2022-01-17 12:38:53 +01:00
Sylvain
036f9df35f Specilized VAT rate cannot be defined unless the VAT is enabled and saved 2022-01-12 15:30:54 +01:00
Sylvain
cb6a3a00b6 (bug) the switch to enable/disable the VAT does not reflect the current state of the VAT 2022-01-12 15:17:08 +01:00
Sylvain
8a149bb947 (bug) some links redirect to the home page instead of triggering the requested action 2022-01-11 11:03:27 +01:00
vincent
f15907c405 Merge branch 'dev' into wip-demo-update 2022-01-07 08:23:34 +01:00
Sylvain
e1256ec551 Ability to disable public account creation 2022-01-04 15:27:58 +01:00
Sylvain
00b9bce587 export collected VAT by rate 2021-12-29 17:00:54 +01:00
Sylvain
16242d2127 frontend invoice configuration page uses multiVAT 2021-12-29 12:08:50 +01:00