Commits · c0e9a1b9bea133163ea70aea95314c74b3fcbb97 · red-group-test / red-ci-cd

17 Mar, 2020 6 commits
- added listing for AMS Asset listing and added related name for Asset Stock... · c0e9a1b9
  John Red Medrano authored Mar 17, 2020
```
added listing for AMS Asset listing and added related name for Asset Stock detail on field asset and asset_group
```
  c0e9a1b9
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 9d90f9e1
  Gladys Forte authored Mar 17, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!980
```
  9d90f9e1
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 951ae477
  Gladys Forte authored Mar 17, 2020
```
{devbugfix} added folders asset and asset stock

See merge request rms/Backend/api-main-service!979
```
  951ae477
- {devbugfix} added folders asset and asset stock · 52db2c2e
  Gladys Forte authored Mar 17, 2020
  
  52db2c2e
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · b3dc489e
  Gladys Forte authored Mar 17, 2020
```
Feature/rms.v2.1 ams

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

See merge request rms/Backend/api-main-service!977
```
  91313d42
16 Mar, 2020 4 commits
- {devbugfix} Initial Asset Group and Asset Type Viewsets · 04ac49a5
  Gladys Forte authored Mar 16, 2020
  
  04ac49a5
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 9fdb14d8
  Gladys Forte authored Mar 16, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!976
```
  9fdb14d8
- Merge branch 'feature/RMS.v2.1-AMS' of... · 0d5dd7ab
  Gladys Forte authored Mar 16, 2020
```
Merge branch 'feature/RMS.v2.1-AMS' of http://54.169.104.100:27015/rms/Backend/api-main-service into prod-dev-gladys
```
  0d5dd7ab
- {devbugfix} batchupload create initial · 85612f1a
  Gladys Forte authored Mar 16, 2020
  
  85612f1a
13 Mar, 2020 1 commit
- {devbugfix} batchupload template update for AMS Privilege · 378e1186
  Gladys Forte authored Mar 13, 2020
  
  378e1186
12 Mar, 2020 5 commits
- {devbugfix} initial ams privilege on batchupload · 39b008b7
  Gladys Forte authored Mar 12, 2020
  
  39b008b7
- Merge branch 'red-develop' into 'product-dev' · e1f9f23c
  John Red Medrano authored Mar 12, 2020
```
{dev bugfix} added transation.atomic with savepoint_rollback on batchupload

See merge request rms/Backend/api-main-service!973
```
  e1f9f23c
- {dev bugfix} added transation.atomic with savepoint_rollback on batchupload · b42bd26b
  John Red Medrano authored Mar 12, 2020
  
  b42bd26b
- Merge branch 'prod-dev-gladys' into 'product-dev' · 519a43c7
  Gladys Forte authored Mar 12, 2020
```
Prod dev gladys

See merge request rms/Backend/api-main-service!972
```
  519a43c7
- {devbugfix} added view_all_template to batchupload · d060a549
  Gladys Forte authored Mar 12, 2020
  
  d060a549
11 Mar, 2020 2 commits
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 767307b7
  Gladys Forte authored Mar 11, 2020
```
{dev bugfix} added condition to delete user update if an app is not selected for access

See merge request rms/Backend/api-main-service!971
```
  767307b7
- {dev bugfix} added condition to delete user update if an app is not selected for access · 2047b90f
  Gladys Forte authored Mar 11, 2020
  
  2047b90f
10 Mar, 2020 12 commits
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 3561e786
  Gladys Forte authored Mar 10, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!969
```
  3561e786
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 9dc0b4ff
  Gladys Forte authored Mar 10, 2020
```
{devbugfix} change body_data to form

See merge request rms/Backend/api-main-service!968
```
  9dc0b4ff
- {devbugfix} change body_data to form · 5c5be98b
  Gladys Forte authored Mar 10, 2020
  
  5c5be98b
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 522c460a
  Gladys Forte authored Mar 10, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!966
```
  522c460a
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · a7cf2e4b
  Gladys Forte authored Mar 10, 2020
```
RMS-PRD-66 - AMS User Privilege Section + DB Schema - change ams usertype to key value format

See merge request rms/Backend/api-main-service!965
```
  a7cf2e4b
- RMS-PRD-66 - AMS User Privilege Section + DB Schema - change ams usertype to key value format · be96a45d
  Gladys Forte authored Mar 10, 2020
  
  be96a45d
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 7eca3ad9
  Gladys Forte authored Mar 10, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!964
```
  7eca3ad9
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 8a4496b9
  Gladys Forte authored Mar 10, 2020
```
{devbugfix} uploaded updated postman

See merge request rms/Backend/api-main-service!963
```
  8a4496b9
- {devbugfix} uploaded updated postman · 932f4e81
  Gladys Forte authored Mar 10, 2020
  
  932f4e81
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 5ad8af64
  Gladys Forte authored Mar 10, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!962
```
  5ad8af64
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · 15f849b6
  Gladys Forte authored Mar 10, 2020
```
RMS-PRD-66 - AMS User Privilege Section + DB Schema

See merge request rms/Backend/api-main-service!961
```
  15f849b6
- RMS-PRD-66 - AMS User Privilege Section + DB Schema · 1fbc31ca
  Gladys Forte authored Mar 10, 2020
  
  1fbc31ca
09 Mar, 2020 8 commits
- Merge branch 'prod-dev-gladys' into 'product-dev' · 6eedb12e
  Gladys Forte authored Mar 09, 2020
```
RMS-PRD-33 - Priority level is not required in CR Template - Default: Normal

See merge request rms/Backend/api-main-service!960
```
  6eedb12e
- RMS-PRD-33 - Priority level is not required in CR Template - Default: Normal · 6cbf44dd
  Gladys Forte authored Mar 09, 2020
  
  6cbf44dd
- fixed merge conflict · 83ee3e74
  Gladys Forte authored Mar 09, 2020
  
  83ee3e74
- Merge branch 'core-staging' into 'core-demo' · 1b393156
  Gladys Forte authored Mar 09, 2020
```
Core staging

See merge request rms/Backend/api-main-service!958
```
  1b393156
- Merge branch 'core-sit' into 'core-staging' · dabcda9d
  Gladys Forte authored Mar 09, 2020
```
Core sit

See merge request rms/Backend/api-main-service!957
```
  dabcda9d
- Merge branch 'core-dev' into 'core-sit' · 261bfb89
  Gladys Forte authored Mar 09, 2020
```
Core dev

See merge request rms/Backend/api-main-service!956
```
  261bfb89
- Merge branch 'core-dev-gladys' into 'core-dev' · 293f392d
  Gladys Forte authored Mar 09, 2020
```
{dev bugfix} get_cms_privilege update

See merge request rms/Backend/api-main-service!953
```
  293f392d
- {dev bugfix} get_cms_privilege update · c74e6025
  Gladys Forte authored Mar 09, 2020
  
  c74e6025
05 Mar, 2020 2 commits
- Merge branch 'red-develop' into 'product-dev' · 36c817a9
  John Red Medrano authored Mar 05, 2020
```
removed gitlab-ci

See merge request rms/Backend/api-main-service!950
```
  36c817a9
- removed gitlab-ci · 1c60c883
  John Red Medrano authored Mar 05, 2020
  
  1c60c883