Commits · 88b33160c0ccbae1c372f831f74f0ed3a3000e33 · Dida Adams Arizona / Tia-dev

08 Aug, 2020 1 commit
- Merge branch 'rifka' into 'master' · 88b33160
  Deni Rinaldi authored Aug 08, 2020
```
add approval matrix page and route

See merge request !18
```
  88b33160
07 Aug, 2020 20 commits
- add approval matrix route · 20f884d8
  Rifka Kurnia Irfiana authored Aug 07, 2020
  
  20f884d8
- Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka · eb765229
  Rifka Kurnia Irfiana authored Aug 07, 2020
  
  eb765229
- Merge branch 'riri' into 'master' · f9bd77ae
  Deni Rinaldi authored Aug 07, 2020
```
Update

See merge request !17
```
  f9bd77ae
- Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri · 980ef048
  EKSAD authored Aug 07, 2020
  
  980ef048
- update reset · 5494a3a8
  EKSAD authored Aug 07, 2020
  
  5494a3a8
- Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka · 1c965028
  Rifka Kurnia Irfiana authored Aug 07, 2020
  
  1c965028
- Merge branch 'didam' into 'master' · b4a4a132
  Dida Adams Arizona authored Aug 07, 2020
```
Didam

See merge request !16
```
  b4a4a132
- Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into didam · 0d02d36e
  d.arizona authored Aug 07, 2020
  
  0d02d36e
- update sidebar · 829f004f
  d.arizona authored Aug 07, 2020
  
  829f004f
- update conflict · 756bfb0c
  Rifka Kurnia Irfiana authored Aug 07, 2020
  
  756bfb0c
- add page approval matrix · 3e125b35
  Rifka Kurnia Irfiana authored Aug 07, 2020
  
  3e125b35
- Merge branch 'deni-dev(pc)' into 'master' · 786a5493
  Deni Rinaldi authored Aug 07, 2020
```
table

See merge request !15
```
  786a5493
- table · 78a99b71
  Deni Rinaldi authored Aug 07, 2020
  
  78a99b71
- update login · abc6206f
  EKSAD authored Aug 07, 2020
  
  abc6206f
- Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri · 44f94453
  EKSAD authored Aug 07, 2020
  
  44f94453
- Merge branch 'rifka' into 'master' · ad9f1c0e
  Deni Rinaldi authored Aug 07, 2020
```
push package json

See merge request !14
```
  ad9f1c0e
- push package json · 5bca87e5
  Rifka Kurnia Irfiana authored Aug 07, 2020
  
  5bca87e5
- Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri · 50c2ff1e
  EKSAD authored Aug 07, 2020
  
  50c2ff1e
- Merge branch 'riri' into 'master' · eb75fed1
  Dida Adams Arizona authored Aug 07, 2020
```
login

See merge request !12
```
  eb75fed1
- Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri · fd41235f
  EKSAD authored Aug 07, 2020
  
  fd41235f
06 Aug, 2020 18 commits
- Merge branch 'didam' into 'master' · ffc3cefd
  Dida Adams Arizona authored Aug 06, 2020
```
Didam

See merge request !13
```
  ffc3cefd
- Merge branch 'master' into 'didam' · 8514124b
  Dida Adams Arizona authored Aug 06, 2020
```
# Conflicts:
#   src/router/index.js
```
  8514124b
- apdet · a8e85ee2
  d.arizona authored Aug 06, 2020
  
  a8e85ee2
- update · 06f2c78b
  d.arizona authored Aug 06, 2020
  
  06f2c78b
- Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri · 3fb62e85
  EKSAD authored Aug 06, 2020
  
  3fb62e85
- login · 37b6b859
  EKSAD authored Aug 06, 2020
  
  37b6b859
- Merge branch 'riri' into 'master' · d6c0ffe1
  Deni Rinaldi authored Aug 06, 2020
```
update

See merge request !11
```
  d6c0ffe1
- update · 41f8c790
  EKSAD authored Aug 06, 2020
  
  41f8c790
- Merge branch 'deni-dev(pc)' into 'master' · cb84b34d
  Deni Rinaldi authored Aug 06, 2020
```
lockjson

See merge request !9
```
  cb84b34d
- lockjson · 7084f8d7
  Deni Rinaldi authored Aug 06, 2020
  
  7084f8d7
- Merge branch 'deni-dev(pc)' into 'master' · 1bf93009
  Deni Rinaldi authored Aug 06, 2020
```
Deni dev(pc)

See merge request !8
```
  1bf93009
- tinggalan · 3e36f6d8
  Deni Rinaldi authored Aug 06, 2020
  
  3e36f6d8
- tinggalan · 80ef9162
  Deni Rinaldi authored Aug 06, 2020
  
  80ef9162
- datatable · 8437169c
  Deni Rinaldi authored Aug 06, 2020
  
  8437169c
- Merge branch 'deni-dev(pc)' into 'master' · ead05b18
  Deni Rinaldi authored Aug 06, 2020
```
path

See merge request !6
```
  ead05b18
- path · 051c6950
  Deni Rinaldi authored Aug 06, 2020
  
  051c6950
- Merge branch 'deni-dev(pc)' into 'master' · 0e6431c7
  Deni Rinaldi authored Aug 06, 2020
```
pushhh3

See merge request !5
```
  0e6431c7
- pushhh3 · 0e3068a1
  Deni Rinaldi authored Aug 06, 2020
  
  0e3068a1
05 Aug, 2020 1 commit
- Merge branch 'deni-dev(pc)' into 'master' · 78d470ae
  Deni Rinaldi authored Aug 05, 2020
```
dikit dulu

See merge request !4
```
  78d470ae