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

376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christiano, Kevin
d83cc8f8ae Merge branch 'develop' into feature/kevin 2019-05-06 12:04:16 -04:00
Christiano, Kevin
f1474ca74c removed comment. 2019-05-06 12:03:54 -04:00
Pfeil, Scott Robert
2855b93569 Merge branch 'bugfix/image_format' into 'develop' 
ONVIK-16357

See merge request BPHV_MIPS/mvm_core_ui!64
 2019-05-06 11:03:47 -04:00
Suresh, Kamlesh
1f36121866 ONVIK-16357 2019-05-06 11:00:22 -04:00
Christiano, Kevin
b7e99e9e5b LabelWithInternalButton now properly relies on Label for its actions. Reworked makeWholeViewClickable. 2019-05-04 16:34:08 -04:00
Christiano, Kevin
51820794db remove test val. 2019-05-03 14:27:51 -04:00
Christiano, Kevin
fa10cb8e58 Merge branch 'develop' into feature/kevin 2019-05-03 14:20:43 -04:00
Christiano, Kevin
2f69b07bf5 Removed unneeded parameter. 2019-05-03 14:20:23 -04:00
Pan, Xinlei (Ryan)
c06528cd70 Merge branch 'bugfix/checkbox_color' into 'develop' 
remove from subview not needed

See merge request BPHV_MIPS/mvm_core_ui!61
 2019-05-03 14:18:49 -04:00
Suresh, Kamlesh
d7069129d7 remove from subview not needed 2019-05-03 14:01:35 -04:00
Pan, Xinlei (Ryan)
6fabb7fe32 Merge branch 'bugfix/checkbox_color' into 'develop' 
clear color

See merge request BPHV_MIPS/mvm_core_ui!60
 2019-05-03 13:32:54 -04:00
Suresh, Kamlesh
c210ad80e4 clear color 2019-05-03 12:33:42 -04:00
Christiano, Kevin
211d9f6c3b More functionality for label. 2019-05-03 11:28:25 -04:00
Suresh, Kamlesh
89e2822bef Merge branch 'bugfix/check_box_issue_fix' into 'develop' 
setupview added to initialiser method

See merge request BPHV_MIPS/mvm_core_ui!59
 2019-05-03 10:35:02 -04:00
Murugan, Vimal
d2c489811b setupview added to initialiser method 2019-05-03 20:03:48 +05:30
Pfeil, Scott Robert
af3feae828 Merge branch 'feature/carouselacc' into 'develop' 
Feature/carouselacc

See merge request BPHV_MIPS/mvm_core_ui!58
 2019-05-02 16:44:13 -04:00
panxi
a59778b26d Merge branch 'develop' into feature/carouselacc 2019-05-02 16:35:07 -04:00
panxi
f8ec75c7d5 fix bug for tabbar 2019-05-02 16:34:21 -04:00
Pfeil, Scott Robert
f9100119b2 Merge branch 'feature/carouselacc' into 'develop' 
Feature/carouselacc

See merge request BPHV_MIPS/mvm_core_ui!54
 2019-05-02 16:17:19 -04:00
Christiano, Kevin
18f8f7d9f3 Two means to set actionable text in code. 2019-05-02 15:37:12 -04:00
panxi
2fdd88356b update acc for mfstyler 2019-05-02 14:34:39 -04:00
Christiano, Kevin
d1153d4bf8 Added button delegate checks for labelWithInternalButton. WIP with multi-action label. 2019-05-02 14:12:41 -04:00
panxi
c99ffc1af7 avoid duplicate use 2019-05-02 13:59:50 -04:00
panxi
791f2e98c7 Merge branch 'develop' into feature/carouselacc 2019-05-02 13:43:16 -04:00
Christiano, Kevin
9c6ddc2470 Small changes. 2019-05-01 16:30:24 -04:00
Christiano, Kevin
2ec2c2b0b8 Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
 2019-05-01 15:47:46 -04:00
Christiano, Kevin
f64c793aeb Multi-action-text label WIP. 2019-05-01 15:42:49 -04:00
Pan, Xinlei (Ryan)
90a44c90a8 Merge branch 'feature/edit_swipe_percentage' into 'develop' 
allow user to overrise pannable Percentage value

See merge request BPHV_MIPS/mvm_core_ui!57
 2019-05-01 14:07:38 -04:00
Chowdhury, Shohrab
cff8361f9f allow user to overrise pannable Percentage value 2019-05-01 14:00:57 -04:00
panxi
8ca991b322 bug fix 2019-05-01 11:40:29 -04:00
Pfeil, Scott Robert
cc940d1ab2 Merge branch 'bugfix/match_recent_merge' into 'develop' 
matching change from release.

See merge request BPHV_MIPS/mvm_core_ui!53
 2019-05-01 09:20:03 -04:00
Pfeil, Scott Robert
138f82bc8c Merge branch 'feature/form_checkbox' into 'develop' 
Feature/form checkbox

See merge request BPHV_MIPS/mvm_core_ui!23
 2019-04-30 16:05:50 -04:00
Suresh, Kamlesh
175fe574c7 typo 2019-04-30 16:04:51 -04:00
Suresh, Kamlesh
a5bfef0fbb Merge branch 'develop' into feature/form_checkbox 2019-04-30 16:01:41 -04:00
Christiano, Kevin
dc6f0d48d4 Merge branch 'develop' into feature/kevin 2019-04-30 15:59:06 -04:00
Suresh, Kamlesh
8282e9a617 fixes with constaints 2019-04-30 15:14:38 -04:00
Suresh, Kamlesh
257cac3794 file 2019-04-30 13:47:08 -04:00
Suresh, Kamlesh
25156195a2 merge 2019-04-30 13:32:12 -04:00
Hedden, Kyle Matthew
36c0967537 Merge branch 'bugfix/protocol_move' into 'develop' 
fix

See merge request BPHV_MIPS/mvm_core_ui!56
 2019-04-30 13:31:07 -04:00
Pfeil, Scott Robert
973ba11822 fix 2019-04-30 13:29:30 -04:00
Christiano, Kevin
14f65b0cd3 Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
 2019-04-30 13:00:03 -04:00
Christiano, Kevin
2a05328f1a LabelWithInternalButton is in a functional place. Further work required for Label. 2019-04-30 12:11:36 -04:00
Suresh, Kamlesh
770f952904 Merge branch 'feature/molecule_list' into 'develop' 
Feature/molecule list

See merge request BPHV_MIPS/mvm_core_ui!52
 2019-04-30 11:16:17 -04:00
Pfeil, Scott Robert
2d73f89fd4 separator 
keys
clean up
 2019-04-30 10:34:25 -04:00
panxi
884b18a8ef order fix 2019-04-30 09:40:54 -04:00
panxi
a51079b601 add 1of 3 into tabbar for accessibility team 2019-04-29 17:44:58 -04:00
panxi
522f7a4be2 add index to tab for accessibility 2019-04-29 17:17:21 -04:00
Christiano, Kevin
2fafde090e matching change from release. 2019-04-29 16:55:22 -04:00
Suresh, Kamlesh
d2d4c30cf6 labelMap 2019-04-29 16:20:27 -04:00
Christiano, Kevin
f6f2cd2068 Carry over caret fixes. 2019-04-29 16:14:13 -04:00