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

838 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
5a3ff449df merge develop 2020-04-01 10:41:40 -04:00
Pfeil, Scott Robert
a3f81511b6 move files 2020-04-01 10:21:42 -04:00
Damodaram
1dc79330ec Merge branch 'develop' into feature/list_right_variable_button_all_text_and_links 2020-04-01 19:39:59 +05:30
Pfeil, Scott Robert
dccf576f7a Minor fixs 2020-04-01 10:05:32 -04:00
Kruthika KP
bffd2475df Initial Commit of List - Three Column - International Data - Divider 2020-04-01 12:42:41 +05:30
Pfeil, Scott Robert
28cbcfee85 move legacy files 2020-03-31 11:05:13 -04:00
Kevin G Christiano
d19653557f organized files 2020-03-31 10:30:13 -04:00
Kevin G Christiano
94a8ac405e readding? 2020-03-31 09:16:32 -04:00
Lekshmi S
c180abf302 Radioswatches model initial commit 2020-03-31 13:50:34 +05:30
Damodaram
ab18db4a96 Merge conflicts resolved 2020-03-31 11:31:45 +05:30
Damodaram
dbaec80436 Merge 2020-03-31 10:41:21 +05:30
Kevin G Christiano
290b5276b2 adding again 2020-03-30 16:17:14 -04:00
Kevin G Christiano
338a3c8a03 fixed merge issue 2020-03-30 14:48:28 -04:00
Kevin G Christiano
130c25f119 merging 2020-03-30 14:09:08 -04:00
Xinlei(Ryan) Pan
710adec037 add web view 2020-03-30 10:58:47 -04:00
Kevin G Christiano
b1106c58ff merge resolution 2020-03-27 11:12:33 -04:00
Kruthika KP
c7344b166d MF-18985 - ListFourColumnDataUsageListItem 2020-03-27 18:23:03 +05:30
Lekshmi S
9b72cde7a6 Merge branch 'develop' into feature/list_right_variable_textLink_alltext_and_links 2020-03-26 18:38:56 +05:30
Kyle Matthew Hedden
11069d3f73 add convenience initializers for creating a legacy footer 2020-03-25 12:59:26 -04:00
Pfeil, Scott Robert
26a530af2c Form Cleaning 2020-03-24 17:20:19 -04:00
Pfeil, Scott Robert
438277b37f missing file move 2020-03-24 12:50:45 -04:00
Pfeil, Scott Robert
7a86b0356b Further cleaning 2020-03-24 12:45:01 -04:00
Lekshmi S
0131137ae6 19060(List - Left Variable - Checkbox - Body Text Only) initial commit 2020-03-24 18:21:52 +05:30
Kruthika KP
95d705abb4 19078 - List - Three Column - International Data - Updated to latest 2020-03-24 17:02:29 +05:30
Kruthika KP
2226d9beed 190780 - List- Three Column - International Data Divider - Initial commit 2020-03-24 10:37:48 +05:30
Pfeil, Scott Robert
9381e41906 merge 2020-03-23 17:08:26 -04:00
Pfeil, Scott Robert
c39e344f25 crash fix 2020-03-23 11:03:41 -04:00
Kruthika KP
f750fd129c MF-19186 : List -Three Column - Data Usage - Divider - Initial Commit 2020-03-23 11:19:40 +05:30
Pfeil, Scott Robert
39fc20ef79 cleanup 2020-03-20 15:54:55 -04:00
Lekshmi S
8e4d42e67b 19180(List - Three Column - Speed Test - Divider) story initial commit 
Added model class and molecule class.
 2020-03-20 17:41:08 +05:30
Damodaram
d1a9841912 files added after merging 2020-03-20 11:32:33 +05:30
Damodaram
23f9f4a3fa Merge branch 'develop' into feature/list_right_variable_button_all_text_and_links 2020-03-20 11:26:05 +05:30
Pfeil, Scott Robert
db542b170d merge 2020-03-19 10:24:46 -04:00
Lekshmi S
23bd844e8e Folder structure changes and conforming to headerView and headermodel. 2020-03-19 14:55:33 +05:30
Lekshmi S
4a7dbb6add Merge branch 'develop' into feature/HeadersH2TinyButton 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
 2020-03-19 11:30:48 +05:30
Lekshmi S
d161fbf9fb Folder structure changes and conforming to headerView and headermodel. 2020-03-19 11:26:25 +05:30
Lekshmi S
4d5a6d9505 Merge branch 'develop' into feature/Headers_H2_Buttons 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
 2020-03-19 10:51:30 +05:30
Damodaram
e8eba296d5 ListRightVariableTextLinkAllTextAndLinks Molecule implemented 2020-03-19 10:18:57 +05:30
Pfeil, Scott Robert
8a6cd89845 spacing 2020-03-18 14:31:56 -04:00
Pfeil, Scott Robert
72ac6adeb9 merge 2020-03-18 14:28:34 -04:00
Pfeil, Scott Robert
6d7c403536 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_one_column_text_with_whitespace_divider_tall 2020-03-18 14:19:42 -04:00
Pfeil, Scott Robert
3210d8cc88 cleanup 2020-03-18 13:25:44 -04:00
Damodaram
4b6891851c ListOneColumnTextWithWhitespaceDividerShort Molecule implemented 2020-03-18 18:32:09 +05:30
Lekshmi S
5eb3960926 Folder structure changes and conforming to headerView and headermodel. 2020-03-18 16:49:45 +05:30
Damodaram
45805ebd23 files moved to subsections folder 2020-03-18 16:19:08 +05:30
Damodaram
b481dd9dfb Merge branch 'develop' into feature/list_one_column_text_with_whitespace_divider_tall 2020-03-18 16:09:28 +05:30
Lekshmi S
5f6f639776 Merge branch 'develop' into feature/Headers_H1_Bill 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
 2020-03-18 14:27:53 +05:30
