Commit Graph

1262 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
95a055d1ae Missing parameters 2020-02-12 22:22:06 -05:00
Pfeil, Scott Robert
3374dcd3ba Revert "Merge branch 'feature/action_fixes' into 'develop'"
This reverts merge request !55
2020-02-12 22:12:27 -05:00
Pfeil, Scott Robert
1439afa56d Merge branch 'feature/action_fixes' into 'develop'
missing action params

See merge request BPHV_MIPS/mvm_core!55
2020-02-12 22:07:30 -05:00
Pfeil, Scott Robert
1461c55aad Merge branch 'bugfix/label_model_fix' into 'develop'
Codable Change

See merge request BPHV_MIPS/mvm_core!56
2020-02-12 22:05:50 -05:00
Pfeil, Scott Robert
f061c02915 name fix 2020-02-12 21:55:27 -05:00
Pfeil, Scott Robert
441fb0c0e1 Small fix and clean 2020-02-12 21:35:55 -05:00
Kevin G Christiano
a7c25f0bdf indentation 2020-02-12 16:13:26 -05:00
Kevin G Christiano
ea6089e772 conflict resoltuion 2020-02-12 14:40:40 -05:00
Kevin G Christiano
4fa67d8138 Merge branch 'develop'
Conflicts:
	MVMCore/MVMCore/Models/ModelMapping.swift
2020-02-12 14:17:14 -05:00
Kevin G Christiano
ffd61f91c3 integrating changes to make fan out instance models into categories due to name conflicts 2020-02-12 14:14:01 -05:00
Suresh, Kamlesh
c1a0ea7f68 more junk of MF 2020-02-12 11:53:36 -05:00
Suresh, Kamlesh
f8f12b5e30 missing action params 2020-02-12 11:35:50 -05:00
Kevin G Christiano
53e05ca42f integrating changes to make fan out instance models into categories due to name conflicts 2020-02-12 11:25:03 -05:00
Suresh, Kamlesh Jain
0cb1d4de5d Merge branch 'feature/open_panel_model' into 'develop'
Adding open panel model for opening support panel.

See merge request BPHV_MIPS/mvm_core!53
2020-02-12 10:03:23 -05:00
Khan, Arshad
939316a930 Adding open panel model for opening support panel. 2020-02-12 20:26:08 +05:30
Pfeil, Scott Robert
fd76691410 Merge branch 'feature/cancellable_alerts' into 'develop'
Add methods that will cancel pending or executing alert operations.

See merge request BPHV_MIPS/mvm_core!50
2020-02-12 09:24:53 -05:00
Hedden, Kyle Matthew
34fa65d498 Add methods that will cancel pending or executing alert operations. 2020-02-12 09:24:52 -05:00
Pan, Xinlei (Ryan)
605959a58f Merge branch 'bugfix/dropdown_issue' into 'develop'
type change to accommodate dictionary comparison.

See merge request BPHV_MIPS/mvm_core!51
2020-02-06 14:16:58 -05:00
Kevin G Christiano
1b5aba33f9 type change to accommodate dictionary comparison. 2020-02-06 11:11:09 -05:00
Suresh, Kamlesh Jain
13ba3764cf Merge branch 'feature/coding' into 'develop'
Feature/coding

See merge request BPHV_MIPS/mvm_core!41
2020-01-24 17:11:38 -05:00
Suresh, Kamlesh
7b50474d27 logs 2020-01-23 17:05:18 -05:00
Suresh, Kamlesh
e661ff8079 back to 0 2020-01-23 14:47:41 -05:00
Suresh, Kamlesh
3db60ff26b fixes 2020-01-23 14:46:32 -05:00
Suresh, Kamlesh Jain
e2dab082d1 Merge branch 'feature/action_openurl' into 'feature/coding'
Missing properties added for openURL

See merge request BPHV_MIPS/mvm_core!49
2020-01-23 10:40:00 -05:00
Suresh, Kamlesh
1da5034dc6 comments 2020-01-23 10:39:09 -05:00
Suresh, Kamlesh
79b894e582 remove optional property from init 2020-01-23 10:37:09 -05:00
Chintakrinda, Arun Kumar (Arun)
f86c6fd5d2 Missing properties added for openURL 2020-01-23 17:02:25 +05:30
Pfeil, Scott Robert
74f77eca35 merge 2020-01-21 15:48:16 -05:00
Pfeil, Scott Robert
6190a37336 name change 2020-01-21 15:47:03 -05:00
Xinlei(Ryan) Pan
2b27853d77 remove unneeded code 2020-01-21 15:00:49 -05:00
Suresh, Kamlesh
694f465027 title 2020-01-17 12:27:40 -05:00
Suresh, Kamlesh
594992dcf7 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core into feature/coding 2020-01-16 17:21:18 -05:00
Suresh, Kamlesh
6e9a622ae5 extrameters 2020-01-16 17:21:05 -05:00
Suresh, Kamlesh
153dc072be 0 2020-01-16 14:14:51 -05:00
Suresh, Kamlesh
25f7dfe0d7 merge 2020-01-15 18:36:38 -05:00
Suresh, Kamlesh
2c78fa2e7e openURL 2020-01-15 18:33:55 -05:00
Suresh, Kamlesh
ccaba9b0b4 action type 2020-01-15 16:29:36 -05:00
Suresh, Kamlesh
34ea20934a 0 2020-01-15 13:36:31 -05:00
Suresh, Kamlesh
a23efe668a extra params 2020-01-15 13:33:46 -05:00
Suresh, Kamlesh
731f3b811a openURL 2020-01-14 21:26:03 -05:00
Pfeil, Scott Robert
03f387487f actionType fix 2020-01-14 10:13:21 -05:00
Pfeil, Scott Robert
148e556ddb make the error throwable 2020-01-14 09:12:11 -05:00
Pfeil, Scott Robert
68695e9839 move register to init for now
dash line update temporary for legacy
2020-01-13 15:28:52 -05:00
Pfeil, Scott Robert
54a598344f Merge branch 'feature/coding_action_map' into feature/coding 2020-01-13 12:28:04 -05:00
Pfeil, Scott Robert
a9da777f56 Line items update 2020-01-13 09:38:40 -05:00
panxi
b3d293634f Merge branch 'develop' into feature/coding 2020-01-09 16:18:35 -05:00
Pfeil, Scott Robert
e2885b0f78 Percent 2020-01-08 14:27:11 -05:00
Pfeil, Scott Robert
74f7826e4b Colors 2020-01-08 13:22:47 -05:00
Pfeil, Scott Robert
7d55f7d41b Merge branch 'feature/coding' into feature/coding_action_map 2020-01-08 13:11:39 -05:00
Pfeil, Scott Robert
7c1bef990b property wrappers 2020-01-08 13:11:11 -05:00