Commit Graph

440 Commits

Author SHA1 Message Date
Christiano, Kevin
b00d439ead Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-05-29 10:51:11 -04:00
pfeilsc
276ba5ff77 Merge branch 'feature/module_molecule_and_list' into 'develop'
Feature/module molecule and list

See merge request BPHV_MIPS/mvm_core_ui!76
2019-05-29 10:29:24 -04:00
Christiano, Kevin
68f27da117 Changed ItemDetailView name to StandardListItem to comply with molecule listing. 2019-05-29 10:23:39 -04:00
Pfeil, Scott Robert
341aef0184 more merge fixes 2019-05-29 10:13:48 -04:00
Pfeil, Scott Robert
119a9e8c0f merge develop 2019-05-29 09:07:15 -04:00
Pfeil, Scott Robert
1e9e1d2dda Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-05-29 09:05:13 -04:00
Pfeil, Scott Robert
a3325035b9 fix override... 2019-05-28 17:04:25 -04:00
Pfeil, Scott Robert
403f0bbea8 42 update to estimated height 2019-05-28 16:47:07 -04:00
Pfeil, Scott Robert
9cf37d0850 fix extra space 2019-05-28 16:26:23 -04:00
Pfeil, Scott Robert
59900d987a fix to mismatch 2019-05-28 16:00:00 -04:00
Pfeil, Scott Robert
1799f166ee remove duplicate 2019-05-28 10:08:04 -04:00
Christiano, Kevin
f1ba116e8b switch to true. 2019-05-24 14:58:54 -04:00
Christiano, Kevin
8c2b00657e added ItemDetailView to molecule mapping. 2019-05-24 12:58:48 -04:00
Pfeil, Scott Robert
f4cfd0386c add forgotten separator override 2019-05-24 12:30:04 -04:00
Pfeil, Scott Robert
89ed78a0eb miss 2019-05-24 11:57:00 -04:00
Pfeil, Scott Robert
699aa94d0a fixes 2019-05-24 11:56:07 -04:00
Pfeil, Scott Robert
b03fa77dfd added to molecule list 2019-05-24 09:45:42 -04:00
Pfeil, Scott Robert
cf4af8731e fix to parameter 2019-05-24 09:42:20 -04:00
Christiano, Kevin
3b66bcfdc3 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-05-24 09:20:56 -04:00
Christiano, Kevin
6d2220cbbf latest version of ItemDetailView. 2019-05-24 09:19:22 -04:00
Pfeil, Scott Robert
0f5cb47765 molecule list
moduleMolecule
2019-05-23 18:32:11 -04:00
c0surk2
dd4c541098 Merge branch 'feature/switch' into 'develop'
Feature/switch

See merge request BPHV_MIPS/mvm_core_ui!74
2019-05-23 17:07:13 -04:00
Priya
f53bd03212 Switch molecule 2019-05-23 17:02:30 -04:00
Priya
b73c916192 Switch molecule 2019-05-23 16:32:14 -04:00
Priya
344163de49 Switch molecule 2019-05-23 16:22:32 -04:00
Priya
2e99c7baff Switch molecule 2019-05-23 12:31:36 -04:00
Priya
89b1c9a21b Switch molecule 2019-05-23 11:40:21 -04:00
Priya
9fd2d2cbda Switch molecule 2019-05-21 14:04:46 -04:00
Christiano, Kevin
c4ad3cc881 adding new atom. 2019-05-20 16:34:17 -04:00
Christiano, Kevin
0f9aa7dc01 Adding new atom. 2019-05-20 16:34:02 -04:00
Priya
9f5600a0f3 switch modification 2019-05-20 15:51:07 -04:00
Priya
ddd8eb9d45 Switch molecule 2019-05-20 09:35:35 -04:00
Priya
aac9db9ca5 Switch molecule 2019-05-17 15:22:12 -04:00
Priya
281a10f7e1 Switch molecule 2019-05-17 14:36:18 -04:00
Priya
85e9c56dcf switch modification 2019-05-16 15:05:05 -04:00
Priya
9ecc7f21a6 switch modification 2019-05-16 11:54:57 -04:00
Priya
97b7fbebad switch modification 2019-05-16 10:20:13 -04:00
Priya
8ef420e3a4 switch modification 2019-05-15 12:01:30 -04:00
Pfeil, Scott Robert
0f458d21a3 module molecule 2019-05-15 11:16:08 -04:00
Christiano, Kevin
ec1682a632 Updated Label. Change LabelWithInternal for when nil is set for actionBlock. 2019-05-14 16:26:35 -04:00
Priya
b77ec675e0 Switch molecule 2019-05-14 14:34:54 -04:00
Christiano, Kevin
42bc51373a Merge branch 'develop' into feature/kevin 2019-05-14 12:37:18 -04:00
Pan, Xinlei (Ryan)
f632d69b4c Merge branch 'feature/fiveg_font' into 'develop'
add new font method for 5g

See merge request BPHV_MIPS/mvm_core_ui!67
2019-05-13 16:07:54 -04:00
Chowdhury, Shohrab
e949f6ec2f add space in method name 2019-05-13 16:07:17 -04:00
Chowdhury, Shohrab
629c531d21 update name 2019-05-13 16:03:59 -04:00
Chowdhury, Shohrab
e4d8e3695b update name method 2019-05-13 16:02:04 -04:00
Chowdhury, Shohrab
bad190a3ab update font name 2019-05-13 15:59:10 -04:00
Chowdhury, Shohrab
315ea87c10 add new font method for 5g 2019-05-13 15:51:21 -04:00
Christiano, Kevin
f00f24f35f Merge branch 'develop' into feature/kevin 2019-05-10 13:10:13 -04:00
Christiano, Kevin
59248974ab Changes made to Label & LabelWithInternalButton. 2019-05-10 13:09:58 -04:00