Lekshmi S
f58b57e145 Folder structure changes and conforming to headerView and headermodel 2020-03-18 10:04:37 +05:30
Lekshmi S
9187e0adf3 Merge branch 'develop' into feature/headers_H1_button 
# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
 2020-03-18 09:23:34 +05:30
Xinlei(Ryan) Pan
0f6ded4591 move action models 2020-03-17 15:08:27 -04:00
Pfeil, Scott Robert
1e6ae3dcfc Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/swift_controllers 2020-03-17 13:38:55 -04:00
Pfeil, Scott Robert
ef7190de56 merge 2020-03-17 12:25:00 -04:00
Pfeil, Scott Robert
76b855db42 minor changes 2020-03-17 12:11:17 -04:00
Pfeil, Scott Robert
a9319ba005 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_one_column_full_width_text_divider_subsection 2020-03-17 11:40:49 -04:00
Subhankar Acharya
a24ea44e3c Moved to Section Dividers folder. 2020-03-17 20:41:14 +05:30
Subhankar Acharya
b30d582c12 Removed the null additions. 2020-03-17 20:37:11 +05:30
Pfeil, Scott Robert
883f2385b9 merge 2020-03-17 09:34:57 -04:00
Kruthika KP
e9569b0623 Merge branch 'develop' into feature/list_rightvariable_totaldata 
* develop: (28 commits)
  bug fixes
  fix typo
  moved files
  fixes for certain devices
  Minor changes for testing
  sticky footer
  fix molecule protocol type Update column molecule to allow for matching heights on each side.
  Changes made as per comments
  uistack molecule extension
  Removed extra spaces and added height constraint for stacks.
  Removed extra space.
  code improvement
  Refactored code as per the changes in confluence.
  Resolved merge conflicts.
  19006 - List - Two Column - Price Description - Files added to new branch
  Code cleanup
  Code cleanup.
  Code refactoring.
  Created folder structure
  Added ListTwoCloumnPriceDetails molecule
  ...
 2020-03-17 15:13:26 +05:30
Damodaram
fc741e38df initial commit 2020-03-17 14:54:26 +05:30
Damodaram
7928d8a51c Merge branch 'develop' into feature/list_one_column_full_width_text_divider_subsection 
* develop: (55 commits)
  bug fixes
  fix typo
  moved files
  fixes for certain devices
  Minor changes for testing
  sticky footer
  fix molecule protocol type Update column molecule to allow for matching heights on each side.
  Changes made as per comments
  uistack molecule extension
  additional change for empty
  changing so that page does not break if server doesn't send the value
  logic for anyRequired
  refactor
  merge
  anyrequiredmodel
  Reverted collectioViewHeight constraint.
  Reverted back centerYAnchor
  Removed un-necessary code.
  Removing hard coded width.
  implemented feedback
  ...
 2020-03-17 11:31:43 +05:30
Damodaram
fab1e5f6dc Merge branch 'develop' into feature/list_one_column_full_width_text_divider_subsection 2020-03-17 11:27:57 +05:30
Lekshmi S
720a5569b5 19156(List - Two Column - Divider - Subsection) initial commit. 
Added model and molecule class.
 2020-03-17 10:18:06 +05:30
Pfeil, Scott Robert
2c6f9667a5 small changes 2020-03-16 16:47:39 -04:00
Pfeil, Scott Robert
2252549200 merge 2020-03-16 14:47:54 -04:00
Pfeil, Scott Robert
35085217d5 fixes for certain devices 2020-03-16 14:32:04 -04:00
Pfeil, Scott Robert
54a12804a5 Minor changes for testing 2020-03-16 12:52:59 -04:00
Pfeil, Scott Robert
f5ecf1bb05 merge 2020-03-16 12:18:36 -04:00
Pfeil, Scott Robert
bf39fd564f merge develop 2020-03-16 11:56:42 -04:00
Kevin G Christiano
50920c83e0 latest state 2020-03-16 09:50:54 -04:00
Pfeil, Scott Robert
bb0f6c5eba uistack molecule extension 2020-03-16 09:42:04 -04:00
Pfeil, Scott Robert
87fb08fb72 Navigation model 2020-03-16 09:15:49 -04:00
Kruthika KP
ab4eaa3fdd Merge branch 'develop' into feature/list_rightvariable_totaldata 
* develop: (27 commits)
  additional change for empty
  changing so that page does not break if server doesn't send the value
  logic for anyRequired
  refactor
  merge
  anyrequiredmodel
  Reverted collectioViewHeight constraint.
  Reverted back centerYAnchor
  Removed un-necessary code.
  Removing hard coded width.
  implemented feedback
  making pageIndex public
  nil check
  rules should be optional
  clean up
  regex
  making properties and function public
  equal  rules
  optimise
  Making few properties public. Constraint fixes.
  ...
 2020-03-16 14:35:03 +05:30
Pfeil, Scott Robert
907a617e1d merge 2020-03-13 12:18:04 -04:00
Suresh, Kamlesh
8b1b6ea454 Merge branch 'feature/form_page' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/form_page 2020-03-13 12:13:45 -04:00
Suresh, Kamlesh
62fd6c988e merge 2020-03-13 12:13:32 -04:00
Kevin G Christiano
6d3946f0e7 anyrequiredmodel 2020-03-13 11:52:09 -04:00
Pfeil, Scott Robert
335ec160b5 swift 2020-03-13 10:04:47 -04:00
Kruthika KP
ffbbe5df35 Added view and model classes 2020-03-13 11:29:58 +05:30
Kevin G Christiano
1ae91f55ae Merge branch 'develop' into feature/form_page 2020-03-11 15:28:06 -04:00
Kevin G Christiano
90d98fdc2e merging 2020-03-11 13:32:04 -04:00
Lekshmi S
a16855527f Resolved merge conflicts. 2020-03-11 16:21:52 +05:30
Lekshmi S
9636ce9f95 Merge branch 'develop' into feature/list_twocolumn_comparechanges 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-03-11 14:49:36 +05:30
Lekshmi S
33b224add0 Merge branch 'develop' into feature/list_twocolumn_price_details 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-03-11 14:23:59 +05:30
Lekshmi S
885fe7d081 19234(Headers - H2 - Tiny Button) initial commit. 
Added Model and Molecule class
 2020-03-11 13:16:17 +05:30
