Commit Graph

913 Commits

Author SHA1 Message Date
Suresh, Kamlesh
0f5a9be82e CXTDT-25210 2019-09-25 11:23:18 -04:00
Kevin G Christiano
bceb915496 Merge branch 'develop' into feature/improve_linkability_label 2019-09-23 14:30:32 -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
Kevin G Christiano
96e5f47dd0 Merge branch 'develop' into feature/label_hero_character 2019-09-23 14:28:42 -04:00
Kevin G Christiano
7b6f3d6b88 spelling. 2019-09-23 14:23:37 -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
Kevin G Christiano
d0797a4825 mild updates. 2019-09-23 12:43:52 -04:00
Kevin G Christiano
4770aa6e6b Label Improvements. Conveniences added. Greater accuracy to tap detection provided. 2019-09-23 12:35:51 -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
Kevin G Christiano
b3cc938a9e Improved accuracy of link label detection. 2019-09-20 16:11:46 -04:00
Kevin G Christiano
efbb68b4cd latest. not perfect. 2019-09-19 14:09:51 -04:00
Kevin G Christiano
0d6b904a7f current state. 2019-09-19 10:54:28 -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
Kevin G Christiano
1c416b5653 revised. 2019-09-18 14:15:56 -04:00
Kevin G Christiano
4ea916bbcd commenting. 2019-09-18 14:14:37 -04:00
Kevin G Christiano
5bc420ac05 accessoryVIew can now center itself in relation to the hero character. 2019-09-18 14:13:33 -04:00
Kevin G Christiano
52387fe9c9 Merge branch 'develop' into feature/label_hero_character 2019-09-17 16:37:50 -04:00
Kevin G Christiano
fc4fcc25f6 Current take on hero. Needs to be refactored and placed into a protocol. 2019-09-17 16:37:27 -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
Kevin G Christiano
b9e80398c1 Decent palce. 2019-09-17 09:41:14 -04:00
Murugan, Vimal
44ebfb9294 fix for cxtdt_28106 2019-09-17 16:25:00 +05:30
Kevin G Christiano
6f4db10d33 beginning work on hero. 2019-09-16 10:24:18 -04:00
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
Kevin G Christiano
cdc7ae2f1e added layoutMarginsGuide. 2019-09-13 09:08:33 -04:00
Kevin G Christiano
ad1def8ddc changed default state name. 2019-09-12 16:38:18 -04:00
Kevin G Christiano
bedd05daa6 Creation and inclusion of HeadlineBodyButton molecule. 2019-09-12 14:42:10 -04:00
Kevin G Christiano
9ae91ca84a Merge branch 'develop' into feature/healine_body_button_molecule
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-09-12 10:28:45 -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
Pan, Xinlei (Ryan)
0e27266b85 Merge branch 'feature/multiprogress' into 'develop'
Feature/multiprogress

See merge request BPHV_MIPS/mvm_core_ui!132
2019-09-11 16:49:31 -04:00
Suresh, Kamlesh
eac6bf3aa3 impreovements 2019-09-11 15:56:24 -04:00
panxi
f69fe85d83 update based on Scott's comment 2019-09-11 10:19:03 -04:00
panxi
358842e433 update based on Scott's comment 2019-09-11 10:04:19 -04:00
panxi
d52e204721 update multiprogressbar 2019-09-10 15:57:00 -04:00
Pfeil, Scott Robert
d62db8d5ac Merge branch 'feature/tabs_list_item' into 'develop'
Tabs table cell

See merge request BPHV_MIPS/mvm_core_ui!131
2019-09-10 14:42:14 -04:00
Pfeil, Scott Robert
4050b784ed alignment fix issues. 2019-09-10 14:11:09 -04:00
Suresh, Kamlesh
fe066f5530 merge 2019-09-10 10:42:08 -04:00
panxi
595a3b1e38 fix typo 2019-09-09 16:49:12 -04:00
panxi
dcd87fb924 add MultiProgress 2019-09-09 16:42:38 -04:00
Pfeil, Scott Robert
b4c53f838b Tabs table cell 2019-09-09 14:07:32 -04:00
Pfeil, Scott Robert
814d470775 Merge branch 'feature/label_accessibility' into 'develop'
Label Accessibility

See merge request BPHV_MIPS/mvm_core_ui!96
2019-09-05 13:53:56 -04:00
Pfeil, Scott Robert
7a85b46ff0 Merge branch 'bugfix/cxtdt-25160' into 'develop'
Adds nil check on contentColor to account for future possibility of...

See merge request BPHV_MIPS/mvm_core_ui!127
2019-09-05 12:50:34 -04:00
Kevin G Christiano
36595efb90 Merge branch 'develop' into feature/label_accessibility 2019-09-05 11:22:13 -04:00
Kevin G Christiano
33754802bb Latest changes. Now including clause changes. 2019-09-05 11:20:55 -04:00
Robinson, Blake
5adce50053 Removed comment and used ternary operator based on code review 2019-09-05 10:28:50 -04:00
Pfeil, Scott Robert
ebc8080abe Merge branch 'bugfix/tableheaderview_height_update' into 'develop'
Bugfix/tableheaderview height update

See merge request BPHV_MIPS/mvm_core_ui!130
2019-09-05 09:49:15 -04:00