Commit Graph

624 Commits

Author SHA1 Message Date
Kevin G Christiano
4fc5ff9313 adjustments made. 2019-08-12 09:04:18 -04:00
Kevin G Christiano
7085137210 Merge branch 'develop' into feature/standardlistitemwithimage 2019-08-09 15:23:12 -04:00
Kevin G Christiano
f78a952905 space. 2019-08-09 15:22:49 -04:00
Pan, Xinlei (Ryan)
1f98936143 Merge branch 'feature/customeragreement_support' into 'develop'
Popup Widget

See merge request BPHV_MIPS/mvm_core_ui!109
2019-08-09 09:48:06 -04:00
Kevin G Christiano
d4a19d9086 Removed unneeded line. 2019-08-09 09:45:44 -04:00
Kevin G Christiano
55f4fec029 Merge branch 'develop' into feature/customeragreement_support 2019-08-08 16:21:33 -04:00
Pan, Xinlei (Ryan)
0acdaac2e6 Merge branch 'feature/support_colorpicker' into 'develop'
Exposing parts of Radio Button.

See merge request BPHV_MIPS/mvm_core_ui!108
2019-08-08 13:31:51 -04:00
Kevin G Christiano
93ed26820d Latest State 2019-08-05 16:37:27 -04:00
Kevin G Christiano
cbe572b8ba Merge branch 'develop' into feature/support_colorpicker 2019-08-05 11:50:42 -04:00
Kevin G Christiano
1ec98eb29a Needed to expose a few properties of the class in order to have adapt it to slight changes for use in support class. 2019-08-05 11:50:15 -04:00
Kevin G Christiano
519542d3e5 Renamed class. 2019-08-05 10:09:11 -04:00
Kevin G Christiano
f2d5570989 layoutMarginsGuide. 2019-08-05 09:58:43 -04:00
Kevin G Christiano
eea2560e15 Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-08-05 09:11:44 -04:00
Kevin G Christiano
dd05284b95 latest updates. 2019-08-05 09:09:57 -04:00
Pfeil, Scott Robert
bfd327ff5b Merge branch 'feature/image_headline_body' into 'develop'
carousel bug fix.

See merge request BPHV_MIPS/mvm_core_ui!107
2019-08-02 12:57:32 -04:00
Pfeil, Scott Robert
e0afa92c79 carousel bug fix.
imageHeadlineBody
2019-08-02 10:26:16 -04:00
Pfeil, Scott Robert
708b947b02 Revert "Merge branch 'feature/molecule_multiLabelListItem' into 'develop'"
This reverts merge request !99
2019-08-01 11:57:57 -04:00
Pfeil, Scott Robert
9e3eaf0d1e Merge branch 'bugfix/typos' into 'develop'
Bugfix/typos

See merge request BPHV_MIPS/mvm_core_ui!105
2019-08-01 11:53:33 -04:00
Pfeil, Scott Robert
85675b8637 separator color fix for list item 2019-08-01 11:49:17 -04:00
Pfeil, Scott Robert
4d905bb17d fix to bool typo 2019-08-01 11:45:10 -04:00
Suresh, Kamlesh
81de381e4c Merge branch 'bugfix/paging_crash' into 'develop'
Bugfix/paging crash

See merge request BPHV_MIPS/mvm_core_ui!104
2019-08-01 09:26:19 -04:00
Pfeil, Scott Robert
ee2fbbecfe Merge branch 'develop' into bugfix/paging_crash 2019-08-01 09:24:00 -04:00
Pfeil, Scott Robert
7bb6e5ba8d check before use 2019-08-01 09:23:10 -04:00
Kevin G Christiano
b35df4c07b Merge branch 'develop' into feature/customeragreement_support 2019-07-31 12:09:22 -04:00
Kevin G Christiano
00f3152472 reversed trailing anchor constraints. 2019-07-31 12:03:54 -04:00
Kevin G Christiano
c6d445034b Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-07-27 18:17:29 -04:00
Kevin G Christiano
45689c7c51 Made fix to TopLabelBottomButtomVC. Added close X image to replace 'X' char. 2019-07-27 17:31:19 -04:00
Suresh, Kamlesh
d0935a6d65 Merge branch 'feature/molecule_multiLabelListItem' into 'develop'
Added multiLabelListItem - iOS as per MOBFIRST-17824