Kruthika KP
5ff8d98e5b Merge branch 'develop' into feature/list_rightvariable_totaldata 
* develop:
  Removed initializers
  index path update
  Removed stack
  shifting and improving
  code cleanup and identation
  the latest
  code cleanup
  Code commit for List- OneColumn- Full Width Text - BodyText

# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-03-11 08:15:09 +05:30
Suresh, Kamlesh
7965c4ac6a clean up 2020-03-10 15:25:49 -04:00
Lekshmi S
14bedf6f31 19216(Headers - H2 - Buttons) initial commit 
Created model and molecule class.
 2020-03-10 12:12:45 +05:30
Kevin G Christiano
a011eb73a4 latest 2020-03-09 10:35:45 -04:00
Lekshmi S
12d8520e42 19210(Headers - H1 - Bill) initial commit. 
Created molecule and model class
 2020-03-09 13:24:48 +05:30
Damodaram
219a667c1a ListOneColumnFullWidthTextDividerSubsection Molecule implemented. 2020-03-09 12:45:30 +05:30
Damodaram
b5bbce6294 List - One Column - Text With Whitespace - Divider - Tall Molecule implemented 2020-03-09 11:31:46 +05:30
Lekshmi S
14a6b4f4bc Merge branch 'develop' into feature/Headers_H2_NoButtons_BodyText 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-03-09 11:12:46 +05:30
Kruthika KP
304d5e1cc5 Merge branch 'develop' into feature/list_rightvariable_totaldata 
* develop:
  add modal template
  key update
  merge and cleanup
  add 2.0 font back for march release
  change the base decode functions
 2020-03-09 10:21:06 +05:30
Kruthika KP
4ef184ddc1 Merge branch 'develop' into feature/list_onecolumn_fulwidthtext_bodytext 
* develop:
  add modal template
  key update
  merge and cleanup
  add 2.0 font back for march release
  change the base decode functions
 2020-03-09 08:20:02 +05:30
Suresh, Kamlesh
22b0b7259f merge conflicts 2020-03-06 18:04:30 -05:00
Suresh, Kamlesh
521ad8711d value changed rules 2020-03-06 17:26:42 -05:00
Xinlei(Ryan) Pan
59cb32d281 add modal template 2020-03-06 16:26:35 -05:00
Xinlei(Ryan) Pan
c46ec10e76 merge from develop 2020-03-06 13:25:14 -05:00
Suresh, Kamlesh
1bbfb0390a fixes 2020-03-06 10:51:09 -05:00
Pfeil, Scott Robert
c6e6d28903 merge and cleanup 2020-03-06 08:44:30 -05:00
Kruthika KP
b4f36b03c7 Merge branch 'develop' into feature/list_onecolumn_fulwidthtext_bodytext 
* develop:
  slight cleanup
  Remove right panel protocol
  Added files to LockUps and constraint changes.
  Code improvement.
  Constraints added
  Change in reference file, indentation and removal of extra spaces.
  Change in molecule name
  19096 - List - Progress Bar - Data - Initial commit
 2020-03-06 10:40:31 +05:30
Xinlei(Ryan) Pan
bd4f00561e add 2.0 font back for march release 2020-03-05 09:58:32 -05:00
Pfeil, Scott Robert
b027333a46 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into bugfix/category_collision 2020-03-05 09:56:51 -05:00
Subhankar Acharya
23fe4cbe3d Created folder for designed headers. 2020-03-05 20:24:01 +05:30
Subhankar Acharya
b2615b43c7 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/Headers_H2_NoButtons_BodyText 2020-03-05 19:59:54 +05:30
Lekshmi S
9090a30c85 Headers - H2 - No Buttons - Body Text story initial commit 2020-03-05 12:23:48 +05:30
Kruthika KP
fe959f09e5 Code commit for List- OneColumn- Full Width Text - BodyText 2020-03-05 11:24:05 +05:30
Kruthika KP
00625fe2b6 Merge branch 'develop' into feature/list_rightvariable_totaldata 
* develop:
  slight cleanup
  Remove right panel protocol
  Helps resolve CXTDT-63501
  Added files to LockUps and constraint changes.
  Code improvement.
  Constraints added
  Change in reference file, indentation and removal of extra spaces.
  Change in molecule name
  19096 - List - Progress Bar - Data - Initial commit

# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
 2020-03-05 08:32:15 +05:30
Suresh, Kamlesh
9d8953d229 clean up 2020-03-04 10:52:40 -05:00
Pfeil, Scott Robert
c8183103f7 merge 2020-03-04 09:13:06 -05:00
Lekshmi S
78fbadb1e1 19198 - Headers - H1 - Button initial commit 2020-03-04 16:46:21 +05:30
Suresh, Kamlesh
3ec024ff27 changes 2020-03-03 20:32:57 -05:00
Lekshmi S
2855e643ac Merge branch 'develop' into feature/list_twocolumn_price_details 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
 2020-03-03 15:09:05 +05:30
