Commit Graph

381 Commits

Author SHA1 Message Date
Suresh, Kamlesh Jain
56062209ae Merge branch 'feature/release_7_4_0_clone' into 'develop'
Merge release/7_4_0 into develop

See merge request BPHV_MIPS/mvm_core!64
2020-02-27 09:20:51 -05:00
Suresh, Kamlesh Jain
8451a045bc Merge branch 'feature/bundle' into 'develop'
Fixes to allow bundle improvements

See merge request BPHV_MIPS/mvm_core!63
2020-02-19 17:24:18 -05:00
Pfeil, Scott Robert
7f028f0e82 Fixes to allow bundle improvements 2020-02-19 17:12:50 -05:00
Pan, Xinlei (Ryan)
5e2fa47fce Merge branch 'develop' into 'release/7_4_0'
Develop

See merge request BPHV_MIPS/mvm_core!62
2020-02-19 16:32:12 -05:00
Pan, Xinlei (Ryan)
31ecce7bce Merge branch 'feature/molecule_name_fix' into 'release/7_4_0'
fixes

See merge request BPHV_MIPS/mvm_core!61
2020-02-19 16:27:21 -05:00
Suresh, Kamlesh
bc37f7c914 fixes 2020-02-19 16:14:04 -05:00
Pfeil, Scott Robert
0cdcfd0701 Merge branch 'feature/copy_link_test' into 'develop'
New share action

See merge request BPHV_MIPS/mvm_core!59
2020-02-19 12:29:34 -05:00
Kevin G Christiano
9c864e7427 go awway 2020-02-19 11:51:38 -05:00
Kevin G Christiano
8c26522eed nil stuff 2020-02-19 11:46:29 -05:00
Kevin G Christiano
b254ae2c5d choice choice 2020-02-19 11:24:40 -05:00
Kevin G Christiano
d6f8e2aabd no junk 2020-02-19 11:19:57 -05:00
Kevin G Christiano
e457dddb98 making copy security compliant. 2020-02-19 10:47:19 -05:00
Hedden, Kyle Matthew
14e54c8751 Merge branch 'develop' into 'release/7_4_0'
Develop

See merge request BPHV_MIPS/mvm_core!60
2020-02-18 16:44:23 -05:00
Kevin G Christiano
4f5e3c4286 removed err 2020-02-18 15:25:12 -05:00
Kevin G Christiano
908fc0287e adding a new action type. updated action map flow. 2020-02-18 15:17:57 -05:00
Pfeil, Scott Robert
b7a50eb626 Merge branch 'feature/unlock_s7_server_query_params' into 'develop'
Allow server to send initial s7 query parameters.

See merge request BPHV_MIPS/mvm_core!57
2020-02-18 09:48:21 -05:00
Hedden, Kyle Matthew
1b52330968 Allow server to send initial s7 query parameters. 2020-02-18 09:48:19 -05:00
Pan, Xinlei (Ryan)
4d4fb644a7 Merge branch 'feature/postpay_base_change' into 'develop'
convert URLProdPostpayBase

See merge request BPHV_MIPS/mvm_core!54
2020-02-14 14:04:57 -05:00
Hedden, Kyle Matthew
de6d87998e convert URLProdPostpayBase 2020-02-14 14:04:57 -05:00
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