Commit Graph

390 Commits

Author SHA1 Message Date
Christiano, Kevin
f00f24f35f Merge branch 'develop' into feature/kevin 2019-05-10 13:10:13 -04:00
Christiano, Kevin
59248974ab Changes made to Label & LabelWithInternalButton. 2019-05-10 13:09:58 -04:00
Suresh, Kamlesh
ff07bb1cac Merge branch 'bugfix/checkbox' into 'develop'
update checkbox for crash

See merge request BPHV_MIPS/mvm_core_ui!65
2019-05-09 14:46:21 -04:00
Pfeil, Scott Robert
cd60bc6c98 Merge branch 'bugfix/detail_view_controller' into 'develop'
detail view controller

See merge request BPHV_MIPS/mvm_core_ui!38
2019-05-09 13:36:17 -04:00
panxi
b5f65b6fdf update checkbox for crash 2019-05-09 10:50:36 -04:00
Christiano, Kevin
f04e4de01c Merge branch 'develop' into feature/kevin 2019-05-08 16:23:22 -04:00
panxi
2dde640793 Merge branch 'develop' into bugfix/detail_view_controller 2019-05-08 12:45:42 -04:00
panxi
f4bf4c0b5a update code based on Scott's comment 2019-05-08 11:03:14 -04:00
Christiano, Kevin
93f90bad47 corrections made. 2019-05-07 10:48:52 -04:00
Suresh, Kamlesh
682759bc9a Merge branch 'feature/formvalidator_improvements' into 'develop'
improvements

See merge request BPHV_MIPS/mvm_core_ui!63
2019-05-07 10:25:14 -04:00
Christiano, Kevin
dadfc83744 requested changes. 2019-05-07 09:36:10 -04:00
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
Suresh, Kamlesh
524eef4379 improvements 2019-05-03 16:47:45 -04:00
panxi
3ec1364aed let tabbar manager handle child viewcontroller's behavior 2019-05-03 15:25:41 -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