Commit Graph

849 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
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
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
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
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
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
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
Pfeil, Scott Robert
9ef670cfc4 Merge branch 'feature/label_hero_character' into 'develop'
Label Hero

See merge request BPHV_MIPS/mvm_core_ui!136
2019-10-18 12:05:55 -04:00
Pan, Xinlei (Ryan)
b0b0121d49 Merge branch 'feature/checkbox_update' into 'develop'
Few more updates to Checkbox.

See merge request BPHV_MIPS/mvm_core_ui!147
2019-10-18 11:32:01 -04:00
Kevin G Christiano
0bb1debc77 no comment. 2019-10-18 10:28:22 -04:00
Kevin G Christiano
f067a20ba9 hero stuff. 2019-10-18 08:47:14 -04:00
Kevin G Christiano
720d17d751 revisions made. 2019-10-17 15:35:14 -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
6d52663b4f fixed small error in refactor. 2019-10-17 14:06:01 -04:00
Kevin G Christiano
73ac4b932b refacgtorerd. 2019-10-17 12:39:05 -04:00
Kevin G Christiano
11b2ddc4dd Merge branch 'develop' into feature/label_hero_character 2019-10-17 12:17:17 -04:00
Kevin G Christiano
b5dcf68c5d refactoring taxtcontainer. 2019-10-17 12:17:14 -04:00
Kevin G Christiano
2fdc4795f4 correcting type. 2019-10-17 12:00:44 -04:00
Kevin G Christiano
29ffa40cc3 Merge branch 'develop' into feature/checkbox_update 2019-10-17 11:57:34 -04:00
Kevin G Christiano
f267b98438 constraints added. changes made. 2019-10-17 11:57:30 -04:00
Pfeil, Scott Robert
9b73a4d98b Merge branch 'feature/remove_legacy_os_code' into 'develop'
typo fix

See merge request BPHV_MIPS/mvm_core_ui!153
2019-10-17 11:23:10 -04:00
Pfeil, Scott Robert
38beb2c7fa typo fix 2019-10-17 11:21:42 -04:00
Pfeil, Scott Robert
f3ed023d33 Merge branch 'feature/remove_legacy_os_code' into 'develop'
remove legacy os code

See merge request BPHV_MIPS/mvm_core_ui!152
2019-10-17 11:10:54 -04:00
Pfeil, Scott Robert
bb51fba0e5 remove legacy os code 2019-10-17 10:31:34 -04:00
Suresh, Kamlesh
603ecccf35 Merge branch 'release/6_20' into 'develop'
Release/6 20

See merge request BPHV_MIPS/mvm_core_ui!141
2019-10-11 16:55:19 -04:00
Pfeil, Scott Robert
2273d76c1f Merge branch 'bugfix/main_thread_fix' into 'release/6_21'
Move self.presentingViewController access onto the main thread.

See merge request BPHV_MIPS/mvm_core_ui!150
2019-10-11 13:03:42 -04:00
Hedden, Kyle Matthew
eaad6469bb Move self.presentingViewController access onto the main thread. 2019-10-11 13:03:41 -04:00
Suresh, Kamlesh
ccb62bd569 Merge branch 'bugfix/xcode11' into 'develop'
Bugfix/xcode11

See merge request BPHV_MIPS/mvm_core_ui!149
2019-10-10 16:44:08 -04:00
panxi
93733fb7b6 add framework back 2019-10-10 12:48:27 -04:00
panxi
db583609ac change to 8.0 2019-10-10 06:49:31 -04:00
Pfeil, Scott Robert
b6b632ff13 Merge branch 'feature/ios13' into 'develop'
os version

See merge request BPHV_MIPS/mvm_core_ui!148
2019-10-09 13:23:40 -04:00
Pfeil, Scott Robert
e79c4a5cd0 Merge branch 'feature/ios13' into 'develop'
Feature/ios13

See merge request BPHV_MIPS/mvm_core_ui!145
2019-10-09 13:09:06 -04:00
Pfeil, Scott Robert
245c880cbb Merge branch 'feature/remove_armv7' into 'develop'
remove armv7

See merge request BPHV_MIPS/mvm_core_ui!143
2019-10-09 13:05:48 -04:00
Pfeil, Scott Robert
f37ee3c9ba os version 2019-10-09 13:04:04 -04:00
Kevin G Christiano
5ef9754e2c defaulting to clear. 2019-10-09 12:45:18 -04:00
Kevin G Christiano
960d9e0e7c removed comment. 2019-10-09 10:18:18 -04:00
panxi
0f6a243e7b change back to animaitonframework 2019-10-09 10:10:57 -04:00
Khan, Arshad
3606ce4c82 VQA bug fix for bottom spacing below tableview. 2019-10-09 13:53:10 +05:30
Kevin G Christiano
9922ef4674 added enabled molecule logic. 2019-10-08 16:45:34 -04:00
Kevin G Christiano
1618583acc corrected comment. 2019-10-08 15:19:12 -04:00
Suresh, Kamlesh
104f45d0b6 default arch 2019-10-08 14:11:31 -04:00
panxi
cfdf44379d update framework relate to group 2019-10-08 13:44:02 -04:00
Kevin G Christiano
03f12b8a7a added isEnabled func. 2019-10-08 13:15:10 -04:00
Kevin G Christiano
ec190a28bd Further updates made. 2019-10-08 11:47:08 -04:00
Kevin G Christiano
bbdb2181f2 aligning with invision. 2019-10-08 11:30:25 -04:00