Commit Graph

222 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
59be22c0e0 enum clean 2019-10-29 13:47:49 -04:00
Pfeil, Scott Robert
26dac186dc undo undo 2019-10-29 13:13:35 -04:00
Pfeil, Scott Robert
75ea4d60f0 commit missed protocol 2019-10-29 12:18:20 -04:00
Pfeil, Scott Robert
d4cacec310 list item separation 2019-10-29 12:05:37 -04:00
Pfeil, Scott Robert
48a940f160 fix to typos 2019-10-29 10:12:59 -04:00
Pfeil, Scott Robert
a454d0e3bd Revert "Merge branch 'feature/mva_3_0' into 'develop'"
This reverts merge request !162
2019-10-28 09:31:20 -04:00
Khan, Arshad
da8dded2e1 opening HeadlineBodySwitch to reuse in MF 2019-10-25 04:10:24 +05:30
Pfeil, Scott Robert
909fe9ae75 Merge branch 'feature/molecule_radio_button' into 'develop'
Feature/molecule radio button

See merge request BPHV_MIPS/mvm_core_ui!70
2019-10-23 17:30:00 -04:00
Suresh, Kamlesh
b8e1389798 review 2019-10-23 17:21:44 -04:00
Suresh, Kamlesh
d2ca3adacf code review 2019-10-23 15:59:03 -04:00
Suresh, Kamlesh
d398a45054 code review 2019-10-23 13:53:58 -04:00
Suresh, Kamlesh
52fca407e3 remove tap and accessibility 2019-10-23 12:37:26 -04:00
Pfeil, Scott Robert
7563269680 changes to test 2019-10-23 10:36:32 -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
Suresh, Kamlesh
4ef662d1ca reivew 2019-10-22 09:59:37 -04:00
Suresh, Kamlesh
fcb377df33 space 2019-10-22 09:13:07 -04:00
Suresh, Kamlesh
f1c319244a radioButton and radioButtonWithLabel and code review 2019-10-21 17:26:33 -04:00
Kevin G Christiano
f067a20ba9 hero stuff. 2019-10-18 08:47:14 -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
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
11b2ddc4dd Merge branch 'develop' into feature/label_hero_character 2019-10-17 12:17:17 -04:00
Pfeil, Scott Robert
bb51fba0e5 remove legacy os code 2019-10-17 10:31:34 -04:00
Kevin G Christiano
96e5f47dd0 Merge branch 'develop' into feature/label_hero_character 2019-09-23 14:28:42 -04:00
Pfeil, Scott Robert
0bb3c8a719 new molecule and gone state of stack. 2019-09-23 12:21:59 -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
6f4db10d33 beginning work on hero. 2019-09-16 10:24:18 -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
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
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
Pfeil, Scott Robert
b4c53f838b Tabs table cell 2019-09-09 14:07:32 -04:00
Suresh, Kamlesh
c8611ca83a fixes 2019-09-04 14:39:19 -04:00
Pfeil, Scott Robert
3ff48cf700 Style 2019-09-04 13:45:41 -04:00
Pan, Xinlei (Ryan)
a80b68dc14 Merge branch 'bugfix/secondary_button_color' into 'develop'
border the button

See merge request BPHV_MIPS/mvm_core_ui!124
2019-09-03 17:31:31 -04:00
Pfeil, Scott Robert
2fd55f0aff border the button 2019-09-03 17:12:17 -04:00
Pfeil, Scott Robert
ea13603b7d font update 2019-09-03 16:52:10 -04:00
Pfeil, Scott Robert
32b2ab825b hide separator flag 2019-09-03 15:52:23 -04:00
Pfeil, Scott Robert
aeaf7ecc5e Merge remote-tracking branch 'refs/remotes/origin/develop' 2019-09-03 15:14:21 -04:00
Pfeil, Scott Robert
658ed16bbd accordion list item 2019-09-03 15:14:12 -04:00