Pfeil, Scott Robert
4b9cd27cab change the base decode functions 2020-03-02 14:54:48 -05:00
Subhankar Acharya
188277742a Code refactoring. 2020-03-02 16:44:49 +05:30
Kruthika KP
1d1bcf1b4a 19084 - List Right variable Total Data 2020-03-02 11:43:50 +05:30
Pfeil, Scott Robert
201fa2be81 remove file testing 2020-02-28 13:48:23 -05:00
Kevin G Christiano
b8127da583 Merge branch 'develop' into feature/modern_pagecontrol 2020-02-28 13:41:10 -05:00
Pfeil, Scott Robert
cfd6cb1358 Teting 2020-02-28 13:06:11 -05:00
Pfeil, Scott Robert
4c25b8a160 merge 2020-02-28 12:11:51 -05:00
Pfeil, Scott Robert
f779478cc5 update 2020-02-28 10:32:27 -05:00
Kevin G Christiano
1196dee4de resolving merge conflicts 2020-02-28 10:32:19 -05:00
Pfeil, Scott Robert
2b85991bfd merge dev 2020-02-28 09:53:14 -05:00
Pan, Xinlei (Ryan)
1540fb4bed Merge branch 'feature/arrow' into 'develop' 
Arrow Icon

See merge request BPHV_MIPS/mvm_core_ui!283
 2020-02-28 09:50:16 -05:00
Pfeil, Scott Robert
757395ad1d merge 2020-02-27 13:58:30 -05:00
Pfeil, Scott Robert
0b6fe7059a Cleanup for names and stack 2020-02-27 13:45:15 -05:00
Kevin G Christiano
bd9391f401 resolving merge conflicts 2020-02-27 13:11:30 -05:00
Kevin G Christiano
6c92652f01 moved files 2020-02-27 12:31:47 -05:00
Kevin G Christiano
435c6cfa55 conflict resolution 2020-02-27 12:04:58 -05:00
Kevin G Christiano
411d72a152 Merge branch 'develop' into feature/arrow 2020-02-27 11:56:49 -05:00
Subhankar Acharya
207d1915d5 Added ListLeftVariableRadioButtonAndPaymentMethod molecule. 2020-02-27 21:37:02 +05:30
Subhankar Acharya
bf2438d112 Merge branch 'feature/radio_model' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_leftvariable_radiobutton_paymentmethod 2020-02-27 21:20:55 +05:30
Subhankar Acharya
ff0fb6b7cd Added files to LockUps and constraint changes. 2020-02-27 20:38:57 +05:30
Pan, Xinlei (Ryan)
830a93be2c Merge branch 'feature/external_link' into 'develop' 
External link

See merge request BPHV_MIPS/mvm_core_ui!280
 2020-02-27 10:08:42 -05:00
Pan, Xinlei (Ryan)
b14fe5db30 Merge branch 'feature/newfont' into 'develop' 
Feature/newfont

See merge request BPHV_MIPS/mvm_core_ui!276
 2020-02-27 09:49:10 -05:00
Subhankar Acharya
d507e66d13 Added ListTwoCloumnPriceDetails molecule 2020-02-27 19:06:49 +05:30
Suresh, Kamlesh
a9bec2df9c radio model 2020-02-26 17:45:02 -05:00
Kevin G Christiano
f8608e7252 resolving merge 2020-02-26 13:37:46 -05:00
Xinlei(Ryan) Pan
e54c87becf update font 2020-02-26 11:06:34 -05:00
Subhankar Acharya
224148d36f Code improvement. 2020-02-26 19:03:42 +05:30
Subhankar Acharya
e31918c051 Error in referencing. 2020-02-26 16:19:51 +05:30
Subhankar Acharya
7891b7fdbd Added Folder 2020-02-26 16:13:24 +05:30
Subhankar Acharya
ba51d7f3c2 Change in reference file, indentation and removal of extra spaces. 2020-02-26 11:44:17 +05:30
Xinlei(Ryan) Pan
4ad4eb7f46 add new font 2020-02-25 11:49:26 -05:00
Kruthika KP
fea1c2e997 added subHeadline and changed the files order 2020-02-25 13:33:40 +05:30
Kruthika KP
5dd1c229f9 Merge branch 'develop' into feature/list_onecolumn_fullwidthtext_bodytextonly 
* develop:
  header updates
  undoing removal
  mild updates
  hero is working. commenting done.
  rolled back change.
  moved hero is setWithModel. Was not being set. Mild changes.
  undo commented code
  Caret fix in table view cell code condensing extra init functions
 2020-02-25 09:37:28 +05:30
Pfeil, Scott Robert
b255b1acac header updates 2020-02-24 16:53:42 -05:00
Subhankar Acharya
47603e7a59 Added ListOneColumnFullWidthTextAllTextAndLinks molecule class and model files. 2020-02-21 16:58:16 +05:30
Pfeil, Scott Robert
cc5536a8d1 Minor fixes 2020-02-20 19:07:54 -05:00
Pfeil, Scott Robert
d8a5dd336b Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/ListLeftVar_Checkbox-_Right_Caret 2020-02-20 18:34:50 -05:00
Pfeil, Scott Robert
ae62d161fd code improvements 2020-02-20 18:33:03 -05:00
Kevin G Christiano
b96b48787c beginning arrow molecule 2020-02-20 14:49:25 -05:00
Kevin G Christiano
7d8f850e63 providing new molecule 2020-02-20 14:35:35 -05:00
Prateek Arora
22285dda62 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-20 18:02:42 +05:30
Subhankar Acharya
d7a13704f2 Reference files 2020-02-20 15:56:02 +05:30
Subhankar Acharya
4803e20363 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/ListLeftVar_Checkbox-_Right_Caret 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
 2020-02-20 14:52:57 +05:30
Subhankar Acharya
dc3178815c Renaming of molecule file, class and model 2020-02-20 14:08:47 +05:30
Prateek Arora
8093568559 Review comment fixes 2020-02-20 13:42:17 +05:30
Pfeil, Scott Robert
fa0ec8ab45 minor fixes 2020-02-19 09:40:17 -05:00
Prateek Arora
f8fea032b5 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-18 13:42:31 +05:30
Lekshmi S
391cd9ae2c Merge branch 'develop' into feature/rightVariable_payments_list 
# Conflicts:
#	MVMCoreUI/Atoms/Views/ImageViewModel.swift
 2020-02-18 08:29:39 +05:30
