Commit Graph

842 Commits

Author SHA1 Message Date
Kevin G Christiano
2ce41ad74b moar texht. 2019-10-22 09:52:12 -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
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
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
Kevin G Christiano
ef2e177b33 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-11 12:38:20 -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
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