Commit Graph

1012 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
cc2e4751f5 merge 2019-11-25 09:09:45 -05:00
Pfeil, Scott Robert
d884602d87 tweaks 2019-11-25 09:06:09 -05:00
Pfeil, Scott Robert
dd85a134ac merge 2019-11-25 09:05:32 -05:00
Suresh, Kamlesh
7b2fc7bfba some more stuff 2019-11-21 11:53:26 -05:00
Suresh, Kamlesh Jain
8be65d4f57 Merge branch 'bugfix/bad_project_import' into 'develop'
Remote Scott's missing test controller.

See merge request BPHV_MIPS/mvm_core_ui!184
2019-11-20 17:30:52 -05:00
Hedden, Kyle Matthew
3944e02863 Remote Scott's missing test controller. 2019-11-20 17:30:52 -05:00
Pfeil, Scott Robert
7429fede9a Merge branch 'feature/modernize' into 'develop'
Feature/modernize

See merge request BPHV_MIPS/mvm_core_ui!182
2019-11-20 14:10:35 -05:00
Pfeil, Scott Robert
095b1d7a86 Merge branch 'feature/modernize' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 13:29:41 -05:00
Pfeil, Scott Robert
e32b9cfdda PR comments 2019-11-20 13:29:16 -05:00
Pfeil, Scott Robert
947af9b3c7 why? 2019-11-20 11:08:30 -05:00
Pfeil, Scott Robert
654be26b2c remove test file 2019-11-20 11:06:47 -05:00
Pfeil, Scott Robert
279dbd9b08 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 10:59:35 -05:00
Pfeil, Scott Robert
c96f5050a8 Line to swift 2019-11-20 10:20:24 -05:00
Hedden, Kyle Matthew
a714100b73 Merge branch 'release/7_1_0' into 'develop'
Release/7 1 0

See merge request BPHV_MIPS/mvm_core_ui!179
2019-11-19 17:02:45 -05:00
Suresh, Kamlesh Jain
ec9ac811d5 Merge branch 'feature/coding' into 'feature/models'
Feature/coding

See merge request BPHV_MIPS/mvm_core_ui!174
2019-11-19 16:02:51 -05:00
Suresh, Kamlesh
bf20fb3104 fixes 2019-11-19 15:32:35 -05:00
Pfeil, Scott Robert
f9619b8cb4 Merge branch 'bugfix/checkbox' into 'develop'
make checkbox expandable

See merge request BPHV_MIPS/mvm_core_ui!178
2019-11-19 12:59:52 -05:00
panxi
a409b331c5 revert 2019-11-19 12:56:07 -05:00
panxi
3851ad036a change to equal 2019-11-19 12:53:48 -05:00
panxi
3cb075499e make checkbox expandable 2019-11-19 10:39:30 -05:00
Pfeil, Scott Robert
82f94cde25 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-19 09:18:45 -05:00
Pfeil, Scott Robert
d29e8ea3bd small changes 2019-11-19 09:18:15 -05:00
Pan, Xinlei (Ryan)
6e17e36d64 Merge branch 'feature/topacc' into 'release/7_1_0'
add top accessory view

See merge request BPHV_MIPS/mvm_core_ui!176
2019-11-15 17:15:56 -05:00
Pan, Xinlei (Ryan)
9f8681f12f Merge branch 'revert-0ed49c65' into 'develop'
Revert "Merge branch 'feature/top_accessory' into 'develop'"

See merge request BPHV_MIPS/mvm_core_ui!177
2019-11-15 16:54:13 -05:00
Suresh, Kamlesh Jain
8376e5c79e Revert "Merge branch 'feature/top_accessory' into 'develop'"
This reverts merge request !175
2019-11-15 16:53:18 -05:00
Suresh, Kamlesh
a865664cff add top accessory view 2019-11-15 16:52:13 -05:00
Suresh, Kamlesh Jain
0ed49c65e1 Merge branch 'feature/top_accessory' into 'develop'
top accessory view

See merge request BPHV_MIPS/mvm_core_ui!175
2019-11-15 14:36:08 -05:00
Suresh, Kamlesh
89cbfe00ba clean up 2019-11-15 12:09:20 -05:00
Suresh, Kamlesh
cd5f66875d Merge branch 'feature/top_accessory' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/top_accessory 2019-11-15 11:42:34 -05:00
Suresh, Kamlesh
84f50f3b80 optimize 2019-11-15 11:42:29 -05:00
Murugan, Vimal
76cd37d121 code cleanup 2019-11-15 21:10:37 +05:30
Suresh, Kamlesh
627114ded8 top accessory in tableview controller 2019-11-14 19:27:56 -05:00
Suresh, Kamlesh
f1b8a61e04 top accessory view 2019-11-14 18:15:22 -05:00
panxi
478498a9b6 Separate action and molecule name 2019-11-13 18:02:40 -05:00
panxi
1a3d3eb36f update with new code, move core code to mvmcore 2019-11-12 17:36:00 -05:00
panxi
4111080497 Merge branch 'develop' into feature/models 2019-11-12 15:28:38 -05:00
Pfeil, Scott Robert
716dcff566 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-12 14:45:48 -05:00
Pfeil, Scott Robert
835eb3a43b Merge branch 'feature/twobuttonview_secondary_button_fix' into 'develop'
Adding support for displaying only secondaryButton on server dynamic response

See merge request BPHV_MIPS/mvm_core_ui!172
2019-11-11 15:51:33 -05:00
Pfeil, Scott Robert
f9cecb9a5d small code updates 2019-11-11 15:24:10 -05:00
Khan, Arshad
11e549bc50 Feedback implementation impact changes. 2019-11-11 22:47:49 +05:30
Khan, Arshad
f6c2935115 Implemented Scott feedback. 2019-11-11 22:41:24 +05:30
Khan, Arshad
a5186973ae Adding support for secondaryButton, if server dynamically sends only secondary button in TwoButtonView molecule. 2019-11-11 21:27:08 +05:30
Pfeil, Scott Robert
273da70f55 Merge branch 'feature/PPVB_653' into 'develop'
moved top and bottom pin to scrolling view controller

See merge request BPHV_MIPS/mvm_core_ui!169
2019-11-11 09:13:39 -05:00
Suresh, Kamlesh Jain
51beb7e3e2 Merge branch 'feature/make_molecules_info_public' into 'develop'
Making moleculesInfo public for providing flexibility in sub classes.

See merge request BPHV_MIPS/mvm_core_ui!170
2019-11-11 08:20:44 -05:00
Khan, Arshad
068c702143 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/make_molecules_info_public 2019-11-11 14:56:38 +05:30
Pan, Xinlei (Ryan)
2cf5d096e8 Merge branch 'feature/form_changes' into 'develop'
fixes

See merge request BPHV_MIPS/mvm_core_ui!168
2019-11-08 16:26:25 -05:00
Khan, Arshad
32c04e05ba Making moleculesInfo public for providing flexibility in sub classes.
As of now required for Settings template in MF code.
2019-11-08 23:26:07 +05:30
Murugan, Vimal
14f6861493 moved top and bottom pin to scrolling view controller 2019-11-08 22:11:56 +05:30
Suresh, Kamlesh
a212dff80f fixes 2019-11-07 10:45:40 -05:00
Pfeil, Scott Robert
347ebbed8c typo fixes 2019-11-07 10:05:17 -05:00