Commit Graph

1002 Commits

Author SHA1 Message Date
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
Kevin G Christiano
5bc78e594e getting ready for the next phase. 2019-10-24 15:43:06 -04:00
Kevin G Christiano
70a3ad2804 latest. no errs. 2019-10-24 13:51:19 -04:00
Kevin G Christiano
15c2050c4e Merge branch 'develop' into feature/swiftified_textField 2019-10-24 11:20:49 -04:00
Kevin G Christiano
d15d8b2636 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-24 11:20:26 -04:00
Pfeil, Scott Robert
5f6c583094 Merge branch 'bugfix/legacy_view_constraining' into 'develop'
Bugfix/legacy view constraining

See merge request BPHV_MIPS/mvm_core_ui!159
2019-10-24 09:36:36 -04:00
Pfeil, Scott Robert
603652537d remove large text 2019-10-24 09:34:51 -04:00
Pfeil, Scott Robert
7f74833be2 Merge branch 'feature/improve_linkability_label' into 'develop'
Label Link Improvements.

See merge request BPHV_MIPS/mvm_core_ui!139
2019-10-24 09:32:22 -04:00
Pfeil, Scott Robert
0ff661f3c4 revert for legacy 2019-10-24 09:31:01 -04:00
Kevin G Christiano
f0c7f6bce6 unwrap. 2019-10-24 09:19:16 -04:00
Kevin G Christiano
999da709db Merge branch 'develop' into feature/improve_linkability_label
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-10-24 09:18:25 -04:00
Kevin G Christiano
393b3f355b lztest greatest. 2019-10-24 09:08:53 -04:00
Pfeil, Scott Robert
ef2df903e8 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-10-24 09:06:38 -04:00
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
b8e1389798 review 2019-10-23 17:21:44 -04:00
Suresh, Kamlesh
d2ca3adacf code review 2019-10-23 15:59:03 -04:00
Kevin G Christiano
a4aedaad90 revert. 2019-10-23 15:43:57 -04:00
Kevin G Christiano
8aaa8cb77f centered. 2019-10-23 15:17:01 -04:00
Kevin G Christiano
a5ffae9edd Latest state. 2019-10-23 15:15:23 -04:00
Suresh, Kamlesh
73342e40d1 code optimization 2019-10-23 14:51:35 -04:00
Kevin G Christiano
74abef0c30 saving state. 2019-10-23 13:59:10 -04:00
Suresh, Kamlesh
d398a45054 code review 2019-10-23 13:53:58 -04:00
Suresh, Kamlesh
52fca407e3 remove tap and accessibility 2019-10-23 12:37:26 -04:00
Suresh, Kamlesh
49f0048d77 Merge branch 'feature/swift_radio' into 'feature/molecule_radio_button'
changes to test

See merge request BPHV_MIPS/mvm_core_ui!158
2019-10-23 11:45:13 -04:00
Pfeil, Scott Robert
0cc81c3255 default background color 2019-10-23 11:38:15 -04:00
Pfeil, Scott Robert
0b364fa004 Radio button changes 2019-10-23 11:32:34 -04:00
Pfeil, Scott Robert
7563269680 changes to test 2019-10-23 10:36:32 -04:00
Pfeil, Scott Robert
5e486ff716 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-10-23 09:09:17 -04:00
Pfeil, Scott Robert
ddc9288da1 Merge branch 'feature/fixes_stack_and_label_link' into 'develop'
Fix for label and molecule stack

See merge request BPHV_MIPS/mvm_core_ui!157
2019-10-23 09:02:57 -04:00
Chintakrinda, Arun Kumar (Arun)
b8bdf4829e Fix for label and molecule stack 2019-10-23 18:21:38 +05:30
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
Suresh, Kamlesh
5ee34fb027 dummy group 2019-10-22 15:11:16 -04:00
Pfeil, Scott Robert
a5546c0fcc Merge branch 'bugfix/name_correction' into 'develop'
Name correction

See merge request BPHV_MIPS/mvm_core_ui!156
2019-10-22 11:54:44 -04:00
Kevin G Christiano
9b86b4449f dcsds 2019-10-22 11:54:13 -04:00
Pfeil, Scott Robert
252beb311a dynamic type 2019-10-22 11:40:50 -04:00
Kevin G Christiano
083b630054 Merge branch 'develop' into feature/improve_linkability_label 2019-10-22 11:36:58 -04:00
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
Kevin G Christiano
2248b36ccb one less body. 2019-10-22 11:10:06 -04:00
Kevin G Christiano
b79b999910 added secondary. 2019-10-22 11:04:22 -04:00
Suresh, Kamlesh
4ef662d1ca reivew 2019-10-22 09:59:37 -04:00
Kevin G Christiano
64f4356a74 Merge branch 'develop' into feature/swiftified_textField 2019-10-22 09:52:47 -04:00
Kevin G Christiano
2ce41ad74b moar texht. 2019-10-22 09:52:12 -04:00
Suresh, Kamlesh
fcb377df33 space 2019-10-22 09:13:07 -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
Hedden, Kyle Matthew
b3b193e63d Merge branch 'feature/add_current_page_type_prop' into 'develop'
Add current page type to session object.

See merge request BPHV_MIPS/mvm_core_ui!154
2019-10-21 17:41:12 -04:00
Suresh, Kamlesh
f1c319244a radioButton and radioButtonWithLabel and code review 2019-10-21 17:26:33 -04:00
Pan, Xinlei (Ryan)
0b1a1b5d73 Merge branch 'release/6_21' into 'develop'
Release/6 21

See merge request BPHV_MIPS/mvm_core_ui!155
2019-10-21 15:34:13 -04:00
Kevin G Christiano
4742eace6b Merge branch 'develop' into feature/swiftified_textField 2019-10-21 12:12:19 -04:00
Kevin G Christiano
8d11e28f4e promising state. 2019-10-21 12:11:58 -04:00
Kevin G Christiano
6c8ced47c9 trying out a new subclass. 2019-10-21 11:47:13 -04:00