Commit Graph

1106 Commits

Author SHA1 Message Date
Kevin G Christiano
6b34b8840d Adding values back. 2019-12-04 16:05:41 -05:00
Kevin G Christiano
65586a7568 Adding another location to execute external code. 2019-12-02 11:05:08 -05:00
Kevin G Christiano
5e28b0bdc5 Merge branch 'develop' into feature/swiftified_textField 2019-12-02 10:43:45 -05:00
Kevin G Christiano
2319c4c70f overrdie applied. 2019-12-02 10:43:08 -05:00
Pfeil, Scott Robert
44fd2dffac Merge branch 'bugfix/label_molecule_fonting' into 'develop'
label font bugfix caused by the dissonance between label and styler setting....

See merge request BPHV_MIPS/mvm_core_ui!192
2019-12-02 10:16:42 -05:00
Pfeil, Scott Robert
3e46438fd0 label font bugfix caused by the dissonance between label and styler setting.... 2019-12-02 10:11:04 -05:00
Kevin G Christiano
530397084b Merge branch 'develop' into feature/swiftified_textField 2019-12-02 09:51:09 -05:00
Kevin G Christiano
6a34370083 returned func. 2019-12-02 09:50:30 -05:00
Pfeil, Scott Robert
09b467cac4 Merge branch 'bugfix/dropdown_key_name_fix' into 'develop'
key name mismatch fix.

See merge request BPHV_MIPS/mvm_core_ui!191
2019-12-02 09:13:28 -05:00
Kevin G Christiano
0f04ebe177 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-12-02 09:04:17 -05:00
Kevin G Christiano
4d3e5544fb Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField 2019-12-02 08:57:08 -05:00
Kevin G Christiano
fc7ef567e3 Revised Superclass. 2019-12-02 08:56:58 -05:00
Khan, Arshad
dc5174cbe4 key name mismatch fix. 2019-11-28 20:48:07 +05:30
Pan, Xinlei (Ryan)
ad8b48b699 Merge branch 'feature/dropdown_line_item_legacy' into 'develop'
Feature/dropdown line item legacy

See merge request BPHV_MIPS/mvm_core_ui!190
2019-11-27 21:49:46 -05:00
Pfeil, Scott Robert
ee773eed89 key change 2019-11-27 15:02:03 -05:00
Pfeil, Scott Robert
0915333878 Merge branch 'bugfix/scrollview_content_adjustment_fix' into 'develop'
remove navigation bar check for manual inset calculation as it impacts presented controllers

See merge request BPHV_MIPS/mvm_core_ui!187
2019-11-27 14:03:52 -05:00
Hedden, Kyle Matthew
f5270ae12e remove navigation bar check for manual inset calculation as it impacts presented controllers 2019-11-27 14:03:51 -05:00
Pfeil, Scott Robert
63556707bc temporary dropdown molecule
label reuse font fixes
2019-11-27 13:49:01 -05:00
Khan, Arshad
c999f6f777 opening few properties 2019-11-27 21:43:42 +05:30
Khan, Arshad
f2f9d5d0d7 Adding open to required functions, which need to override in MF component.
Adding mapping for dropDown.
2019-11-27 21:12:41 +05:30
Pfeil, Scott Robert
1ec603e969 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/dropdown_line_item_legacy 2019-11-26 08:54:47 -05:00
Kevin G Christiano
3654b05773 removed unneeded method. mild changes. 2019-11-25 16:35:28 -05:00
Pfeil, Scott Robert
392ab144ac small fixes 2019-11-25 16:01:43 -05:00
Kevin G Christiano
499b938d56 Merge branch 'develop' into feature/swiftified_textField 2019-11-25 12:28:01 -05:00
Kevin G Christiano
cfffbabe58 identity and callback. 2019-11-25 12:27:32 -05:00
Pfeil, Scott Robert
88e079e6be Merge branch 'bugfix/header_line' into 'develop'
line fix in header

See merge request BPHV_MIPS/mvm_core_ui!185
2019-11-25 12:07:06 -05:00
Pfeil, Scott Robert
664d3195bb line fix in header 2019-11-25 09:20:05 -05:00
Kevin G Christiano
dc8293b08b more refinement of errors. 2019-11-22 14:33:46 -05:00
Kevin G Christiano
72553935c2 latestst state. 2019-11-22 12:53:40 -05:00
Kevin G Christiano
21166bc5f0 Better functioning selection. 2019-11-22 09:20:35 -05:00
Kevin G Christiano
64bda3cb1d wip. 2019-11-21 16:40:34 -05:00
Kevin G Christiano
8b5fe4a1f4 more changes. 2019-11-21 15:21:32 -05:00
Kevin G Christiano
f19d45b865 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atoms/Views/CaretView.swift
#	MVMCoreUI/Molecules/Items/TableViewCell.swift
2019-11-21 11:55:21 -05:00
Kevin G Christiano
88442fe59c latest. 2019-11-21 11:47:12 -05:00
Suresh, Kamlesh Jain
8be65d4f57 Merge branch 'bugfix/bad_project_import' into 'develop'
Remote Scott's missing test controller.

See merge request BPHV_MIPS/mvm_core_ui!184
2019-11-20 17:30:52 -05:00
Hedden, Kyle Matthew
3944e02863 Remote Scott's missing test controller. 2019-11-20 17:30:52 -05:00
Pfeil, Scott Robert
7429fede9a Merge branch 'feature/modernize' into 'develop'
Feature/modernize

See merge request BPHV_MIPS/mvm_core_ui!182
2019-11-20 14:10:35 -05:00
Pfeil, Scott Robert
095b1d7a86 Merge branch 'feature/modernize' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 13:29:41 -05:00
Pfeil, Scott Robert
e32b9cfdda PR comments 2019-11-20 13:29:16 -05:00
Pfeil, Scott Robert
947af9b3c7 why? 2019-11-20 11:08:30 -05:00
Pfeil, Scott Robert
654be26b2c remove test file 2019-11-20 11:06:47 -05:00
Pfeil, Scott Robert
279dbd9b08 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 10:59:35 -05:00
Pfeil, Scott Robert
c96f5050a8 Line to swift 2019-11-20 10:20:24 -05:00
Kevin G Christiano
26c73070d9 latestest and greatest. 2019-11-20 09:12:31 -05:00
Hedden, Kyle Matthew
a714100b73 Merge branch 'release/7_1_0' into 'develop'
Release/7 1 0

See merge request BPHV_MIPS/mvm_core_ui!179
2019-11-19 17:02:45 -05:00
Pfeil, Scott Robert
f9619b8cb4 Merge branch 'bugfix/checkbox' into 'develop'
make checkbox expandable

See merge request BPHV_MIPS/mvm_core_ui!178
2019-11-19 12:59:52 -05:00
panxi
a409b331c5 revert 2019-11-19 12:56:07 -05:00
panxi
3851ad036a change to equal 2019-11-19 12:53:48 -05:00
panxi
3cb075499e make checkbox expandable 2019-11-19 10:39:30 -05:00
Kevin G Christiano
702dc10db2 Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
2019-11-19 10:07:24 -05:00