mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
919 Commits 64 Branches 0 Tags 46 MiB
d15d8b2636
Commit Graph

919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin G Christiano
d15d8b2636 Merge branch 'develop' into feature/swiftified_textField 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2019-10-24 11:20:26 -04:00
Kevin G Christiano
393b3f355b lztest greatest. 2019-10-24 09:08:53 -04:00
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
Kevin G Christiano
a5ffae9edd Latest state. 2019-10-23 15:15:23 -04:00
Suresh, Kamlesh
73342e40d1 code optimization 2019-10-23 14:51:35 -04:00
Kevin G Christiano
74abef0c30 saving state. 2019-10-23 13:59:10 -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
Suresh, Kamlesh
49f0048d77 Merge branch 'feature/swift_radio' into 'feature/molecule_radio_button' 
changes to test

See merge request BPHV_MIPS/mvm_core_ui!158
 2019-10-23 11:45:13 -04:00
Pfeil, Scott Robert
0cc81c3255 default background color 2019-10-23 11:38:15 -04:00
Pfeil, Scott Robert
0b364fa004 Radio button changes 2019-10-23 11:32:34 -04:00
Pfeil, Scott Robert
7563269680 changes to test 2019-10-23 10:36:32 -04:00
Pfeil, Scott Robert
ddc9288da1 Merge branch 'feature/fixes_stack_and_label_link' into 'develop' 
Fix for label and molecule stack

See merge request BPHV_MIPS/mvm_core_ui!157
 2019-10-23 09:02:57 -04:00
Chintakrinda, Arun Kumar (Arun)
b8bdf4829e Fix for label and molecule stack 2019-10-23 18:21:38 +05:30
Suresh, Kamlesh
5ee34fb027 dummy group 2019-10-22 15:11:16 -04:00
Pfeil, Scott Robert
a5546c0fcc Merge branch 'bugfix/name_correction' into 'develop' 
Name correction

See merge request BPHV_MIPS/mvm_core_ui!156
 2019-10-22 11:54:44 -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
Kevin G Christiano
64f4356a74 Merge branch 'develop' into feature/swiftified_textField 2019-10-22 09:52:47 -04:00
Kevin G Christiano
2ce41ad74b moar texht. 2019-10-22 09:52:12 -04:00
Suresh, Kamlesh
fcb377df33 space 2019-10-22 09:13:07 -04:00
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
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