mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,512 Commits 64 Branches 0 Tags 46 MiB
cd231746cf
Commit Graph

1512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin G Christiano
7176155dfc Merge branch 'develop' into feature/label_export_box 2019-08-05 10:16:54 -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
ae92c9bbf8 composition. 2019-07-29 09:41:42 -04:00
Kevin G Christiano
905a2b948e Added some sugar to typealias definition. 2019-07-29 09:40:33 -04:00
Kevin G Christiano
f6cd3aad18 Improved functioning of tap when adding icon before action. Appears to have separate behavior when done as a molecule than from source. 2019-07-29 09:35:00 -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
a2d4984822 Currently investigate separate treatment for label image attachments in molecular structure. 2019-07-27 18:11:57 -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
Kevin G Christiano
ddb4ba39d0 Reworked mutable insert logic. Revised comments. 2019-07-27 17:00:27 -04:00
Kevin G Christiano
5a7acf6a33 Merge branch 'feature/label_export_box' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/label_export_box 2019-07-26 15:21:40 -04:00
Kevin G Christiano
64e6b8bbfe preventing space if 0. 2019-07-26 15:21:27 -04:00
Kevin G Christiano
a21774b390 comment & preventing leading text image due to problem. 2019-07-26 15:21:01 -04:00
Kevin G Christiano
6dd7cab8f4 Comments added. Further logic added for adding image attachments. 2019-07-26 14:46:29 -04:00
Kevin G Christiano
3a31441bc8 Merge branch 'develop' into feature/label_export_box 2019-07-26 13:39:46 -04:00
Kevin G Christiano
81ccaa5bbd Restructuring the tappable text feature. Must account of the offset incurred by adding an extra space and image attachment to the overall length of the label. Included a sorting feature to ensure clauses array is always in ascending order by location. 2019-07-26 13:39:28 -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
Kevin G Christiano
849a4d761a Merge branch 'develop' into feature/label_export_box 2019-07-25 16:48:03 -04:00
Kevin G Christiano
a47e8d4313 Adding check to look for attachments and scale the accordingly. 2019-07-25 16:47:14 -04:00
Kevin G Christiano
7a86febc7c corrected logic error. 2019-07-25 15:15:32 -04:00
Kevin G Christiano
8e6087f86e Merge branch 'develop' into feature/label_export_box 2019-07-25 14:45:27 -04:00
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
Suresh, Kamlesh
ceae7e4f80 merge develop 2019-07-22 16:10:46 -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