Commits · 13be3fe6415bbda363d1729b4b4b56e29afe6c50 · red-group-test / red-ci-cd

18 Mar, 2020 7 commits
- 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 26 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
- Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' · e2390e5e
  Gladys Forte authored Mar 17, 2020
```
{devbugfix} delete old asset group

See merge request rms/Backend/api-main-service!985
```
  e2390e5e
- {devbugfix} delete old asset group · 7d981021
  Gladys Forte authored Mar 17, 2020
  
  7d981021
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · 2db826b1
  John Red Medrano authored Mar 17, 2020
```
Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!984
```
  2db826b1
- Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS' · 25fb7231
  John Red Medrano authored Mar 17, 2020
```
added migration file for the last commit (dbbccbc0)

See merge request rms/Backend/api-main-service!983
```
  25fb7231
- added migration file for the last commit (dbbccbc0 ) · 36d387e5
  John Red Medrano authored Mar 17, 2020
  
  36d387e5
- Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev' · dbbccbc0
  John Red Medrano authored Mar 17, 2020
```
Feature/rms.v2.1 ams

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

See merge request rms/Backend/api-main-service!981
```
  3df0fb89
- 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 2 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