Commits · 5338a671e23148507bc5b326ae750854a394b31d · red-group-test / red-ci-cd

19 Mar, 2020 8 commits
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 5338a671
  Gladys Forte authored Mar 19, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1007
```
  5338a671
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · e63c7383
  Gladys Forte authored Mar 19, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!1006
```
  e63c7383
- {devbugfix} asset serializer unavaible key count · 205b8ced
  Gladys Forte authored Mar 19, 2020
  
  205b8ced
- {devbugfix} updated postman · 1588b3dd
  Gladys Forte authored Mar 19, 2020
  
  1588b3dd
- {devbugfix} asset group view, (asset type, asset group crud) · 5456b122
  Gladys Forte authored Mar 19, 2020
  
  5456b122
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 5f350587
  John Red Medrano authored Mar 19, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1005
```
  5f350587
- Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS' · e9acf28b
  John Red Medrano authored Mar 19, 2020
```
Red develop

See merge request rms/Backend/api-main-service!1004
```
  e9acf28b
- added archived and restore with basic validation for asset and asset stock · 1399876c
  John Red Medrano authored Mar 19, 2020
  
  1399876c
18 Mar, 2020 19 commits
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · b12f3a69
  Gladys Forte authored Mar 18, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1002
```
  b12f3a69
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 00232e1f
  Gladys Forte authored Mar 18, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!1001
```
  00232e1f
- {devbugfix} report serializer fix, asset_type restore, archived · 90cca332
  Gladys Forte authored Mar 18, 2020
  
  90cca332
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 78f4c9a5
  John Red Medrano authored Mar 18, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1000
```
  78f4c9a5
- Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS' · 9a96e3c5
  John Red Medrano authored Mar 18, 2020
```
Red develop

See merge request rms/Backend/api-main-service!999
```
  9a96e3c5
- {dev bugfix} removed read_only_field on serializer added enums · ec309822
  John Red Medrano authored Mar 18, 2020
  
  ec309822
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 7ddd97b9
  John Red Medrano authored Mar 18, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!998
```
  7ddd97b9
- Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS' · 12fc8502
  John Red Medrano authored Mar 18, 2020
```
Red develop

See merge request rms/Backend/api-main-service!997
```
  12fc8502
- update migration file to aviod the conflict of alter fields · 3ecabfd9
  John Red Medrano authored Mar 18, 2020
  
  3ecabfd9
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 5b3898d6
  Gladys Forte authored Mar 18, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!995
```
  5b3898d6
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 951490ab
  Gladys Forte authored Mar 18, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!994
```
  951490ab
- postman · 9f005cc9
  Gladys Forte authored Mar 18, 2020
  
  9f005cc9
- comment · 13be3fe6
  Gladys Forte authored Mar 18, 2020
  
  13be3fe6
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 334df0f9
  John Red Medrano authored Mar 18, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!993
```
  334df0f9
- {devbugfix} updated postman · 4f1ffa57
  Gladys Forte authored Mar 18, 2020
  
  4f1ffa57
- Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS' · 279083e0
  John Red Medrano authored Mar 18, 2020
```
Red develop

See merge request rms/Backend/api-main-service!992
```
  279083e0
- added endpoint for report and report with archived and restore, adjust model... · fef94e66
  John Red Medrano authored Mar 18, 2020
```
added endpoint for report and report with archived and restore, adjust model for AMSREPORT and AMSREPORTTYPE alter deleted_at to is_active added new enums AMSREPORT AMSREPORTYPE for entity logs
```
  fef94e66
- {devbugfix} asset type, asset, asset group, asset stocks archived list · a5a2486b
  Gladys Forte authored Mar 18, 2020
  
  a5a2486b
- Merge branch 'product-dev' of... · cd7ea6df
  Gladys Forte authored Mar 18, 2020
```
Merge branch 'product-dev' of http://54.169.104.100:27015/rms/Backend/api-main-service into prod-dev-gladys
```
  cd7ea6df
17 Mar, 2020 13 commits
- {devbugfix} counts ams list · 7ddd8df1
  Gladys Forte authored Mar 17, 2020
  
  7ddd8df1
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · a5e667ea
  John Red Medrano authored Mar 17, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!991
```
  a5e667ea
- Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS' · 2a582ada
  John Red Medrano authored Mar 17, 2020
```
Red develop

See merge request rms/Backend/api-main-service!990
```
  2a582ada
- modified value of manager and user_client to name instead of code · 6cb4103f
  John Red Medrano authored Mar 17, 2020
  
  6cb4103f
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 5d10c771
  Gladys Forte authored Mar 17, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!989
```
  5d10c771
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · e6088c5c
  Gladys Forte authored Mar 17, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!988
```
  e6088c5c
- {devbugfix} asset type asset group · 0d85f7af
  Gladys Forte authored Mar 17, 2020
  
  0d85f7af
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 2a5d3674
  John Red Medrano authored Mar 17, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!987
```
  2a5d3674
- Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS' · d8ac6cc3
  John Red Medrano authored Mar 17, 2020
```
Red develop

See merge request rms/Backend/api-main-service!986
```
  d8ac6cc3
- added protect on each ams model, new migration file · 2557e5a8
  John Red Medrano authored Mar 17, 2020
  
  2557e5a8
- added endpoint for asset and asset stock list · 2e2e1daa
  John Red Medrano authored Mar 17, 2020
  
  2e2e1daa
- Merge branch 'feature/RMS.v2.1-AMS' of... · 8ce8f8a2
  John Red Medrano authored Mar 17, 2020
```
Merge branch 'feature/RMS.v2.1-AMS' of http://54.169.104.100:27015/rms/Backend/api-main-service into red-develop
```
  8ce8f8a2
- commit this development to pull the latest migration · afbd70c4
  John Red Medrano authored Mar 17, 2020
  
  afbd70c4