Code

Dev#5

Code

Open

faisalEsMagico wants to merge 49 commits intomainCOMPASS-DPG/admin-ui:mainfrom devCOMPASS-DPG/admin-ui:devCopy head branch name to clipboard

+11,801-6,447

Commits

Commits on Nov 20, 2023

• feat(3cp): settlement ui

  faisalEsMagico

  committed
  ba9973b

• feat(settlement): create settlement + use wallet page

  faisalEsMagico

  committed
  5daaf60

Commits on Nov 21, 2023

• feat(merge): merge dev

  faisalEsMagico

  committed
  aa12482

• fix(loading): change spinner color

  faisalEsMagico

  committed
  2461b4e

Commits on Nov 23, 2023

• feat(marketplace): three section and popup setup

  ankitmlesmagico

  committed
  cff82fa

Commits on Nov 24, 2023

• feat(account section): final touchup

  ankitmlesmagico

  committed
  2ae4871

• feat(account section): final touchup

  ankitmlesmagico

  committed
  b3de4ee

• Merge pull request #6 from COMPASS-DPG/dev-test

  Show description for 863eeeb
  aman1esmagico

  authored
  863eeeb

Commits on Nov 25, 2023

• feat(marketplace admin): integration

  ankitmlesmagico

  committed
  913e824

• feat(marketplace admin): integration

  ankitmlesmagico

  committed
  a04b3d2

• feat(marketplace admin): merge Settlement

  ankitmlesmagico

  committed
  5f42745

• feat(question bank): changed type

  ankitmlesmagico

  committed
  e75765f

Commits on Nov 28, 2023

• Merge pull request #7 from COMPASS-DPG/dev-test

  Show description for 4e251b9
  aman1esmagico

  authored
  4e251b9

• feat(docker): adding two stage in docker

  

  Aman Agarwal

  authored and

  Aman Agarwal

  committed
  a814504

• feat(userWallet): transectionIntegration

  ankitmlesmagico

  committed
  0540d6b

Commits on Nov 29, 2023

• feat(account and course): setting loading and error

  ankitmlesmagico

  committed
  454a66f

Commits on Dec 1, 2023

• feat(marktetplace): rest button setup

  ankitmlesmagico

  committed
  4ad7f13

Commits on Dec 4, 2023

• feat(ui): done with changes

  faisalEsMagico

  committed
  ff7f0e7

• feat(marktetplace): merge conflict

  ankitmlesmagico

  committed
  bffa882

• feat(wpcas): changing the url

  

  Aman Agarwal

  authored and

  Aman Agarwal

  committed
  d4f48cb

Commits on Dec 7, 2023

• feat(auth): added login and signup

  faisalEsMagico

  committed
  127cfcd

Commits on Dec 8, 2023

• feat(integration): integration done

  faisalEsMagico

  committed
  9d4ece1

Commits on Dec 10, 2023

• feat(ui): done with ui changes

  faisalEsMagico

  committed
  ddfb3d0

Commits on Dec 11, 2023

• feat(changes): done changes

  faisalEsMagico

  committed
  8a24f8e

Commits on Dec 12, 2023

• feat(changes): done changes

  faisalEsMagico

  committed
  e7f88a4

• feat(fix): remove dashboard

  faisalEsMagico

  committed
  ec34996

• feat(route): change route

  faisalEsMagico

  committed
  4dfceba

• feat(wallet): done changes in user wallet

  faisalEsMagico

  committed
  2dfa1b4

• feat(changes): done with changes

  faisalEsMagico

  committed
  4cd51ea

Commits on Dec 13, 2023

• feat(conif): config file for urls

  faisalEsMagico

  committed
  c6db1b8

• feat(merge): merge branch

  faisalEsMagico

  committed
  d8bcc29

• feat(conflict resolve): backing to dev branch for resolving conflict

  

  Aman Agarwal

  authored and

  Aman Agarwal

  committed
  7a7e23d

• Merge branch 'dev' into feature/marketplace

  aman1esmagico

  authored
  739b677

• Merge pull request #9 from COMPASS-DPG/feature/marketplace

  Show description for d0c0e52
  aman1esmagico

  authored
  d0c0e52

• feat(yarn): addin new yarn.lock

  

  Aman Agarwal

  authored and

  Aman Agarwal

  committed
  e21cee6

• feat(dockerFile): updating docker config

  

  Aman Agarwal

  authored and

  Aman Agarwal

  committed
  26f970b

Commits on Dec 14, 2023

• feat(build): done changes for build

  faisalEsMagico

  committed
  212c0ce

Commits on Dec 15, 2023

• feat(public url): changing the url

  

  Aman Agarwal

  authored and

  Aman Agarwal

  committed
  17c01cb

• feat(meta): meta data

  faisalEsMagico

  committed
  b6d4805

• Merge branch 'dev' of https://github.com/COMPASS-DPG/wpcas-ui into dev

  faisalEsMagico

  committed
  cf893e5

Commits on Dec 18, 2023

• feat(changes): competency data schema change

  faisalEsMagico

  committed
  52f13e1

• Merge pull request #13 from COMPASS-DPG/fix/competencyDataChange

  Show description for caaa2df
  faisalEsMagico

  authored
  caaa2df

Commits on Dec 20, 2023

• feat(fix): align text in login

  faisalEsMagico

  committed
  937cd38

Commits on Apr 5, 2024

• fix(dropdown): update with string from id

  ankitmlesmagico

  committed
  ed61c1b

Commits on Apr 8, 2024

• Merge pull request #14 from COMPASS-DPG/fix/dropdown_issue

  Show description for 286aacd
  VamshiBatta07

  authored
  286aacd

Commits on Apr 9, 2024

• fix(course section): bug fix for competency search

  

  VamshiBatta07

  committed
  aa7084f

Commits on Apr 17, 2024

• Update .env.example

  kh4l1d64

  authored
  5aa0a7e

Commits on Apr 26, 2024

• fix(dropdown): update from competency id to competency name and fixed level number mismatch

  VamshiBatta07

  committed
  95eb88a

• Merge pull request #15 from COMPASS-DPG/fix/edit-question-bank

  Show description for b1e0938
  kh4l1d64

  authored
  b1e0938