Commit Graph

1512 Commits

Author SHA1 Message Date
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
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
929b825e11 more to uopdate. 2019-10-18 10:26:47 -04:00
Kevin G Christiano
f067a20ba9 hero stuff. 2019-10-18 08:47:14 -04:00
panxi
4e1a6ca479 update based on scott's comments 2019-10-17 16:52:05 -04:00
panxi
d94bbc1dae check property back to weak, remove unaided switch files which supposed replaced by mvmcoreuiswitch 2019-10-17 16:33:05 -04:00
panxi
ed7329cdcf add progress bar 2019-10-17 15:52:38 -04:00
panxi
034610af5e fixing merging issue 2019-10-17 15:50:25 -04:00
Kevin G Christiano
720d17d751 revisions made. 2019-10-17 15:35:14 -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
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
Kevin G Christiano
d2fddaf769 latest textfield development. 2019-10-17 11:42:34 -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
Kevin G Christiano
d0264d45eb funcational, 2019-10-16 16:27:27 -04:00
Kevin G Christiano
19310bff89 generally functioning. some loose ends with TextField. 2019-10-16 13:51:55 -04:00
Kevin G Christiano
d0cb4a987e Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField 2019-10-16 10:44:32 -04:00
Kevin G Christiano
4a833abc31 mase public. 2019-10-16 10:44:16 -04:00
Kevin G Christiano
7e1d23db3d latest text. 2019-10-16 10:43:45 -04:00
Kevin G Christiano
e92616a7f5 latest state. 2019-10-15 13:46:50 -04:00
Kevin G Christiano
208577b0a1 small stuff. 2019-10-14 15:36:30 -04:00
Kevin G Christiano
7f6181c1bd Merge branch 'develop' into feature/swiftified_textField 2019-10-14 15:31:57 -04:00
Kevin G Christiano
d4154ab0d2 removed view. renamed. 2019-10-14 15:31:28 -04:00
Kevin G Christiano
403f0b261b Major swiftification of MFTextField to TextField. 2019-10-14 15:24:48 -04:00
Kevin G Christiano
10692ee21e more changes. 2019-10-13 12:00:36 -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
Kevin G Christiano
d4df5745f4 Further swiftification. 2019-10-11 13:23:49 -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
Kevin G Christiano
ef2e177b33 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-11 12:38:20 -04:00