Commit Graph

1493 Commits

Author SHA1 Message Date
Kevin G Christiano
b443c4a389 Reducing constraints. 2019-12-02 17:33:06 -05:00
Kevin G Christiano
65586a7568 Adding another location to execute external code. 2019-12-02 11:05:08 -05:00
Kevin G Christiano
5e28b0bdc5 Merge branch 'develop' into feature/swiftified_textField 2019-12-02 10:43:45 -05:00
Kevin G Christiano
2319c4c70f overrdie applied. 2019-12-02 10:43:08 -05:00
Pfeil, Scott Robert
44fd2dffac Merge branch 'bugfix/label_molecule_fonting' into 'develop'
label font bugfix caused by the dissonance between label and styler setting....

See merge request BPHV_MIPS/mvm_core_ui!192
2019-12-02 10:16:42 -05:00
Pfeil, Scott Robert
3e46438fd0 label font bugfix caused by the dissonance between label and styler setting.... 2019-12-02 10:11:04 -05:00
Kevin G Christiano
530397084b Merge branch 'develop' into feature/swiftified_textField 2019-12-02 09:51:09 -05:00
Kevin G Christiano
6a34370083 returned func. 2019-12-02 09:50:30 -05:00
Pfeil, Scott Robert
09b467cac4 Merge branch 'bugfix/dropdown_key_name_fix' into 'develop'
key name mismatch fix.

See merge request BPHV_MIPS/mvm_core_ui!191
2019-12-02 09:13:28 -05:00
Kevin G Christiano
0f04ebe177 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-12-02 09:04:17 -05:00
Kevin G Christiano
4d3e5544fb Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField 2019-12-02 08:57:08 -05:00
Kevin G Christiano
fc7ef567e3 Revised Superclass. 2019-12-02 08:56:58 -05:00
Khan, Arshad
dc5174cbe4 key name mismatch fix. 2019-11-28 20:48:07 +05:30
Pan, Xinlei (Ryan)
ad8b48b699 Merge branch 'feature/dropdown_line_item_legacy' into 'develop'
Feature/dropdown line item legacy

See merge request BPHV_MIPS/mvm_core_ui!190
2019-11-27 21:49:46 -05:00
Suresh, Kamlesh
0648ec0191 fixes 2019-11-27 17:25:23 -05:00
Pfeil, Scott Robert
ee773eed89 key change 2019-11-27 15:02:03 -05:00
Suresh, Kamlesh
7a09e4b830 merge 2019-11-27 14:38:01 -05:00
Suresh, Kamlesh
9195f96a68 fixes 2019-11-27 14:29:20 -05:00
Pfeil, Scott Robert
0915333878 Merge branch 'bugfix/scrollview_content_adjustment_fix' into 'develop'
remove navigation bar check for manual inset calculation as it impacts presented controllers

See merge request BPHV_MIPS/mvm_core_ui!187
2019-11-27 14:03:52 -05:00
Hedden, Kyle Matthew
f5270ae12e remove navigation bar check for manual inset calculation as it impacts presented controllers 2019-11-27 14:03:51 -05:00
Pfeil, Scott Robert
63556707bc temporary dropdown molecule
label reuse font fixes
2019-11-27 13:49:01 -05:00
Khan, Arshad
c999f6f777 opening few properties 2019-11-27 21:43:42 +05:30
Suresh, Kamlesh
9a6fd85405 merge 2019-11-27 11:05:52 -05:00
Khan, Arshad
f2f9d5d0d7 Adding open to required functions, which need to override in MF component.
Adding mapping for dropDown.
2019-11-27 21:12:41 +05:30
Suresh, Kamlesh
5446fb0785 WIP 2019-11-26 19:20:38 -05:00
panxi
876a07650b remove space 2019-11-26 14:16:12 -05:00
panxi
1bbad6ca15 fix merge conflict 2019-11-26 14:14:53 -05:00
panxi
269898f566 fix conflicts 2019-11-26 13:57:24 -05:00
panxi
1a5c819a2a fix conflict 2019-11-26 13:55:29 -05:00
panxi
437138007f merge 2019-11-26 13:54:00 -05:00
panxi
b53f7e7786 update 2019-11-26 13:30:06 -05:00
panxi
8422362e77 merge from develop 2019-11-26 11:30:43 -05:00
panxi
25336b0a16 Merge branch 'develop' into feature/models 2019-11-26 11:20:45 -05:00
Pfeil, Scott Robert
1ec603e969 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/dropdown_line_item_legacy 2019-11-26 08:54:47 -05:00
Kevin G Christiano
3654b05773 removed unneeded method. mild changes. 2019-11-25 16:35:28 -05:00
Pfeil, Scott Robert
392ab144ac small fixes 2019-11-25 16:01:43 -05:00
Kevin G Christiano
499b938d56 Merge branch 'develop' into feature/swiftified_textField 2019-11-25 12:28:01 -05:00
Kevin G Christiano
cfffbabe58 identity and callback. 2019-11-25 12:27:32 -05:00
Pfeil, Scott Robert
88e079e6be Merge branch 'bugfix/header_line' into 'develop'
line fix in header

See merge request BPHV_MIPS/mvm_core_ui!185
2019-11-25 12:07:06 -05:00
Pfeil, Scott Robert
664d3195bb line fix in header 2019-11-25 09:20:05 -05:00
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
panxi
ea69ba67ea update array decoding method 2019-11-24 23:14:25 -05:00
Kevin G Christiano
dc8293b08b more refinement of errors. 2019-11-22 14:33:46 -05:00
panxi
9ec661ae3b add label model 2019-11-22 14:31:17 -05:00
Kevin G Christiano
72553935c2 latestst state. 2019-11-22 12:53:40 -05:00
Kevin G Christiano
21166bc5f0 Better functioning selection. 2019-11-22 09:20:35 -05:00
Kevin G Christiano
64bda3cb1d wip. 2019-11-21 16:40:34 -05:00
Kevin G Christiano
8b5fe4a1f4 more changes. 2019-11-21 15:21:32 -05:00