Commit Graph

515 Commits

Author SHA1 Message Date
TemuulenBM
80d2ebb544 deleted company-user model 2024-02-06 15:00:28 +08:00
TemuulenBM
300e157bc1 fixed router.js 2024-02-06 14:33:22 +08:00
TemuulenBM
4119eb1717 fixed conflicts 2024-02-06 14:14:39 +08:00
TemuulenBM
be382fcbd3 added translation 2024-02-05 16:35:44 +08:00
TemuulenBM
019be89e06 fixed router and rewrite route as a standart 2024-02-05 11:45:24 +08:00
TemuulenBM
50bfe55583 created Organizations page for admin 2024-02-02 18:04:43 +08:00
Ron
e8f5638cad Merge pull request #192 from fleetbase/dev-v0.3.10
v0.3.10
v0.3.10
2024-02-01 20:05:22 +08:00
Ronald A. Richardson
e216f11f7c all dependencies up to date 2024-02-01 19:57:40 +08:00
Ronald A. Richardson
41064be1ff fixed up for release 2024-02-01 19:28:40 +08:00
Ron
ae17ccb199 Merge pull request #195 from ekini/fix/socketcluster_port
Helm: Fix the socketcluster port to fix broadcasting
2024-02-01 19:14:54 +08:00
Ronald A. Richardson
0fbf901c9d Merge branch 'dev-v0.3.10' of github.com:fleetbase/fleetbase into dev-v0.3.10 2024-02-01 19:12:42 +08:00
Ronald A. Richardson
00806d4f0c checking in comments implementation 2024-02-01 19:11:17 +08:00
TemuulenBM
683353517d fixed conflict 2024-02-01 18:25:57 +08:00
TemuulenBM
27b1af6c40 fixed conflict 2024-02-01 18:25:10 +08:00
Temuulen
e8249adddd Merge pull request #196 from fleetbase/feature/organizations-page-for-admin
Feature/organizations page for admin
2024-02-01 18:13:44 +08:00
TemuulenBM
6cd0625753 Refactor user model retrieval
This commit refactors the way the user model is retrieved in the
organization-users.js file. Instead of using findAll, it now uses
query to filter users based on the company_id. This change was
necessary to improve the performance of the user retrieval process
and to ensure that only relevant users are returned (#1234).
2024-02-01 18:01:35 +08:00
Ron
21ea3f5644 Merge branch 'dev-v0.3.10' into feature/organizations-page-for-admin 2024-02-01 13:37:06 +08:00
TemuulenBM
727b2e399f merged 2024-02-01 13:34:35 +08:00
TemuulenBM
ec913f82d7 Merge branch 'main' of github.com:fleetbase/fleetbase into feature/organizations-page-for-admin 2024-02-01 13:31:03 +08:00
Eugene Dementyev
7acf97a5e0 Helm: Fix the socketcluster port to fix broadcasting 2024-01-27 11:06:25 +13:00
Ron
914a5abacb Merge pull request #193 from fleetbase/feature/reset-password
fixed reset-password flow
2024-01-26 15:42:14 +08:00
TemuulenBM
fdcd3bb805 fixed reset-password flow 2024-01-26 14:50:27 +08:00
Ronald A. Richardson
5a4d6846b5 improved accoutn verification with ability to manually trigger resend of code 2024-01-26 14:41:36 +08:00
Ron
f52c1a17b8 Merge pull request #191 from fleetbase/dev-v0.3.9
v0.3.9
v0.3.9
2024-01-25 20:04:33 +08:00
Ronald A. Richardson
c44e9186d5 ready for release 2024-01-25 20:04:01 +08:00
Ronald A. Richardson
02408b3a12 Merge branch 'dev-v0.3.10' of github.com:fleetbase/fleetbase into dev-v0.3.10 2024-01-25 19:38:55 +08:00
Ronald A. Richardson
a3d3cb05cf preparing for next release 2024-01-25 19:38:20 +08:00
Ron
604365fc5f Merge pull request #188 from ekini/feature/helm_services
Add scheduler and events to deployments
2024-01-25 19:12:39 +08:00
Ron
5d47dc676f Merge pull request #190 from fleetbase/fix-onboard-form
Fix onboard form
2024-01-25 19:11:58 +08:00
Ronald A. Richardson
50b58a5955 preparing next release 2024-01-25 19:10:17 +08:00
Munkh-erdene Damdinbazar
948db173c9 fixed verify email 2024-01-25 15:53:27 +08:00
Munkh-erdene Damdinbazar
4f56e04166 fixed onboard translations 2024-01-25 15:25:32 +08:00
Eugene Dementyev
d9705bf4f4 Add scheduler and events to deployments 2024-01-25 20:05:42 +13:00
Ron
5535067d87 Merge pull request #186 from fleetbase/dev-v0.3.8
v0.3.8
v0.3.8
2024-01-24 18:25:53 +08:00
Ronald A. Richardson
aab4e9f1f6 remove incomplete mongolian translations 2024-01-24 18:22:24 +08:00
Ronald A. Richardson
43329a0ed2 bump package verison v0.3.8 2024-01-24 18:15:10 +08:00
Ronald A. Richardson
427816d2dd fix submodules, update dependency lockfiles 2024-01-24 18:14:48 +08:00
Ronald A. Richardson
3d9d5cbe9d Merge branch 'dev-v0.3.8' of github.com:fleetbase/fleetbase into dev-v0.3.8 2024-01-24 15:54:25 +08:00
Ronald A. Richardson
3fc5bdb32e hotfix organization 2fa settings as should not display method selection 2024-01-24 15:53:18 +08:00
Munkh-erdene Damdinbazar
a60f75655d Merge branch 'dev-v0.3.8' of github.com:fleetbase/fleetbase into dev-v0.3.8 2024-01-24 14:46:46 +08:00
Munkh-erdene Damdinbazar
0984af400a fixed some typo errors on templates and translation file 2024-01-24 14:45:21 +08:00
Ronald A. Richardson
7f900fe218 now using fleetbase intl lint module 2024-01-24 14:31:17 +08:00
Ronald A. Richardson
3aaf382384 added intl linter for console 2024-01-24 11:46:16 +08:00
Ronald A. Richardson
f589b1cf0a added intl linter script to console 2024-01-24 11:44:26 +08:00
Ronald A. Richardson
bce1cbf22d increase veirification timeout before recommending resend 2024-01-24 11:42:28 +08:00
Ron
6327603857 Merge pull request #187 from fleetbase/hotfix-s3deploy-dockerfile
Hotfix s3deploy dockerfile
2024-01-24 11:09:55 +08:00
Ronald A. Richardson
7204ddb3a9 Upgrade the console dockerfile to use node 18, patch the .s3deploy file to set correct cache-control header for json and xml files 2024-01-24 11:07:32 +08:00
Munkh-erdene Damdinbazar
2bc9745b95 add missing translation 2024-01-23 11:51:46 +08:00
Ron
4a2b3e094f Merge pull request #178 from fleetbase/feature-intl
feature: Internationalization
2024-01-22 18:51:23 +08:00
Ronald A. Richardson
313906d36a added locale switcher to change language of fleetbase 2024-01-22 18:50:09 +08:00