Commit Graph

828 Commits

Author SHA1 Message Date
panxi
22eb114635 merge from develop 2019-10-17 15:32:03 -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
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
panxi
0f6a243e7b change back to animaitonframework 2019-10-09 10:10:57 -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
Pan, Xinlei (Ryan)
fc098b85e2 Merge branch 'feature/checkbox_update' into 'develop'
Improved checkbox.

See merge request BPHV_MIPS/mvm_core_ui!144
2019-10-07 17:12:31 -04:00
panxi
473ec08b07 remove testing scheme 2019-10-07 17:02:06 -04:00
panxi
1d93f0b452 add new mvmanimation xc framework 2019-10-07 16:58:21 -04:00
Kevin G Christiano
66e45378f4 shapelayer . 2019-10-07 16:33:39 -04:00
Kevin G Christiano
7d6289463d Improved molecular logic of checkbox. 2019-10-07 16:30:14 -04:00
Suresh, Kamlesh
1f815fa102 remove armv7 2019-10-07 12:05:56 -04:00
Pan, Xinlei (Ryan)
62527dfd81 Merge branch 'feature/check_box_mole_revision' into 'develop'
Checkbox & View

See merge request BPHV_MIPS/mvm_core_ui!142
2019-10-03 16:58:49 -04:00
Kevin G Christiano
5043964c29 revised alignment for case when no label. 2019-10-03 16:43:58 -04:00
Kevin G Christiano
44e420218d Constraints mended. more commenting. 2019-10-03 13:22:15 -04:00
Kevin G Christiano
5d1c87819d making changes to align with comments. 2019-10-03 11:14:16 -04:00
Kevin G Christiano
61fcd981c1 setting up the rest. 2019-10-02 15:27:32 -04:00
Kevin G Christiano
77a3eb8827 Added a new extension file for CATransaction. Implementation of Checkbox and CheckboxWithLabel. 2019-10-02 15:22:12 -04:00
Kevin G Christiano
5f8780614f borders. 2019-09-27 14:28:16 -04:00
Kevin G Christiano
b032e40400 Checkbox in good place. 2019-09-27 14:23:46 -04:00
Kevin G Christiano
f5f994648a Decent working state with animation and touch. 2019-09-27 13:43:02 -04:00
Kevin G Christiano
afcf8d535b updates. 2019-09-26 13:56:02 -04:00
Kevin G Christiano
c75337bfdf Getting closer to testing phase. 2019-09-26 11:42:16 -04:00
Suresh, Kamlesh
4854b75b46 Merge branch 'bugfix/io13_animation_fix' into 'release/6_20'
CXTDT-25210

See merge request BPHV_MIPS/mvm_core_ui!140
2019-09-25 15:08:28 -04:00
Kevin G Christiano
38c74acc6e moar. 2019-09-25 14:43:29 -04:00
Kevin G Christiano
35f7024f8d Adding two new checkbox swift classes. 2019-09-25 14:19:49 -04:00
Suresh, Kamlesh
0f5a9be82e CXTDT-25210 2019-09-25 11:23:18 -04:00
Kevin G Christiano
7722dc5619 Merge branch 'develop' into feature/check_box_mole_revision
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-09-23 14:30:04 -04:00
Pfeil, Scott Robert
52119f7b31 Merge branch 'feature/eye_head_body_textbtn' into 'develop'
Feature/eye head body textbtn

See merge request BPHV_MIPS/mvm_core_ui!138
2019-09-23 13:39:12 -04:00
Pfeil, Scott Robert
5b5a03b869 condensing 2019-09-23 13:30:35 -04:00
Pfeil, Scott Robert
a0f9470c27 model driven gone 2019-09-23 12:25:49 -04:00
Pfeil, Scott Robert
0bb3c8a719 new molecule and gone state of stack. 2019-09-23 12:21:59 -04:00
Pfeil, Scott Robert
430b957742 Merge branch 'feature/molecule_bug_fixes' into 'develop'
bug fixes

See merge request BPHV_MIPS/mvm_core_ui!137
2019-09-19 09:57:41 -04:00
Pfeil, Scott Robert
6cdde756e5 bug fixes 2019-09-19 09:06:14 -04:00
Pan, Xinlei (Ryan)
b353fe5955 Merge branch 'bugfix/CXTDT_28106' into 'develop'
fix for cxtdt_28106

See merge request BPHV_MIPS/mvm_core_ui!135
2019-09-17 14:52:52 -04:00
Murugan, Vimal
44ebfb9294 fix for cxtdt_28106 2019-09-17 16:25:00 +05:30
Kevin G Christiano
bbdb0301eb Further checkbox setups. 2019-09-16 09:50:35 -04:00
Suresh, Kamlesh
daed451c7a improvements 2019-09-13 15:25:13 -04:00
Kevin G Christiano
8238a42177 Added the new classes. 2019-09-13 12:28:34 -04:00
Pan, Xinlei (Ryan)
52679e95f3 Merge branch 'bugfix/constraining_molecules' into 'develop'
alignment fix issues.

See merge request BPHV_MIPS/mvm_core_ui!133
2019-09-12 09:51:14 -04:00