Code

Stage Push#356

Code

Merged

Aish1990 merged 49 commits intostaged-rec/drec-origin:stagefrom developd-rec/drec-origin:developCopy head branch name to clipboardJul 11, 2024

+413-443

Commits

Commits on Jul 4, 2024

• Fix : Admin login we have got error as the orgId is not same as admin's orgId.. But actually this condition not required for Admin

  Aish1990

  committed
  7522b46

  Copy full SHA for 7522b46

• Prettier fix

  Aish1990

  committed
  2afb639

  Copy full SHA for 2afb639

• Fixed error in date timestamp of AddReadsByAdmin

  Aish1990

  committed
  bea2939

  Copy full SHA for bea2939

Commits on Jul 5, 2024

• Merge pull request #346 from d-rec/Add_Reads_Fix

  Show description for a920280
  Aish1990

  authored
  a920280

  Copy full SHA for a920280

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into bulk_upload_fix

  Aish1990

  committed
  87ebfd7

  Copy full SHA for 87ebfd7

• Merge pull request #345 from d-rec/bulk_upload_fix

  Show description for 30b0c78
  Aish1990

  authored
  30b0c78

  Copy full SHA for 30b0c78

• Version Upgraded

  Aish1990

  committed
  3821b0c

  Copy full SHA for 3821b0c

• Merge pull request #347 from d-rec/Version_Bump0.4

  Show description for e0a3b8d
  Aish1990

  authored
  e0a3b8d

  Copy full SHA for e0a3b8d

• fixed get device by admin & update device by admin

  Aish1990

  committed
  4ac5233

  Copy full SHA for 4ac5233

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into DR-835

  Aish1990

  committed
  99c33a1

  Copy full SHA for 99c33a1

• prettier fix

  Aish1990

  committed
  6a2f5d6

  Copy full SHA for 6a2f5d6

• Fixed Add Organization at admin login fixed as it was not updating the admin's api_user_id at this new organization and user

  Aish1990

  committed
  3e7ca29

  Copy full SHA for 3e7ca29

• update User Fixed

  Aish1990

  committed
  19ed550

  Copy full SHA for 19ed550

• Prettier lint Fixed

  Aish1990

  committed
  aa90551

  Copy full SHA for aa90551

• Prettier lint Fixed

  Aish1990

  committed
  39127b8

  Copy full SHA for 39127b8

• Fixed add delta read for Admin/apiuser

  Aish1990

  committed
  8ceb6fb

  Copy full SHA for 8ceb6fb

Commits on Jul 8, 2024

• Merge pull request #348 from d-rec/DR-835

  Show description for a7611d2
  Aish1990

  authored
  a7611d2

  Copy full SHA for a7611d2

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into DR-839

  Aish1990

  committed
  066ba76

  Copy full SHA for 066ba76

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into DR-839_Update_User_Fix

  Aish1990

  committed
  c01cd53

  Copy full SHA for c01cd53

• Merge pull request #349 from d-rec/DR-839

  Show description for 093e0fb
  Aish1990

  authored
  093e0fb

  Copy full SHA for 093e0fb

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into DR-839_Update_User_Fix

  Aish1990

  committed
  d4abe69

  Copy full SHA for d4abe69

• Merge pull request #350 from d-rec/DR-839_Update_User_Fix

  Show description for 2ffac8e
  Aish1990

  authored
  2ffac8e

  Copy full SHA for 2ffac8e

• Version Upgraded

  Aish1990

  committed
  505a318

  Copy full SHA for 505a318

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into Version_Bump0.5

  Aish1990

  committed
  1f239da

  Copy full SHA for 1f239da

• Merge pull request #351 from d-rec/Version_Bump0.5

  Show description for c7c5d96
  Aish1990

  authored
  c7c5d96

  Copy full SHA for c7c5d96

• Apiuser's User Update fix

  Aish1990

  committed
  0a18c76

  Copy full SHA for 0a18c76

• Merge pull request #352 from d-rec/DR-839_ApiUser_User_Update_Fix

  Show description for e74a371
  Aish1990

  authored
  e74a371

  Copy full SHA for e74a371

• Version upgraded

  Aish1990

  committed
  a7d8186

  Copy full SHA for a7d8186

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into Version_Bump0.6

  Aish1990

  committed
  b35957c

  Copy full SHA for b35957c

• Merge pull request #353 from d-rec/Version_Bump0.6

  Show description for da7a12c
  Aish1990

  authored
  da7a12c

  Copy full SHA for da7a12c

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into DR-835_Add_Delta_reaf_fix

  Aish1990

  committed
  48d7be1

  Copy full SHA for 48d7be1

• Merge pull request #354 from d-rec/DR-835_Add_Delta_reaf_fix

  Show description for fed032c
  Aish1990

  authored
  fed032c

  Copy full SHA for fed032c

• Version Upgraded

  Aish1990

  committed
  0a96f08

  Copy full SHA for 0a96f08

• Merge pull request #355 from d-rec/Version_Bump0.7

  Show description for f685d79
  Aish1990

  authored
  f685d79

  Copy full SHA for f685d79

Commits on Jul 9, 2024

• @energyweb libraries upgrades

  Aish1990

  committed
  8f6da70

  Copy full SHA for 8f6da70

• Removed the import command as it's no longer used in our application

  Aish1990

  committed
  90cfd24

  Copy full SHA for 90cfd24

• migration file correction of old issuer certificates entity

  Aish1990

  committed
  9bc036e

  Copy full SHA for 9bc036e

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into @ewf_upgrades

  Aish1990

  committed
  c272015

  Copy full SHA for c272015

• Merge pull request #357 from d-rec/@ewf_upgrades

  Show description for 9c41497
  Aish1990

  authored
  9c41497

  Copy full SHA for 9c41497

• Version Upgraded

  Aish1990

  committed
  88dfd9f

  Copy full SHA for 88dfd9f

• Merge pull request #358 from d-rec/Version-Bump0.8

  Show description for 8096e99
  Aish1990

  authored
  8096e99

  Copy full SHA for 8096e99

Commits on Jul 10, 2024

• ewf libraries issuer, origin-backend-utils, utils-general downgraded

  Aish1990

  committed
  1b6c33a

  Copy full SHA for 1b6c33a

• Version Upgraded

  Aish1990

  committed
  1dcad01

  Copy full SHA for 1dcad01

Commits on Jul 11, 2024

• Merge pull request #360 from d-rec/Version_Bump0.8

  Show description for 9415a64
  NamrataSweya

  authored
  9415a64

  Copy full SHA for 9415a64

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into DR-749_Ewf_downgrade

  Aish1990

  committed
  323616a

  Copy full SHA for 323616a

• Version Upgraded

  Aish1990

  committed
  e1f57c4

  Copy full SHA for e1f57c4

• Merge pull request #359 from d-rec/DR-749_Ewf_downgrade

  Show description for c73e65b
  Aish1990

  authored
  c73e65b

  Copy full SHA for c73e65b

• Merge branch 'develop' of https://github.com/d-rec/drec-origin into Version_Bump0.9

  Aish1990

  committed
  33937c0

  Copy full SHA for 33937c0

• Merge pull request #361 from d-rec/Version_Bump0.9

  Show description for eee09a7
  Aish1990

  authored
  eee09a7

  Copy full SHA for eee09a7