See merge request BPHV_MIPS/mvm_core_ui!99
2019-07-26 09:50:32 -04:00
vasavk
eeae9a7c70 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/molecule_multiLabelListItem
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m

Signed-off-by: vasavk <vasavi.kanamarlapudi@verizon.com>
2019-07-26 19:19:00 +05:30
Pan, Xinlei (Ryan)
9c8a806dbd Merge branch 'feature/image_load_efficiency' into 'develop'
efficiency commit

See merge request BPHV_MIPS/mvm_core_ui!103
2019-07-25 12:07:59 -04:00
Pfeil, Scott Robert
245d7d93d6 efficiency commit 2019-07-25 10:44:14 -04:00
Pfeil, Scott Robert
9849a4d287 Merge branch 'feature/scroller' into 'develop'
Feature/scroller

See merge request BPHV_MIPS/mvm_core_ui!102
2019-07-25 08:42:44 -04:00
Pfeil, Scott Robert
5ebc4b0e31 strikethrough fix
warning fix.
2019-07-24 15:38:13 -04:00
Pfeil, Scott Robert
9f3b6e5fe9 Merge branch 'bugfix/update_after_load_image' into 'develop'
Bugfix/update after load image

See merge request BPHV_MIPS/mvm_core_ui!100
2019-07-24 12:50:48 -04:00
Pfeil, Scott Robert
f2db8528a7 threeLayer template
scroller molecule
border color.
remove default height
fix missing update view
2019-07-24 12:44:45 -04:00
Kevin G Christiano
bc516ff74c removed statement causing loop. 2019-07-23 12:14:18 -04:00
Kevin G Christiano
c9c3ef1ade Merge branch 'bugfix/update_after_load_image' into feature/standardlistitemwithimage 2019-07-23 11:58:54 -04:00
Pfeil, Scott Robert
6537523373 different way to update 2019-07-23 11:57:03 -04:00
Kevin G Christiano
7472533bc1 fixes error alert. 2019-07-23 10:13:44 -04:00
Kevin G Christiano
1ec4f271ff Merge branch 'bugfix/update_after_load_image' into feature/standardlistitemwithimage 2019-07-23 10:07:35 -04:00
Pfeil, Scott Robert
482c6c4fab auto looks better 2019-07-23 09:56:49 -04:00
Pfeil, Scott Robert
dace6a6374 update table cell 2019-07-23 09:55:43 -04:00
Pan, Xinlei (Ryan)
362c9b3937 Merge branch 'feature/molecule_carousel' into 'develop'
Feature/molecule carousel

See merge request BPHV_MIPS/mvm_core_ui!97
2019-07-22 13:30:34 -04:00
Pfeil, Scott Robert
f12805ba2a update comment 2019-07-22 09:53:22 -04:00
Pfeil, Scott Robert
c5f8d27636 fix prod break defect 2019-07-19 11:34:22 -04:00
Pfeil, Scott Robert
8842ca8113 Merge branch 'develop' into 'feature/molecule_carousel'
# Conflicts:
#   MVMCoreUI/Molecules/StandardFooterView.swift
#   MVMCoreUI/Molecules/StandardHeaderView.swift
2019-07-19 10:54:43 -04:00
Pfeil, Scott Robert
8400c0eae8 name change 2019-07-19 10:53:16 -04:00
Pfeil, Scott Robert
5c619aa843 remove preserves 2019-07-19 10:48:01 -04:00
Pfeil, Scott Robert
5b1fab39a7 alignment defaults change 2019-07-19 10:14:51 -04:00
vasavk
ecf34bb34d Added multiLabelListItem - iOS as per MOBFIRST-17824
Signed-off-by: vasavk <vasavi.kanamarlapudi@verizon.com>
2019-07-18 15:45:52 +05:30