Commits · 7a26029140e77b989a7a2289d382763ced2c843b · red-group-test / red-ci-cd · GitLab

26 Nov, 2019 32 commits
- cancelled email temp update · 7a260291
  Gladys Forte authored Nov 26, 2019
  
  7a260291
- comment · 49dfa630
  Gladys Forte authored Nov 26, 2019
  
  49dfa630
- Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into gladys-dev2 · c41be153
  Gladys Forte authored Nov 26, 2019
  
  c41be153
- cancel email · 7abb6bf1
  Gladys Forte authored Nov 26, 2019
  
  7abb6bf1
- Merge pull request #507 in RMS/api-main-service from red-develop to RMSv2 · 6f97c5d6
  John Red Medrano authored Nov 26, 2019
```
* commit 'e059317a':
  testing html to pdf
```
  6f97c5d6
- Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop · e059317a
  John Red Medrano authored Nov 26, 2019
  
  e059317a
- testing html to pdf · 69dd6f70
  John Red Medrano authored Nov 26, 2019
  
  69dd6f70
- Merge pull request #506 in RMS/api-main-service from red-develop to RMSv2 · 64bb9c4a
  John Red Medrano authored Nov 26, 2019
```
* commit 'e660fcbc':
  update env.ini template
```
  64bb9c4a
- Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop · e660fcbc
  John Red Medrano authored Nov 26, 2019
  
  e660fcbc
- update env.ini template · 124d290a
  John Red Medrano authored Nov 26, 2019
  
  124d290a
- Merge pull request #505 in RMS/api-main-service from gladys-dev2 to RMSv2 · b1350602
  Gladys Forte authored Nov 26, 2019
```
* commit 'ad908fe6':
  bug fi
```
  b1350602
- bug fi · ad908fe6
  Gladys Forte authored Nov 26, 2019
  
  ad908fe6
- Merge pull request #504 in RMS/api-main-service from gladys-dev2 to RMSv2 · a605101f
  Gladys Forte authored Nov 26, 2019
```
* commit '860332ff':
  err
```
  a605101f
- err · 860332ff
  Gladys Forte authored Nov 26, 2019
  
  860332ff
- Merge pull request #503 in RMS/api-main-service from gladys-dev2 to RMSv2 · 7657d56c
  Gladys Forte authored Nov 26, 2019
```
* commit '14d5d85e':
  comments
  print
```
  7657d56c
- comments · 14d5d85e
  Gladys Forte authored Nov 26, 2019
  
  14d5d85e
- Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into gladys-dev2 · 31e4c667
  Gladys Forte authored Nov 26, 2019
  
  31e4c667
- print · 8f876860
  Gladys Forte authored Nov 26, 2019
  
  8f876860
- Merge pull request #502 in RMS/api-main-service from gladys-dev2 to RMSv2 · bcc1cf23
  Gladys Forte authored Nov 26, 2019
```
* commit '788cece9':
  comment deleg
```
  bcc1cf23
- comment deleg · 788cece9
  Gladys Forte authored Nov 26, 2019
  
  788cece9
- Merge pull request #501 in RMS/api-main-service from gladys-dev2 to RMSv2 · 9369e7f1
  Gladys Forte authored Nov 26, 2019
```
* commit 'a9d04f35':
  form approver serializer
```
  9369e7f1
- form approver serializer · a9d04f35
  Gladys Forte authored Nov 26, 2019
  
  a9d04f35
- Merge pull request #500 in RMS/api-main-service from red-develop to RMSv2 · 0ba423f4
  John Red Medrano authored Nov 26, 2019
```
* commit '937e7b5e':
  bug fix on company name and company code template user list endpoint
```
  0ba423f4
- Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop · 937e7b5e
  John Red Medrano authored Nov 26, 2019
  
  937e7b5e
- bug fix on company name and company code template user list endpoint · 60132fcb
  John Red Medrano authored Nov 26, 2019
  
  60132fcb
- Merge pull request #499 in RMS/api-main-service from gladys-dev2 to RMSv2 · 50fdf03c
  Gladys Forte authored Nov 26, 2019
```
* commit '3d40aff4':
  approver serializer
```
  50fdf03c
- approver serializer · 3d40aff4
  Gladys Forte authored Nov 26, 2019
  
  3d40aff4
- Merge pull request #498 in RMS/api-main-service from red-develop to RMSv2 · dc8f4a7b
  John Red Medrano authored Nov 26, 2019
```
* commit '7e294b20':
  removed password on endpoint of user list on routing table and bug fix on template user list
```
  dc8f4a7b
- removed password on endpoint of user list on routing table and bug fix on template user list · 7e294b20
  John Red Medrano authored Nov 26, 2019
  
  7e294b20
- Merge pull request #497 in RMS/api-main-service from red-develop to RMSv2 · 53b90faa
  John Red Medrano authored Nov 26, 2019
```
* commit 'd7cd4df2':
  added company and department object on template user list
```
  53b90faa
- Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop · d7cd4df2
  John Red Medrano authored Nov 26, 2019
  
  d7cd4df2
- added company and department object on template user list · a1533c35
  John Red Medrano authored Nov 26, 2019
  
  a1533c35
25 Nov, 2019 8 commits
- Merge pull request #496 in RMS/api-main-service from gladys-dev2 to RMSv2 · f0738f13
  Gladys Forte authored Nov 25, 2019
```
* commit 'd6791867':
  cancelled email
```
  f0738f13
- cancelled email · d6791867
  Gladys Forte authored Nov 25, 2019
  
  d6791867
- Merge pull request #495 in RMS/api-main-service from red-develop to RMSv2 · e79f5c1d
  John Red Medrano authored Nov 25, 2019
```
* commit '49f9b3cc':
  fixing bug
```
  e79f5c1d
- fixing bug · 49f9b3cc
  John Red Medrano authored Nov 25, 2019
  
  49f9b3cc
- Merge pull request #494 in RMS/api-main-service from red-develop to RMSv2 · f176e396
  John Red Medrano authored Nov 25, 2019
```
* commit 'becdd9c7':
  change json format at endpoint user-format-download
```
  f176e396
- change json format at endpoint user-format-download · becdd9c7
  John Red Medrano authored Nov 25, 2019
  
  becdd9c7
- Merge pull request #493 in RMS/api-main-service from gladys-dev2 to RMSv2 · 6992c5ef
  Gladys Forte authored Nov 25, 2019
```
* commit 'bb9f625e':
  cancelled action
```
  6992c5ef
- merge · bb9f625e
  Gladys Forte authored Nov 25, 2019
  
  bb9f625e