Suresh, Kamlesh
68bf45f583 content mode 2020-02-17 17:35:20 -05:00
Suresh, Kamlesh
347928a9b6 remove files 2020-02-17 16:48:42 -05:00
Suresh, Kamlesh
e431ea2de9 fixes 2020-02-14 15:56:36 -05:00
Lekshmi S
6cbf4a53bc Restructured file group. 2020-02-14 14:09:03 +05:30
Lekshmi S
194c004f17 Merge branch 'develop' into feature/ListLeftVar_Checkbox-_Right_Caret 2020-02-14 10:37:14 +05:30
Lekshmi S
f5b537084f Merge branch 'develop' into feature/rightVariable_payments_list 2020-02-14 10:31:56 +05:30
Kevin G Christiano
5558cc8324 adding new base class. improving carousel logic. 2020-02-13 15:33:55 -05:00
Kevin G Christiano
4bfa87a901 aligning 2020-02-13 12:46:15 -05:00
Kevin G Christiano
664b4fd230 merging from develop 2020-02-13 12:44:31 -05:00
Kevin G Christiano
fd72f5ff95 work in progress 2020-02-13 12:42:38 -05:00
Pfeil, Scott Robert
66a06d9815 Clean up and list item convenience 2020-02-13 10:19:22 -05:00
Lekshmi S
cadf70ce70 Merge branch 'develop' into feature/ListLeftVar_Checkbox-_Right_Caret 
# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
 2020-02-13 12:28:35 +05:30
Lekshmi S
c953981406 Removed container and added stackmodel 2020-02-13 09:00:37 +05:30
Lekshmi S
8ca1ebc6ad Merge branch 'develop' into feature/rightVariable_payments_list 
# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
 2020-02-13 08:33:30 +05:30
Pfeil, Scott Robert
eae3653b65 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-02-12 20:57:04 -05:00
Pfeil, Scott Robert
5b898b1b21 small clean and reorg 2020-02-12 20:56:05 -05:00
Pfeil, Scott Robert
04e1e44343 merge 2020-02-12 20:55:46 -05:00
Pfeil, Scott Robert
5cecd5f031 Minor fixes 2020-02-12 20:36:05 -05:00
Lekshmi S
63201a8fa6 19042 - List - Left Variable - Checkbox - With Right Caret - All Text & Links story commit. 
Added Molecule class, Model class
 2020-02-12 15:11:41 +05:30
Subhankar Acharya
05aaac573d Code checkin after changing way of implementation. 2020-02-11 17:30:34 +05:30
Lekshmi S
d683d420c8 Code changes based on review: 
Modified class name according to Confluence
Removed Initializers
Removed extra spaces.
 2020-02-11 12:22:50 +05:30
Kruthika KP
965dcf538b Class naming convention changed and removed init methods where not required. 2020-02-11 12:18:45 +05:30
Lekshmi S
5686fea2c8 Merge branch 'develop' into feature/leftvariableicon_with_rightcaretlist 2020-02-10 15:43:56 +05:30
Lekshmi S
a87926a810 Story - 19072: List - Right Variable - Payments Initial Commit 
Added Molecule Class, Model Class
 2020-02-10 15:41:12 +05:30
Subhankar Acharya
c94a440008 ThreeColumnPlanDataDividerList reference file 2020-02-10 11:54:45 +05:30
Pfeil, Scott Robert
bf8ea963b0 bring back view controller 2020-02-07 15:29:58 -05:00
Kevin G Christiano
af7d2e406e project file changes 2020-02-07 09:26:01 -05:00
Kevin G Christiano
d02586f613 merge from develop 2020-02-07 09:20:39 -05:00
Prateek Arora
5ae5cfd2d8 WIP: New molecule changes 2020-02-07 17:03:33 +05:30
Kevin G Christiano
977bff851e latest and greatest. 2020-02-06 15:51:13 -05:00
Pfeil, Scott Robert
0d4008dec7 CaretLink 2020-02-06 09:55:18 -05:00
Pfeil, Scott Robert
59707ef781 merge 2020-02-06 09:52:05 -05:00
Prateek Arora
93ba680bb8 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-06 12:31:48 +05:30
Kruthika KP
e2d2decc5c Merge branch 'develop' into feature/leftvariableicon_with_rightcaretlist 2020-02-06 10:36:42 +05:30
Kruthika KP
4bcfdb96db 18936 - Left Variable Icon - with - Right Caret - initial commit. 2020-02-05 13:17:50 +05:30
Xinlei(Ryan) Pan
2b74531ce1 change CaretButton to MFCaretButton in legacy view/viewcontroller, CaretButton will be only used in molecule 2020-02-04 13:59:14 -05:00
Prateek Arora
35e7052abb WIP: LabelsWithCircleProgressBar 2020-02-04 14:10:01 +05:30
Pfeil, Scott Robert
205e9707e6 move legacy 2020-01-31 16:37:24 -05:00
Pan, Xinlei (Ryan)
ae00d57bd3 Merge branch 'feature/primarybuttonview' into 'develop' 
Feature/primarybuttonview

See merge request BPHV_MIPS/mvm_core_ui!237
 2020-01-31 15:11:52 -05:00
Kevin G Christiano
8832bbd0b7 shaping up the page control (carouselIndicator) 2020-01-31 14:26:37 -05:00
Pfeil, Scott Robert
a19a06e7b6 Merge branch 'feature/button_swifty' into 'develop' 
Feature/button swifty

See merge request BPHV_MIPS/mvm_core_ui!235
 2020-01-30 13:55:25 -05:00
