Commit Graph

177 Commits

Author SHA1 Message Date
Suresh, Kamlesh
d5cf307de4 merge fixes 2020-01-06 17:30:02 -05:00
panxi
ca1a6f8c83 merge from develop 2019-12-20 14:59:44 -05:00
Suresh, Kamlesh
1db2a5b058 fixes 2019-12-18 12:06:13 -05:00
Pfeil, Scott Robert
092dfd6ad0 List item updates 2019-12-16 13:40:04 -05:00
panxi
8612b34ac7 update listitem 2019-12-13 11:26:48 -05:00
panxi
8d811f229f change from viewconstrainingview to view 2019-12-12 15:28:47 -05:00
Pfeil, Scott Robert
e5acf63e6f container testing 2019-12-12 10:03:41 -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
0288943746 fixes 2019-12-04 14:27:45 -05:00
Pfeil, Scott Robert
a10c1a6161 merge develop 2019-12-04 13:43:24 -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
dd85a134ac merge 2019-11-25 09:05:32 -05:00
panxi
9ec661ae3b add label model 2019-11-22 14:31:17 -05:00
Suresh, Kamlesh
7b2fc7bfba some more stuff 2019-11-21 11:53:26 -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
Pfeil, Scott Robert
c96f5050a8 Line to swift 2019-11-20 10:20:24 -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
Pfeil, Scott Robert
716dcff566 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-12 14:45:48 -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
Pfeil, Scott Robert
0a45d61eb7 merge 2019-11-05 08:50:17 -05:00
Pfeil, Scott Robert
52f31eff42 header changes 2019-11-04 15:34:32 -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
Pfeil, Scott Robert
b5a97de183 swiftify 2019-10-28 14:03:47 -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