dev-wahyun #1

Merged

farhantock merged 174 commits from dev-wahyun into staging 7 months ago

Ghost commented 7 months ago

There is no content yet.

Ghost added 174 commits 7 months ago

8edf0f7bab update url

bafbe981ae Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend

e13e948676 change url to project

e15177d586 merge

ae3521baf7 Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend

226dfdbc37 Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend

e86f3a9145 Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend

dd26f56815 url for project

6e88005908 resolve conflict

6984f8a8fc Resolve conflicts

32f79d43e4 Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend

d3c8f47e03 Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend

59b2f3bf79 update

56004337dd profile

9c92502dbc ignore super admin

ecf9cc925d add route profile

f3d2a13216 fn login

497d53a59d Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-khaidir

658039d042 Merge branch 'dev-khaidir' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

c6539c4c4b Merge pull request 'dev-khaidir' (#59 ) from dev-khaidir into staging

Reviewed-on: ibnu/generic-ospro-frontend#59

9b1d2964ab dynamic dashboard init

82b2703dd2 add endpoint

9dbdd1c1af add padding in logo

7f388aa0ee redesign profile

9d93836b6c Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

6c17815af7 Merge pull request 'profile slacing' (#61 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#61

6e43a41b47 rename folder demo

c29b728875 new router and new andpoint

9397736600 update vocabeelary

047a774f16 remove console log

e0dedfd2ef update menu from company menu

01a9d444aa diskon and referral code page

4c6025ebf2 contact sales page

8474bbc830 Merge pull request 'Dev-Farhan' (#62 ) from Dev-Farhan into staging

Reviewed-on: ibnu/generic-ospro-frontend#62

21281e5da0 Resolved conflicts

45e713b03c Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend

3f36182016 Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend into Dev-Farhan

19f817c7a6 Merge pull request 'Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend into Dev-Farhan' (#64 ) from Dev-Farhan into staging

Reviewed-on: ibnu/generic-ospro-frontend#64

42e20239fb resolve conflict

82dcd6f6ee Merge pull request 'upload 2024-02-28' (#63 ) from staging into master

Reviewed-on: ibnu/generic-ospro-frontend#63

da5bf251ba Merge pull request 'dynamic dashboard init' (#65 ) from dev-wahyu into master

Reviewed-on: ibnu/generic-ospro-frontend#65

c41dc74a64 dynamic dashboard 1st iteration

8b67596403 update dynamic dashboard

5d2e9f052f customfunc

1ad73d642a roles

1e3560135c menu

fe462877f0 project phase

08428e7d69 project role

c1f8a08d6d checklist 3

9120cc187b project information

dedc56f2be divisi

9ad1234db2 project type

db8397684a HR

03fd2fe6f2 UOM

3add312f03 Merge pull request 'dev-khaidir' (#67 ) from dev-khaidir into staging

Reviewed-on: ibnu/generic-ospro-frontend#67

bebb7e6720 Merge pull request 'dev-wahyu' (#66 ) from dev-wahyu into staging

Reviewed-on: ibnu/generic-ospro-frontend#66

d6cde6a7de parse integer

dbbf774d5f update column FE

48d38ffe46 Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

d4d617c85e Merge pull request 'update profile' (#68 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#68

690b2b8d29 Merge pull request 'Upload 2024-03-06' (#69 ) from staging into master

Reviewed-on: ibnu/generic-ospro-frontend#69

2ac48e8975 Resolved conflicts

f698e703aa Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend

69adde5b16 create limitasi user

17f2663f48 create new table master widget

1486b9c8f9 Merge pull request 'dev-khaidir' (#70 ) from dev-khaidir into staging

Reviewed-on: ibnu/generic-ospro-frontend#70

2c523a6d5d fix fn login

4980728d52 Merge pull request 'fix fn login' (#71 ) from dev-khaidir into staging

Reviewed-on: ibnu/generic-ospro-frontend#71

5f1f47d7e9 set last company id

b91480143b update akses untuk super admin

aacceb9530 update kanban

ca29b6a68b update profile for super admin

7974087a98 Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

dffb6f58eb update customer selection

bf2f1df05b update id to company_menu.menu_id

d712508ade update all_project condition

68a542dbd0 update is_customer

4f88e93dfa add STORAGE_LIMIT_INFORMATION_ALL_COMPANY apiConst

419b7c0068 Merge pull request 'dev-wahyun' (#72 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#72

38ffdad5d1 use menu id

9851a7b2a9 Merge pull request 'use menu id' (#73 ) from dev-wahyu into staging

Reviewed-on: ibnu/generic-ospro-frontend#73

3c8a0f1b0c document delete

180eed052a transaction const

0070eea3ff transaction feature

f7030f7303 route transaction management

48fcb5247b file uploaded

036fb02ed1 update menu roles

ded7a62f75 set before update

33cafadfcb Merge pull request 'dev-wahyun' (#74 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#74

5759fd19f0 Merge pull request 'update menu roles' (#75 ) from dev-wahyu into staging

Reviewed-on: ibnu/generic-ospro-frontend#75

c9e7d9bdd7 menu transaction

fb0c004edb Merge pull request 'menu transaction' (#76 ) from dev-khaidir into staging

Reviewed-on: ibnu/generic-ospro-frontend#76

336e862164 add apiConst

01da207505 add state

d62b85f015 add image url

7d951d4532 Enterprise condition

2c9de77ce2 add state

f08e16d67d add state

2c4b8a48d1 update file input

a8de9dd6a3 update payload & add state

51d33a6325 update url image

d64b7175be Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

9f2a268d83 Merge pull request 'dev-wahyun' (#77 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#77

7aa5ff73ec Merge pull request 'Upload 02-04-2024' (#78 ) from staging into master

Reviewed-on: ibnu/generic-ospro-frontend#78

a74bb9063b update url embedd gantt

a06e4d2f22 update cluster directory

3839ec7159 typo in condition project search

ee1417f75c fix project information

a155078230 Merge pull request 'update cluster directory' (#79 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#79

4a699c16d5 Merge pull request 'upload 2024-04-23' (#80 ) from staging into master

Reviewed-on: ibnu/generic-ospro-frontend#80

a50f9b93e9 fix(transaction): merge limit user to transaction management feature

39db22fce5 fix(search table case sensitive): fixed search to case sensitive

3d5a4952fb fix(assign cust project): update props token

ffeac282a0 fix(form proyek): Update default budget

5890b487a6 fix(report analysis): update header modal & tofixed value column

3ec6759f96 fix(project information): update header table & add Nilai Kontrak

eaa33637ca fix(clear comment): delete comment

f372803789 fix: change name route

51566464de fix(profile): update condition for Super Admin

e6383ae087 fix: delete console.log

a2d7c837cc feat(project type): add form multi location

2c5996a506 fix: update layout

bdb9960f49 fix: update value column

4562195c56 fix: fixed format day

212c70d068 Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

e924d49808 Merge pull request 'dev-wahyun' (#81 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#81

cc23b82d3d Merge pull request 'upload 2024-05-06' (#82 ) from staging into master

Reviewed-on: ibnu/generic-ospro-frontend#82

c96031ae6e fix: Currency symbol default value

9b503dbbeb Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

e0c11e6236 fix: typo header image

e7097af2f8 fix(iFrame): add param iframe gantt

33b94e0e86 Merge pull request 'dev-wahyun' (#83 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#83

605f63565d Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

ade4651bdc Merge pull request 'dev-wahyun' (#85 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#85

e712f609a6 fix(deleted): delete Dashboard DND

d665ccfd50 fix(default header): undo

e9a3adf796 fix(props): adding props for gantt iframe

63a76dc108 fix: comment variabel not used

07a5b30902 fix(delete dependecies): remove on dependencies Dashboard

b2ab5eeb41 Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

35f33a062d Merge pull request 'dev-wahyun' (#86 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#86

c3d6b181ab fix: adding props in gantt

e2f46d081a Merge pull request 'fix: adding props in gantt' (#88 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#88

cf01b2be23 fix: fixed role menu

6426cc7942 fix: deleted comment

f7cae3841c Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

40812f9142 feat: add type paket in company management

075f6bbda4 fix: add props & adding multi location hierarchy

b7e4e46462 fix: update props in report analysis

432e4cb04c fix: deleted header table

4585cd07e4 fix: update props

442c87a063 Merge pull request 'dev-wahyun' (#90 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#90

3ee8461e69 fix: update props in gantt

33c11268b3 feat: add enterprise select option

4392e06e58 Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

6a777a0869 fix: payload & validation form

488524b225 Merge pull request 'dev-wahyun' (#92 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#92

72e58e3080 fix: handle alert message & close modal

0fd93ffdce Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

4bfa81891a Merge pull request 'dev-wahyun' (#94 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#94

853edde2d4 fix: company_id is null & default value in default page

efeff13c43 Merge pull request 'dev-wahyun' (#95 ) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#95

b9c39b6320 feat(chart): update labels request by client

978d8af20b feat(project): add new field income yearly and value contract

afe27475dd fix(label): change label project charter to indentitas proyek

453d330e1b feat(docker):setting docker si

c048788578 Merge branch 'master' of https://git.oslog.id/ordo/surveyor_indonesia_frontend

75e3e90272 fix(api): set API SI

415d6fd0f3 Merge branch 'master' of https://git.oslog.id/ordo/surveyor_indonesia_frontend

d6aec6f384 remove console log

753c5cc189 fix(gantt): change url gantt

a4186d5e41 fix(dashboard): change view chart in dashboard BOD

615b0a45df fix: gantt token

83722aa6ca feat: set row page in localstorage

farhantock merged commit 13338d1a0d into staging 7 months ago

farhantock referenced this issue from a commit 7 months ago

Merge pull request 'dev-wahyun' (#1) from dev-wahyun into staging

The pull request has been merged as 13338d1a0d.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.