Xinlei(Ryan) Pan
347f054ed1 merge from develop 2020-01-29 15:44:42 -05:00
Xinlei(Ryan) Pan
e6ae064c44 add PrimaryButtonView back into legacy view and view controller 2020-01-29 10:30:01 -05:00
Pfeil, Scott Robert
5f40942468 missed CheckboxLabel name change 2020-01-29 10:13:30 -05:00
Pfeil, Scott Robert
ba8058cceb button swift 2020-01-28 12:58:51 -05:00
Pfeil, Scott Robert
98d0dc26f6 name update 2020-01-27 12:28:18 -05:00
Pfeil, Scott Robert
ecb381e943 switch to toggle 2020-01-27 12:10:48 -05:00
Pfeil, Scott Robert
fe10b40148 reorg 2020-01-24 16:48:28 -05:00
Xinlei(Ryan) Pan
085aa62c8b merge from feature/coding 2020-01-24 15:13:04 -05:00
Xinlei(Ryan) Pan
5e4f976a1c re add entry field container for fixing odd behavior 2020-01-24 10:42:13 -05:00
Xinlei(Ryan) Pan
af20b0a8a4 remove entryfieldcontainer for odd behavior 2020-01-24 10:41:04 -05:00
Pan, Xinlei (Ryan)
b20212ccd4 Merge branch 'feature/checkbox_label_fix' into 'feature/coding' 
Checkbox models added

See merge request BPHV_MIPS/mvm_core_ui!231
 2020-01-24 10:23:17 -05:00
Kevin G Christiano
02107a3498 merging 2020-01-24 10:19:23 -05:00
Pfeil, Scott Robert
1b4646df31 cleaning 2020-01-24 08:49:04 -05:00
Kevin G Christiano
af83a2aa1e alighing with merge. 2020-01-23 13:10:27 -05:00
Kevin G Christiano
4cc5a15db9 checkbox modeling. Strange issue with EntryFieldContainer. To be observed. 2020-01-23 12:12:45 -05:00
Kevin G Christiano
8a09424dbe Removed and added file back. Something was corrupted with the path name. 2020-01-23 10:27:36 -05:00
Suresh, Kamlesh
d78bc7aa58 moving top 2020-01-22 14:38:54 -05:00
Pfeil, Scott Robert
c6ba48397c Add some missing models 2020-01-22 14:31:33 -05:00
Suresh, Kamlesh
a068c0af1b merge 2020-01-22 14:30:00 -05:00
Suresh, Kamlesh
f816081d8e check box 2020-01-22 13:58:56 -05:00
Kevin G Christiano
6522472be2 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
 2020-01-22 11:50:52 -05:00
Kevin G Christiano
f7ce81874e EntryField Models. Updated dropdown for new dropdown. 2020-01-22 11:47:21 -05:00
Pfeil, Scott Robert
d22715585e Eyebrow headline body to link 2020-01-22 11:44:02 -05:00
Xinlei(Ryan) Pan
85675a1d0e merge feature/coding 2020-01-22 10:24:18 -05:00
Chintakrinda, Arun Kumar (Arun)
5534f6ba58 Checkbox models added 
Label action attribute issue fixed
 2020-01-22 20:27:14 +05:30
Pfeil, Scott Robert
00d1bf7be6 re-organizing 2020-01-22 09:11:56 -05:00
Suresh, Kamlesh
943799d462 more models 2020-01-21 23:33:24 -05:00
Xinlei(Ryan) Pan
eb1cc491b3 Merge branch 'feature/coding' into feature/link 2020-01-21 15:38:28 -05:00
Xinlei(Ryan) Pan
cc27b7e6cf public mftextbutton 2020-01-21 15:36:22 -05:00
Xinlei(Ryan) Pan
66ee6bbc72 update mftextbutton missing 2020-01-21 15:35:14 -05:00
Pfeil, Scott Robert
f5ed509a39 renaming 2020-01-21 15:33:27 -05:00
Xinlei(Ryan) Pan
b24745fd89 merge from feature/coding 2020-01-21 15:22:15 -05:00
Pfeil, Scott Robert
42b57dcd5d Cleaning 2020-01-21 12:10:48 -05:00
Pfeil, Scott Robert
9847ef5302 stack flexibility update 
molecule container protocol fix missing functions
update numbered and unordered list to more model approach
 2020-01-17 13:51:46 -05:00
Pfeil, Scott Robert
d26d3b1e40 merge 2020-01-17 09:32:58 -05:00
Pfeil, Scott Robert
0529c9d357 merge 2020-01-16 15:03:16 -05:00
Pfeil, Scott Robert
db0d9f4353 Container protocol 
Doughnut chart model
Break stack into regular and dynamic components
 2020-01-16 14:59:24 -05:00
Xinlei(Ryan) Pan
56b37255c2 merge from feature/coding 2020-01-16 09:59:14 -05:00
Suresh, Kamlesh
ef1215c130 merge 2020-01-15 18:37:36 -05:00
Suresh, Kamlesh
d69dbc41d0 fixes 2020-01-15 18:27:56 -05:00
Suresh, Kamlesh
47ccd681ae merge 2020-01-15 16:49:42 -05:00
Pfeil, Scott Robert
a318b19410 Merge branch 'feature/coding' into feature/doughnutchart_from_coding 2020-01-15 10:41:53 -05:00
Pfeil, Scott Robert
952c3bdb53 Toggle model temporary 2020-01-14 21:08:48 -05:00
Suresh, Kamlesh
c3433c2f80 merge 2020-01-14 19:29:37 -05:00
Pfeil, Scott Robert
e85270d038 new molecules to model 2020-01-14 18:33:34 -05:00
Pfeil, Scott Robert
7255c0c354 Merge remote-tracking branch 'refs/remotes/origin/feature/coding' 
Conflicts:
	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
	MVMCoreUI/Molecules/Items/TableViewCell.swift
	MVMCoreUI/Molecules/ModelMoleculeViewProtocol.swift
	MVMCoreUI/Organisms/MoleculeStackView.swift
 2020-01-14 15:58:12 -05:00
