Code

Feature/intern contractor appraisal#3690

Code

Open

srivastava-jyoti wants to merge 50 commits intomasterColoredCow/portal:masterfrom feature/intern-contractor-appraisalColoredCow/portal:feature/intern-contractor-appraisalCopy head branch name to clipboard

+1,623-183

Commits

Commits on Jul 22, 2024

• intern onboarding

  

  Gaurav Gusain

  committed
  c5e08be

  Copy full SHA for c5e08be

• added header an footer

  srivastava-jyoti

  committed
  4510b83

  Copy full SHA for 4510b83

• cleanups

  srivastava-jyoti

  committed
  660ddf9

  Copy full SHA for 660ddf9

• wip

  srivastava-jyoti

  committed
  216edde

  Copy full SHA for 216edde

Commits on Jul 23, 2024

• Merge branch 'release' of https://github.com/ColoredCow/portal into feature/intern-contractor-appraisal

  

  Gaurav Gusain

  committed
  4887f4d

  Copy full SHA for 4887f4d

Commits on Jul 25, 2024

• wip

  srivastava-jyoti

  committed
  6868897

  Copy full SHA for 6868897

Commits on Jul 26, 2024

• wip

  srivastava-jyoti

  committed
  ace875c

  Copy full SHA for ace875c

• wip

  srivastava-jyoti

  committed
  f0d8c6c

  Copy full SHA for f0d8c6c

• Merge branch 'release' of https://github.com/coloredcow/portal into feature/intern-contractor-appraisal

  AnirudhAP2k

  committed
  03eea0a

  Copy full SHA for 03eea0a

• wip

  srivastava-jyoti

  committed
  c76af39

  Copy full SHA for c76af39

Commits on Jul 29, 2024

• Added date of birth input for contractor payroll type users

  AnirudhAP2k

  committed
  059b595

  Copy full SHA for 059b595

• CI fixes (removed extra whitespaces)

  AnirudhAP2k

  committed
  5c54d29

  Copy full SHA for 5c54d29

• CI fixes

  AnirudhAP2k

  committed
  58df6d8

  Copy full SHA for 58df6d8

• CI fixes

  AnirudhAP2k

  committed
  2540cf5

  Copy full SHA for 2540cf5

• Romoved extra code

  AnirudhAP2k

  committed
  baa6a55

  Copy full SHA for baa6a55

• Merge branch 'feature/intern-contractor-appraisal' of https://github.com/ColoredCow/portal into feat/inter-contractor-dob

  

  Gaurav Gusain

  committed
  eafc767

  Copy full SHA for eafc767

• Display DOB in basic details

  AnirudhAP2k

  committed
  7910a37

  Copy full SHA for 7910a37

• Merge branch 'feat/inter-contractor-dob' of https://github.com/coloredcow/portal into feat/inter-contractor-dob

  AnirudhAP2k

  committed
  dddd3ae

  Copy full SHA for dddd3ae

Commits on Jul 30, 2024

• Merge pull request #3689 from ColoredCow/feat/inter-contractor-dob

  Show description for 4fb3bfe
  GauravGusain98

  authored
  4fb3bfe

  Copy full SHA for 4fb3bfe

• wip

  srivastava-jyoti

  committed
  8d5d076

  Copy full SHA for 8d5d076

• employee address

  srivastava-jyoti

  committed
  7227b27

  Copy full SHA for 7227b27

• sync with main branch

  srivastava-jyoti

  committed
  0e58dd8

  Copy full SHA for 0e58dd8

• calculated age

  srivastava-jyoti

  committed
  510b980

  Copy full SHA for 510b980

• Fixed the non-numeric bug while export

  AnirudhAP2k

  committed
  2ffa724

  Copy full SHA for 2ffa724

• Minor fix

  AnirudhAP2k

  committed
  eb6aa1b

  Copy full SHA for eb6aa1b

• CI fix

  AnirudhAP2k

  committed
  d005404

  Copy full SHA for d005404

• Code cleanups

  AnirudhAP2k

  committed
  d8acdce

  Copy full SHA for d8acdce

• Code cleanups

  AnirudhAP2k

  committed
  19e642a

  Copy full SHA for 19e642a

• Code cleanups

  AnirudhAP2k

  committed
  f5dd60b

  Copy full SHA for f5dd60b

• CI FIxes

  AnirudhAP2k

  committed
  772e9b8

  Copy full SHA for 772e9b8

• wip

  srivastava-jyoti

  committed
  c56fdd1

  Copy full SHA for c56fdd1

• wip

  srivastava-jyoti

  committed
  01e80ef

  Copy full SHA for 01e80ef

• added salary and gross salary

  srivastava-jyoti

  committed
  1470421

  Copy full SHA for 1470421

• Merge pull request #3691 from ColoredCow/fix/hr-employee-salary-export

  Show description for 20aaa9d
  GauravGusain98

  authored
  20aaa9d

  Copy full SHA for 20aaa9d

Commits on Aug 1, 2024

• FIxed the salary bug for the employee-type user

  AnirudhAP2k

  committed
  8384a9f

  Copy full SHA for 8384a9f

• Code cleanups

  AnirudhAP2k

  committed
  91f894b

  Copy full SHA for 91f894b

• CI Fixes

  AnirudhAP2k

  committed
  299716d

  Copy full SHA for 299716d

• CI Fixes

  AnirudhAP2k

  committed
  b5bd518

  Copy full SHA for b5bd518

Commits on Aug 3, 2024

• Added PAN details for the contractor user-type

  AnirudhAP2k

  committed
  5a38454

  Copy full SHA for 5a38454

Commits on Aug 14, 2024

• Merge pull request #3695 from ColoredCow/feat/employee-contractor-pan-details

  Show description for dadf596
  GauravGusain98

  authored
  dadf596

  Copy full SHA for dadf596

Commits on Aug 24, 2024

• Merge pull request #3694 from ColoredCow/fix/hr-employee-salary-selection

  Show description for c37f30d
  GauravGusain98

  authored
  c37f30d

  Copy full SHA for c37f30d

Commits on Sep 3, 2024

• cleanups

  srivastava-jyoti

  committed
  a123b9b

  Copy full SHA for a123b9b

• Merge branch 'release' of https://github.com/ColoredCow/portal into feature/intern-contractor-appraisal

  

  Gaurav Gusain

  committed
  ed6dc4b

  Copy full SHA for ed6dc4b

Commits on Sep 4, 2024

• resolved conflicts

  srivastava-jyoti

  committed
  49445f2

  Copy full SHA for 49445f2

• Merge pull request #3687 from ColoredCow/contractor-apprisal-letter

  Show description for 16adc2e
  srivastava-jyoti

  authored
  16adc2e

  Copy full SHA for 16adc2e

• Merge branch 'feature/intern-contractor-appraisal' of https://github.com/ColoredCow/portal into feature/intern-contractor-appraisal

  

  Gaurav Gusain

  committed
  b5f10b7

  Copy full SHA for b5f10b7

Commits on Sep 13, 2024

• Merge branch 'master' of https://github.com/ColoredCow/portal into feature/intern-contractor-appraisal

  

  Gaurav Gusain

  committed
  71373d5

  Copy full SHA for 71373d5

• minor fix

  

  Gaurav Gusain

  committed
  343a4be

  Copy full SHA for 343a4be

• Calculation Fix

  

  Gaurav Gusain

  committed
  63c6b25

  Copy full SHA for 63c6b25

• fix the appraisal letter data calculation

  

  Gaurav Gusain

  committed
  fa0a5a2

  Copy full SHA for fa0a5a2