Commit Graph

152 Commits

Author SHA1 Message Date
panxi
9ec661ae3b add label model 2019-11-22 14:31:17 -05:00
panxi
715b5f0167 add image, move label model next to label 2019-11-20 15:48:14 -05:00
panxi
dde5f1d1a4 add caret view model and dash line model 2019-11-20 15:30:42 -05:00
panxi
5fd74b695f create model for progress bar, using ModelMoleculeViewProtocol 2019-11-20 14:58:58 -05:00
Suresh, Kamlesh
bf20fb3104 fixes 2019-11-19 15:32:35 -05:00
panxi
1a3d3eb36f update with new code, move core code to mvmcore 2019-11-12 17:36:00 -05:00
panxi
4111080497 Merge branch 'develop' into feature/models 2019-11-12 15:28:38 -05:00
Suresh, Kamlesh
a212dff80f fixes 2019-11-07 10:45:40 -05:00
Pfeil, Scott Robert
347ebbed8c typo fixes 2019-11-07 10:05:17 -05:00
Pfeil, Scott Robert
5b8fce36e6 merge develop 2019-11-05 09:14:19 -05:00
panxi
7870a116c6 create circle progress view 2019-10-31 16:15:47 -04:00
Suresh, Kamlesh
205c83c097 intial draft 2019-10-28 14:47:42 -04:00
Khan, Arshad
45b0b01646 implemented feedback 2019-10-25 21:04:53 +05:30
Khan, Arshad
355f670bd0 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-25 01:19:33 +05:30
Khan, Arshad
c1adbe2f2e Crash fixes in Label
update molecule name from progressBar to progressbar as per oneconfluence mapping name and Android mapping name.
2019-10-25 01:17:54 +05:30
Pfeil, Scott Robert
909fe9ae75 Merge branch 'feature/molecule_radio_button' into 'develop'
Feature/molecule radio button

See merge request BPHV_MIPS/mvm_core_ui!70
2019-10-23 17:30:00 -04:00
Suresh, Kamlesh
d398a45054 code review 2019-10-23 13:53:58 -04:00
Khan, Arshad
cd40ebfccd Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-23 16:28:28 +05:30
Pfeil, Scott Robert
758615bcb7 Merge branch 'feature/healine_body_button_molecule' into 'develop'
HeadlineBodyButton Mole

See merge request BPHV_MIPS/mvm_core_ui!134
2019-10-22 11:13:30 -04:00
Khan, Arshad
a9517759ea Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-22 13:50:43 +05:30
Suresh, Kamlesh
f1c319244a radioButton and radioButtonWithLabel and code review 2019-10-21 17:26:33 -04:00
Khan, Arshad
03ee7b99c2 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-21 20:58:22 +05:30
Hedden, Kyle Matthew
a3663ee1b5 Add current page type to session object. 2019-10-19 15:14:31 -04:00
panxi
22eb114635 merge from develop 2019-10-17 15:32:03 -04:00
Kevin G Christiano
3178fa0223 Merge branch 'develop' into feature/healine_body_button_molecule
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-10-17 14:40:51 -04:00
Kevin G Christiano
7d6289463d Improved molecular logic of checkbox. 2019-10-07 16:30:14 -04:00
Khan, Arshad
fe7fb2db03 changing separator to line mapping as per server and Android confirmation. 2019-09-30 22:01:11 +05:30
Kevin G Christiano
35f7024f8d Adding two new checkbox swift classes. 2019-09-25 14:19:49 -04:00
Khan, Arshad
c7978c52c9 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-09-24 15:20:08 +05:30
Pfeil, Scott Robert
0bb3c8a719 new molecule and gone state of stack. 2019-09-23 12:21:59 -04:00
Khan, Arshad
decf0bf9e6 adding settingsList template 2019-09-18 21:58:30 +05:30
Kevin G Christiano
bedd05daa6 Creation and inclusion of HeadlineBodyButton molecule. 2019-09-12 14:42:10 -04:00
Pan, Xinlei (Ryan)
0e27266b85 Merge branch 'feature/multiprogress' into 'develop'
Feature/multiprogress

See merge request BPHV_MIPS/mvm_core_ui!132
2019-09-11 16:49:31 -04:00
Suresh, Kamlesh
fe066f5530 merge 2019-09-10 10:42:08 -04:00
panxi
595a3b1e38 fix typo 2019-09-09 16:49:12 -04:00
panxi
dcd87fb924 add MultiProgress 2019-09-09 16:42:38 -04:00
Pfeil, Scott Robert
b4c53f838b Tabs table cell 2019-09-09 14:07:32 -04:00
Pfeil, Scott Robert
658ed16bbd accordion list item 2019-09-03 15:14:12 -04:00
Pfeil, Scott Robert
b5276f5519 New molecules and arranging files 2019-08-29 08:28:07 -04:00
Suresh, Kamlesh
0f1ea89623 merge 2019-08-27 12:13:48 -04:00
Pfeil, Scott Robert
4bc22dbb8e switches 2019-08-26 12:35:04 -04:00
Pfeil, Scott Robert
d5e49d0e5a progress bar fixes 2019-08-15 10:50:29 -04:00
Kevin G Christiano
519542d3e5 Renamed class. 2019-08-05 10:09:11 -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
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
Kevin G Christiano
c6d445034b Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-07-27 18:17:29 -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
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
1ec4f271ff Merge branch 'bugfix/update_after_load_image' into feature/standardlistitemwithimage 2019-07-23 10:07:35 -04:00