Murugan, Vimal
31aabef3ae Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-14 21:57:12 +05:30
Pfeil, Scott Robert
2f6859f543 button model fix 2020-01-14 11:17:10 -05:00
Murugan, Vimal
46b37a5f56 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 20:50:24 +05:30
Murugan, Vimal
36a469ab6b Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-14 19:42:33 +05:30
Pfeil, Scott Robert
145b9d5423 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 21:16:03 -05:00
Pfeil, Scott Robert
6b7bb180fc corner labels temporary 2020-01-13 21:15:21 -05:00
panxi
53e00a7654 Merge branch 'feature/coding' into feature/unordered_numbered_list_from_coding 2020-01-13 17:03:00 -05:00
Kevin G Christiano
aea8bc5f7b Merge branch 'develop' into feature/swiftify_switch 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-01-13 16:02:18 -05:00
Ryan
255fce072b merge from develop 2020-01-13 15:47:27 -05:00
Kevin G Christiano
edddac84a8 Merge branch 'develop' into feature/link 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-01-13 14:59:46 -05:00
Kevin G Christiano
223ab11783 Merge branch 'develop' into feature/button 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-01-13 14:35:23 -05:00
Ryan
595cc04ec0 merge from feature/coding 2020-01-13 14:18:47 -05:00
Ryan
a2d5474b10 merge feature/coding 2020-01-13 14:12:16 -05:00
Ryan
cea1ecd52c merge from develop 2020-01-13 14:02:20 -05:00
Murugan, Vimal
ec451d1f2e Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 00:04:39 +05:30
Kevin G Christiano
0b87ff254b Merge branch 'develop' into feature/link 2020-01-13 13:32:21 -05:00
Kevin G Christiano
9882528b9e Merge branch 'develop' into feature/link 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-01-13 12:50:08 -05:00
Pfeil, Scott Robert
788145332f Two button view temporary model fix 
primary button model
 2020-01-13 12:44:05 -05:00
Pfeil, Scott Robert
5c0d57fded Merge branch 'feature/model_wip_kamlesh' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-13 11:33:59 -05:00
Pfeil, Scott Robert
bb0be72519 Link update 2020-01-13 11:33:44 -05:00
Suresh, Kamlesh
1b28db30a0 Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-13 11:11:04 -05:00
Suresh, Kamlesh
13183f7b76 remove null in project file 2020-01-13 11:10:51 -05:00
Pfeil, Scott Robert
73c19383b6 Scroller update 2020-01-13 11:08:58 -05:00
Kevin G Christiano
f81b50d077 Merge branch 'develop' into feature/swiftified_textField 2020-01-13 11:05:31 -05:00
Pfeil, Scott Robert
1b06d7007b circle progress 2020-01-13 10:20:11 -05:00
Pfeil, Scott Robert
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -05:00
Murugan, Vimal
396c22f243 doughnut chart model added 
doughnut chart view added
doughnut chart added
 2020-01-11 16:06:25 +05:30
Murugan, Vimal
30d864749a unordered list added 
numbered list added
 2020-01-11 10:30:40 +05:30
Pan, Xinlei (Ryan)
a2ef7e026f Merge branch 'feature/headline_body_caret_link_image_molecule' into 'develop' 
Feature/headline body caret link image molecule

See merge request BPHV_MIPS/mvm_core_ui!212
 2020-01-10 11:38:32 -05:00
Pfeil, Scott Robert
99a258c0f8 Template associated type testing 2020-01-10 08:57:56 -05:00
Pfeil, Scott Robert
c098914309 pull 2020-01-09 16:37:54 -05:00
panxi
83b0a55404 merge from feature/coding 2020-01-09 16:22:47 -05:00
panxi
99b97fd934 merge from develop 2020-01-09 16:17:29 -05:00
Suresh, Kamlesh
a7072fe1a0 remove template 2020-01-09 16:01:27 -05:00
Kevin G Christiano
9308d6d892 Move Button to Base Classes Folder. 2020-01-09 16:01:12 -05:00
Suresh, Kamlesh
8d2348fe63 swiftify MoleculeDelegateProtocol 2020-01-09 15:59:56 -05:00
Pfeil, Scott Robert
391e3a635d remove file 2020-01-09 15:53:42 -05:00
Pfeil, Scott Robert
f6c3a02f0e remove old extension 2020-01-09 14:20:58 -05:00
Pfeil, Scott Robert
78461d0557 CaretLink 2020-01-09 13:48:35 -05:00
Kevin G Christiano
62c637f02b Merge branch 'develop' into feature/swiftify_switch 2020-01-08 14:39:49 -05:00
Kevin G Christiano
468f58b88e Merge branch 'develop' into feature/button 2020-01-08 13:34:31 -05:00
Kevin G Christiano
b6cb83a146 Merge branch 'develop' into feature/swiftified_textField 2020-01-08 13:08:46 -05:00
Suresh, Kamlesh Jain
f0c7fbcb9e Merge branch 'feature/textfield_list_update_drop_down' into 'develop' 
Feature/textfield list update drop down

See merge request BPHV_MIPS/mvm_core_ui!211
 2020-01-08 11:58:08 -05:00
Pfeil, Scott Robert
b620a533d5 Color 
CaretLink model change name
 2020-01-08 11:22:34 -05:00
Kevin G Christiano
a88bb1e0ff Merge branch 'develop' into feature/swiftify_switch 
# Conflicts:
#	MVMCoreUI/BaseClasses/Control.swift
 2020-01-08 10:19:01 -05:00
