Christiano, Kevin
|
b00d439ead
|
Merge branch 'develop' into feature/kevin
# Conflicts:
# MVMCoreUI/Atoms/Views/Label.swift
# MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
|
2019-05-29 10:51:11 -04:00 |
|
Christiano, Kevin
|
68f27da117
|
Changed ItemDetailView name to StandardListItem to comply with molecule listing.
|
2019-05-29 10:23:39 -04:00 |
|
Pfeil, Scott Robert
|
1799f166ee
|
remove duplicate
|
2019-05-28 10:08:04 -04:00 |
|
Christiano, Kevin
|
f1ba116e8b
|
switch to true.
|
2019-05-24 14:58:54 -04:00 |
|
Christiano, Kevin
|
6d2220cbbf
|
latest version of ItemDetailView.
|
2019-05-24 09:19:22 -04:00 |
|
Pfeil, Scott Robert
|
0f5cb47765
|
molecule list
moduleMolecule
|
2019-05-23 18:32:11 -04:00 |
|
Christiano, Kevin
|
0f9aa7dc01
|
Adding new atom.
|
2019-05-20 16:34:02 -04:00 |
|
Christiano, Kevin
|
ec1682a632
|
Updated Label. Change LabelWithInternal for when nil is set for actionBlock.
|
2019-05-14 16:26:35 -04:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Suresh, Kamlesh
|
d7069129d7
|
remove from subview not needed
|
2019-05-03 14:01:35 -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 |
|
Murugan, Vimal
|
d2c489811b
|
setupview added to initialiser method
|
2019-05-03 20:03:48 +05:30 |
|
Christiano, Kevin
|
18f8f7d9f3
|
Two means to set actionable text in code.
|
2019-05-02 15:37:12 -04:00 |
|
Christiano, Kevin
|
d1153d4bf8
|
Added button delegate checks for labelWithInternalButton. WIP with multi-action label.
|
2019-05-02 14:12:41 -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 |
|
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 |
|
Suresh, Kamlesh
|
175fe574c7
|
typo
|
2019-04-30 16:04:51 -04:00 |
|
Suresh, Kamlesh
|
8282e9a617
|
fixes with constaints
|
2019-04-30 15:14:38 -04:00 |
|
Suresh, Kamlesh
|
25156195a2
|
merge
|
2019-04-30 13:32:12 -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 |
|
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 |
|
Suresh, Kamlesh
|
9709c7195d
|
use molecule label
|
2019-04-29 15:00:29 -04:00 |
|
Pfeil, Scott Robert
|
302a2f887f
|
thickness. molecule alignment
|
2019-04-29 13:36:36 -04:00 |
|
Suresh, Kamlesh
|
668d42176a
|
merge
|
2019-04-29 13:29:33 -04:00 |
|
Christiano, Kevin
|
1ab359e360
|
merge from release/6_14_merge
|
2019-04-26 14:23:11 -04:00 |
|
panxi
|
2f0a727d03
|
copy from Kevin's commit: aac5093c37
|
2019-04-26 13:41:54 -04:00 |
|
panxi
|
d380328913
|
copy from Kevin commis: d373a3f7be
|
2019-04-26 13:41:26 -04:00 |
|
Christiano, Kevin
|
8da88c4c87
|
Moving interaction functionality to label.
|
2019-04-25 11:41:06 -04:00 |
|
Pfeil, Scott Robert
|
8a349ae16f
|
constraining for stack
|
2019-04-24 16:14:22 -04:00 |
|