bobby_dev #1

Merged
bobby.vishwakarma merged 86 commits from bobby_dev into main 2024-06-11 09:59:45 +00:00

86 Commits

Author SHA1 Message Date
bobbyvish
dab7734185 Merge branch 'bobby_dev' of https://github.com/WDI-Ideas/digest_backend into bobby_dev 2024-06-11 15:28:18 +05:30
bobbyvish
20796ce757 conflict fix 2024-06-11 15:26:29 +05:30
bobbyvish
d4eb35406c fix:1404 file 2024-06-06 13:56:44 +05:30
BOBBY VISHWAKARMA
15e591169a Merge branch 'development' into bobby_dev 2024-05-27 15:33:15 +05:30
bobbyvish
a78cf241dd fix(404):404 and permission denied page 2024-05-27 15:29:57 +05:30
BOBBY VISHWAKARMA
e842b12957 Merge pull request #54 from WDI-Ideas/development
Development
2024-05-23 12:18:26 +05:30
BOBBY VISHWAKARMA
345fa62865 Merge pull request #52 from WDI-Ideas/bobby_dev
refactor(app version): updated serializer
2024-05-23 12:14:12 +05:30
bobbyvish
be1ae7262a refactor(app version): updated serializer 2024-05-23 12:13:26 +05:30
BOBBY VISHWAKARMA
244cd7c383 Merge pull request #50 from WDI-Ideas/bobby_dev
fix(app version):changes in logic
2024-05-21 19:44:23 +05:30
bobbyvish
585c863f66 fix(app version):changes in logic 2024-05-21 19:40:57 +05:30
BOBBY VISHWAKARMA
59519ad43f Merge pull request #48 from WDI-Ideas/bobby_dev
conf(production):structure setting of production server and app verio…
2024-05-21 19:03:38 +05:30
bobbyvish
971f3f6c92 conf(production):structure setting of production server and app verion api 2024-05-21 19:02:26 +05:30
BOBBY VISHWAKARMA
9de5bcc122 Merge pull request #47 from WDI-Ideas/staging
Staging
2024-05-16 19:19:37 +05:30
BOBBY VISHWAKARMA
fa5c897d99 Merge pull request #46 from WDI-Ideas/development
Development
2024-05-16 17:52:30 +05:30
BOBBY VISHWAKARMA
14c415389e Merge pull request #45 from WDI-Ideas/bobby_dev
feat(contact us): landing page contact support through email
2024-05-16 17:51:37 +05:30
bobbyvish
bbc01addda feat(contact us): landing page contact support through email 2024-05-16 17:49:59 +05:30
BOBBY VISHWAKARMA
24d18e6a30 Merge pull request #44 from WDI-Ideas/development
Development
2024-05-15 17:40:28 +05:30
BOBBY VISHWAKARMA
a6e97f25b0 Merge branch 'staging' into development 2024-05-15 17:40:19 +05:30
BOBBY VISHWAKARMA
5450ac31d2 Merge pull request #43 from WDI-Ideas/bobby_dev
refactor: user report filter
2024-05-15 17:33:58 +05:30
bobbyvish
e4ee75c7ee refactor: user report filter 2024-05-15 17:31:26 +05:30
BOBBY VISHWAKARMA
a3dd0cc941 Merge pull request #42 from WDI-Ideas/bobby_dev
refactor(module_auth): form validation
2024-05-15 11:18:17 +05:30
BOBBY VISHWAKARMA
5cbd822c33 Merge pull request #41 from WDI-Ideas/bobby_dev
refactor(module_auth): form validation
2024-05-15 11:15:26 +05:30
bobbyvish
f7370a90aa refactor(module_auth): form validation 2024-05-15 11:11:27 +05:30
BOBBY VISHWAKARMA
eff9eccf1e Merge pull request #40 from WDI-Ideas/development
Development
2024-05-14 12:01:49 +05:30
BOBBY VISHWAKARMA
4e83b961c0 Merge pull request #39 from WDI-Ideas/bobby_dev
refactor(auth):changed logout functionality
2024-05-14 12:01:29 +05:30
bobbyvish
b4bacbe35a refactor(auth):changed logout functionality 2024-05-13 20:05:17 +05:30
BOBBY VISHWAKARMA
35af98676f Merge pull request #38 from WDI-Ideas/development
Development
2024-05-13 17:03:01 +05:30
BOBBY VISHWAKARMA
bc2c961d5b Merge pull request #37 from WDI-Ideas/bobby_dev
refactor(notification):added notification for symptom
2024-05-13 17:02:39 +05:30
bobbyvish
f630151356 refactor(notification):added notification for symptom 2024-05-13 16:53:07 +05:30
BOBBY VISHWAKARMA
70de300837 Merge pull request #36 from WDI-Ideas/development
Development
2024-05-13 12:09:25 +05:30
BOBBY VISHWAKARMA
9aa3fa9c2a Merge pull request #35 from WDI-Ideas/bobby_dev
refactore(dataset):script to update the data of dataset
2024-05-13 12:08:58 +05:30
bobbyvish
08355290b4 refactore(dataset):script to update the data of dataset 2024-05-13 12:04:45 +05:30
BOBBY VISHWAKARMA
281336b4c2 Merge pull request #34 from WDI-Ideas/development
Development
2024-05-09 16:24:08 +05:30
BOBBY VISHWAKARMA
d1286fa6bf Merge pull request #33 from WDI-Ideas/bobby_dev
refactor(manage_notification): solved the issue of cron for push noti…
2024-05-09 16:23:25 +05:30
bobbyvish
2fe49465b5 refactor(manage_notification): solved the issue of cron for push notification and filter in report 2024-05-09 16:21:48 +05:30
BOBBY VISHWAKARMA
716590e718 Merge pull request #32 from WDI-Ideas/development
Development
2024-04-19 15:55:25 +05:30
BOBBY VISHWAKARMA
36674c67f7 Merge pull request #31 from WDI-Ideas/bobby_dev
refactor: meal duplicate and admin validation
2024-04-19 15:54:08 +05:30
bobbyvish
b93c207ee6 refactor: meal duplicate and admin validation 2024-04-19 15:50:08 +05:30
BOBBY VISHWAKARMA
6361444cb8 Merge pull request #30 from WDI-Ideas/development
Development
2024-04-18 11:57:31 +05:30
BOBBY VISHWAKARMA
816dd0367a Merge pull request #29 from WDI-Ideas/bobby_dev
refactor: form validation
2024-04-18 11:57:12 +05:30
bobbyvish
61313ad7d2 refactor: form validation 2024-04-18 11:54:28 +05:30
BOBBY VISHWAKARMA
6f8257d1d8 Merge pull request #28 from WDI-Ideas/development
Development
2024-04-15 15:00:45 +05:30
BOBBY VISHWAKARMA
3461a7281e Merge pull request #27 from WDI-Ideas/bobby_dev
refactor: home api sort and datatable
2024-04-15 14:55:24 +05:30
bobbyvish
ddced5b98f refactor: home api sort and datatable 2024-04-15 14:50:54 +05:30
BOBBY VISHWAKARMA
6d55254013 Merge pull request #26 from WDI-Ideas/development
Development
2024-04-08 00:34:55 +05:30
BOBBY VISHWAKARMA
694e74eb0c Merge pull request #25 from WDI-Ideas/bobby_dev
refactor: validation of all forms
2024-04-08 00:34:32 +05:30
bobbyvish
524186b801 refactor: validation of all forms 2024-04-08 00:33:02 +05:30
BOBBY VISHWAKARMA
0a7b910c46 Merge pull request #24 from WDI-Ideas/development
Development
2024-04-04 16:30:42 +05:30
BOBBY VISHWAKARMA
6aa5c602d2 Merge pull request #23 from WDI-Ideas/bobby_dev
fix meal api and force update api
2024-04-04 16:30:06 +05:30
bobbyvish
8878dc89ac fix meal api and force update api 2024-04-04 16:27:43 +05:30
BOBBY VISHWAKARMA
514f9a96e2 Merge pull request #22 from WDI-Ideas/development
Development
2024-04-02 19:29:52 +05:30
BOBBY VISHWAKARMA
f13b7d8d4e Merge pull request #21 from WDI-Ideas/bobby_dev
fix: iamprincipal
2024-04-02 19:29:26 +05:30
bobbyvish
9e66760fae fix: iamprincipal 2024-04-02 19:23:52 +05:30
BOBBY VISHWAKARMA
d41af6a628 Merge pull request #20 from WDI-Ideas/development
Development
2024-04-01 11:55:25 +05:30
BOBBY VISHWAKARMA
ec1fc86c25 Merge pull request #19 from WDI-Ideas/bobby_dev
Refactor activity model
2024-04-01 11:54:56 +05:30
bobbyvish
6892bd6675 Refactor activity model 2024-04-01 11:53:43 +05:30
BOBBY VISHWAKARMA
1513c8609b Merge pull request #18 from WDI-Ideas/development
Development
2024-04-01 11:34:12 +05:30
BOBBY VISHWAKARMA
82e85c488e Merge pull request #17 from WDI-Ideas/bobby_dev
Refactor i am principal
2024-04-01 11:33:45 +05:30
bobbyvish
db2fab79fa Refactor i am principal 2024-04-01 11:31:16 +05:30
BOBBY VISHWAKARMA
575c35691e Merge pull request #16 from WDI-Ideas/development
Development
2024-03-29 18:51:58 +05:30
BOBBY VISHWAKARMA
2613e926c7 Merge pull request #15 from WDI-Ideas/bobby_dev
refactor: food dataset api
2024-03-29 18:51:24 +05:30
bobbyvish
869a7ace06 refactor: food dataset api 2024-03-29 18:50:31 +05:30
BOBBY VISHWAKARMA
de964c4620 Merge pull request #14 from WDI-Ideas/development
Development
2024-03-29 00:49:49 +05:30
BOBBY VISHWAKARMA
9e6c995e59 Merge pull request #13 from WDI-Ideas/bobby_dev
feat: Added meal food and ingredient record through dataset
2024-03-29 00:49:09 +05:30
bobbyvish
5867445dcd feat: Added meal food and ingredient record through dataset 2024-03-29 00:45:21 +05:30
BOBBY VISHWAKARMA
5e85aea844 Merge pull request #12 from WDI-Ideas/development
Development
2024-03-26 13:25:31 +05:30
BOBBY VISHWAKARMA
edc1f394db Merge pull request #11 from WDI-Ideas/bobby_dev
refactor datatables
2024-03-26 13:25:08 +05:30
bobbyvish
2a4f507a6f refactor datatables 2024-03-26 13:22:29 +05:30
BOBBY VISHWAKARMA
6b64a44242 Merge pull request #10 from WDI-Ideas/development
Development
2024-03-21 13:21:18 +05:30
BOBBY VISHWAKARMA
6e3df95b1e Merge pull request #9 from WDI-Ideas/bobby_dev
Bobby dev
2024-03-21 13:19:52 +05:30
bobbyvish
64c172ab59 feat - meal record filter based on date 2024-03-21 13:13:06 +05:30
bobbyvish
9ba43e8fd1 refactor code by applying isort and added left arrow icon 2024-03-21 13:09:14 +05:30
BOBBY VISHWAKARMA
7cecbf90b7 Merge pull request #8 from WDI-Ideas/development
Development
2024-03-18 15:23:31 +05:30
BOBBY VISHWAKARMA
090e806b16 Merge pull request #7 from WDI-Ideas/bobby_dev
Changes related to static file
2024-03-18 15:22:57 +05:30
bobbyvish
a412eb8537 Changes related to static file 2024-03-18 15:21:20 +05:30
BOBBY VISHWAKARMA
dce1bd46a7 Merge pull request #6 from WDI-Ideas/development
Development
2024-03-18 11:45:58 +05:30
BOBBY VISHWAKARMA
167c379c6b Merge pull request #5 from WDI-Ideas/bobby_dev
refactore iam principal and password reset
2024-03-18 11:45:28 +05:30
bobbyvish
27168352ab refactore iam principal and password reset 2024-03-18 11:44:06 +05:30
BOBBY VISHWAKARMA
d8b121b6a5 Merge pull request #4 from WDI-Ideas/development
Development
2024-03-11 17:34:09 +05:30
BOBBY VISHWAKARMA
d52a35c9e3 Merge pull request #3 from WDI-Ideas/bobby_dev
Updated base setting and env.example file
2024-03-11 17:33:11 +05:30
bobbyvish
ac71e17e9f Updated base setting and env.example file 2024-03-11 17:31:33 +05:30
BOBBY VISHWAKARMA
83224bc92a Merge pull request #2 from WDI-Ideas/development
Development
2024-03-11 16:40:54 +05:30
BOBBY VISHWAKARMA
77cc6a0940 Merge pull request #1 from WDI-Ideas/bobby_dev
Bobby dev
2024-03-11 15:41:03 +05:30
bobbyvish
2a0bb98bd3 Updated error msg in login 2024-03-11 15:34:47 +05:30
bobbyvish
d12004612a updated requirement.txt file 2024-03-11 15:11:38 +05:30
bobbyvish
fd4aef5a40 Added all the functionality of app and admin 2024-03-11 14:48:48 +05:30