Kevin G Christiano
7d2770356b Merge branch 'develop' into feature/coding 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-01-08 09:29:52 -05:00
Kevin G Christiano
916f63240b Merge branch 'develop' into feature/swiftified_textField 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2020-01-07 16:14:42 -05:00
Suresh, Kamlesh
1230854311 merge fixes 2020-01-07 14:08:45 -05:00
Pfeil, Scott Robert
d3e3a6809c container fixes for modal 2020-01-07 11:08:00 -05:00
Arora, Prateek
129a0e9241 New molecule -> headLineBodyCaretLinkImage 2020-01-07 12:34:29 +05:30
Suresh, Kamlesh
d5cf307de4 merge fixes 2020-01-06 17:30:02 -05:00
Murugan, Vimal
f1f34b2893 textfield list view and textfield list form controller been moved to mobilefirstframework 2020-01-04 14:26:09 +05:30
Murugan, Vimal
e5ca7b5c9e bullet list molecule added 2020-01-02 21:33:31 +05:30
Pfeil, Scott Robert
58c4a7fd8d merge 2020-01-02 09:34:29 -05:00
Pfeil, Scott Robert
5a8584342a merge 2020-01-02 09:31:58 -05:00
panxi
ca1a6f8c83 merge from develop 2019-12-20 14:59:44 -05:00
Kevin G Christiano
fbc6e83038 Created Protocol to centralize tap detection logic. 2019-12-20 13:27:22 -05:00
Suresh, Kamlesh
ba76fedff4 fixes 2019-12-20 10:24:36 -05:00
Kevin G Christiano
3b59e03695 Merge branch 'develop' into feature/swiftified_textField 
# Conflicts:
#	MVMCoreUI/Atoms/Buttons/CaretButton.swift
#	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
 2019-12-19 15:11:48 -05:00
Robinson, Blake
39c96849c8 Translates MFCustomButton to Button 2019-12-18 17:58:53 -05:00
Kevin G Christiano
77e2269062 Provided an alternative means to provide Codable StackView.Alignment string. 2019-12-17 09:46:47 -05:00
Suresh, Kamlesh
c6d5775d57 CaretButtonModel 2019-12-16 13:51:37 -05:00
Pfeil, Scott Robert
7f01bc286c stack item as container 2019-12-13 17:07:10 -05:00
panxi
8612b34ac7 update listitem 2019-12-13 11:26:48 -05:00
Suresh, Kamlesh
58ec1abcfe list model protocol 2019-12-13 11:07:32 -05:00
panxi
52186bf089 add protocol func into view 2019-12-12 17:22:26 -05:00
panxi
8d811f229f change from viewconstrainingview to view 2019-12-12 15:28:47 -05:00
Pfeil, Scott Robert
be1b867a9a testing container ideas 2019-12-12 14:50:52 -05:00
Pfeil, Scott Robert
e5acf63e6f container testing 2019-12-12 10:03:41 -05:00
Kevin G Christiano
eab910011e General working order of the Toggle. 2019-12-11 15:10:26 -05:00
Suresh, Kamlesh
7c7232fe6a remove PageModel 2019-12-09 14:36:14 -05:00
Suresh, Kamlesh
3a1e3356bf module molecule 2019-12-06 14:30:19 -05:00
Suresh, Kamlesh
9676f41633 container model protocol 2019-12-04 16:59:02 -05:00
Suresh, Kamlesh
b7ff1354b8 clean up 2019-12-04 16:21:10 -05:00
Kevin G Christiano
8a796467e6 Initial state of Swiftified Switch. 2019-12-04 15:50:08 -05:00
Kevin G Christiano
99952db4b3 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2019-12-04 15:28:30 -05:00
Kevin G Christiano
c627901d74 updates to color model and extension. 2019-12-04 15:28:22 -05:00
Pfeil, Scott Robert
a10c1a6161 merge develop 2019-12-04 13:43:24 -05:00
Pfeil, Scott Robert
d95e42330e moving files 2019-12-04 13:09:50 -05:00
Kevin G Christiano
7e48670179 Adding Model for UIColor and supporting UIColor Extension. 2019-12-04 12:38:57 -05:00
Robinson, Blake
988e30daa9 Creates Link atom to replace MFTextButton 2019-12-02 11:15:50 -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
Suresh, Kamlesh
0648ec0191 fixes 2019-11-27 17:25:23 -05:00
Suresh, Kamlesh
7a09e4b830 merge 2019-11-27 14:38:01 -05:00
Pfeil, Scott Robert
63556707bc temporary dropdown molecule 
label reuse font fixes
 2019-11-27 13:49:01 -05:00
Suresh, Kamlesh
9a6fd85405 merge 2019-11-27 11:05:52 -05:00
Suresh, Kamlesh
5446fb0785 WIP 2019-11-26 19:20:38 -05:00
panxi
437138007f merge 2019-11-26 13:54:00 -05:00
panxi
8422362e77 merge from develop 2019-11-26 11:30:43 -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
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
panxi
6303c3f92d update label model 2019-11-21 13:15:27 -05:00
Kevin G Christiano
f19d45b865 Merge branch 'develop' into feature/swiftified_textField 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atoms/Views/CaretView.swift
#	MVMCoreUI/Molecules/Items/TableViewCell.swift
 2019-11-21 11:55:21 -05:00
Suresh, Kamlesh
7b2fc7bfba some more stuff 2019-11-21 11:53:26 -05:00
Kevin G Christiano
88442fe59c latest. 2019-11-21 11:47:12 -05:00
Hedden, Kyle Matthew
3944e02863 Remote Scott's missing test controller. 2019-11-20 17:30:52 -05:00
panxi
715b5f0167 add image, move label model next to label 2019-11-20 15:48:14 -05:00
panxi
28a04218f9 create image model 2019-11-20 15:43:26 -05:00
panxi
dde5f1d1a4 add caret view model and dash line model 2019-11-20 15:30:42 -05:00