Commits · 5b7beb733d6d057e9f00bdf1796f96b6f5dcfd2e · red-group-test / red-ci-cd

24 Mar, 2020 6 commits
- Merge branch 'product-staging' into 'product-demo' · 5b7beb73
  Gladys Forte authored Mar 24, 2020
```
Product staging

See merge request rms/Backend/api-main-service!1029
```
  5b7beb73
- Merge branch 'product-sit' into 'product-staging' · dfef78c8
  Gladys Forte authored Mar 24, 2020
```
Product sit

See merge request rms/Backend/api-main-service!1028
```
  dfef78c8
- Merge branch 'product-dev' into 'product-sit' · 20ab5bf3
  Gladys Forte authored Mar 24, 2020
```
Product dev

See merge request rms/Backend/api-main-service!1027
```
  20ab5bf3
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 7b6e8be1
  Gladys Forte authored Mar 24, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1026
```
  7b6e8be1
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 8242e237
  Gladys Forte authored Mar 24, 2020
```
updated DB for sprint RMS.v2.2

See merge request rms/Backend/api-main-service!1025
```
  8242e237
- updated DB for sprint RMS.v2.2 · 57265087
  Gladys Forte authored Mar 24, 2020
  
  57265087
23 Mar, 2020 9 commits
- Merge branch 'product-sit' into 'product-staging' · f36b891d
  Gladys Forte authored Mar 23, 2020
```
Product sit

See merge request rms/Backend/api-main-service!1024
```
  f36b891d
- Merge branch 'product-dev' into 'product-sit' · 7f4281dc
  Gladys Forte authored Mar 23, 2020
```
Product dev

See merge request rms/Backend/api-main-service!1023
```
  7f4281dc
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 49a6ed46
  Gladys Forte authored Mar 23, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1022
```
  49a6ed46
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · a50f1000
  Gladys Forte authored Mar 23, 2020
```
{devbugfix} added function for form save - changing template

See merge request rms/Backend/api-main-service!1021
```
  a50f1000
- {devbugfix} added function for form save - changing template · 9b9884a0
  Gladys Forte authored Mar 23, 2020
  
  9b9884a0
- Merge branch 'product-dev' into 'product-sit' · 56ac766d
  Gladys Forte authored Mar 23, 2020
```
Product dev

See merge request rms/Backend/api-main-service!1020
```
  56ac766d
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 42f9ca73
  Gladys Forte authored Mar 23, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1019
```
  42f9ca73
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 723e5b81
  Gladys Forte authored Mar 23, 2020
```
updated postman

See merge request rms/Backend/api-main-service!1018
```
  723e5b81
- updated postman · 4a2779c4
  Gladys Forte authored Mar 23, 2020
  
  4a2779c4
20 Mar, 2020 9 commits
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 7bfd8308
  Gladys Forte authored Mar 20, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1017
```
  7bfd8308
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 42fe0810
  Gladys Forte authored Mar 20, 2020
```
{devbugfix} validations asset type, asset group, initial api for dashboard

See merge request rms/Backend/api-main-service!1016
```
  42fe0810
- {devbugfix} validations asset type, asset group, initial api for dashboard · 83ad148a
  Gladys Forte authored Mar 20, 2020
  
  83ad148a
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 0e63bf57
  Gladys Forte authored Mar 20, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1015
```
  0e63bf57
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 1f4cc192
  Gladys Forte authored Mar 20, 2020
```
{devbugfix} update on ams url naming convention

See merge request rms/Backend/api-main-service!1014
```
  1f4cc192
- {devbugfix} update on ams url naming convention · 739f8644
  Gladys Forte authored Mar 20, 2020
  
  739f8644
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 9356a3d8
  Gladys Forte authored Mar 20, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1013
```
  9356a3d8
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 2c581230
  Gladys Forte authored Mar 20, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!1012
```
  2c581230
- {devbugfix} asset group serializer counts · 23a367a5
  Gladys Forte authored Mar 20, 2020
  
  23a367a5
19 Mar, 2020 12 commits
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 139b3f63
  John Red Medrano authored Mar 19, 2020
```
Feature/rms.v2.1 ams

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

See merge request rms/Backend/api-main-service!1009
```
  c961b6ee
- {dev bugfix} set ams_asset_to_assetdetail from ams_asset_to_assetgroup the... · 920fa1a7
  John Red Medrano authored Mar 19, 2020
```
{dev bugfix} set ams_asset_to_assetdetail from ams_asset_to_assetgroup the reverse relation of AMSAsset
```
  920fa1a7
- 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
- Merge branch 'product-dev' into 'product-sit' · a06c967a
  Gladys Forte authored Mar 19, 2020
```
Product dev

See merge request rms/Backend/api-main-service!1003
```
  a06c967a
18 Mar, 2020 4 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