Commit Graph

433 Commits

Author SHA1 Message Date
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