panxi
|
8422362e77
|
merge from develop
|
2019-11-26 11:30:43 -05:00 |
|
panxi
|
25336b0a16
|
Merge branch 'develop' into feature/models
|
2019-11-26 11:20:45 -05:00 |
|
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 |
|
Pfeil, Scott Robert
|
cc2e4751f5
|
merge
|
2019-11-25 09:09:45 -05:00 |
|
Pfeil, Scott Robert
|
d884602d87
|
tweaks
|
2019-11-25 09:06:09 -05:00 |
|
Pfeil, Scott Robert
|
dd85a134ac
|
merge
|
2019-11-25 09:05:32 -05:00 |
|
panxi
|
ea69ba67ea
|
update array decoding method
|
2019-11-24 23:14:25 -05:00 |
|
Kevin G Christiano
|
dc8293b08b
|
more refinement of errors.
|
2019-11-22 14:33:46 -05:00 |
|
panxi
|
9ec661ae3b
|
add label model
|
2019-11-22 14:31:17 -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 |
|
panxi
|
6303c3f92d
|
update label model
|
2019-11-21 13:15:27 -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 |
|
Suresh, Kamlesh
|
7b2fc7bfba
|
some more stuff
|
2019-11-21 11:53:26 -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 |
|
panxi
|
715b5f0167
|
add image, move label model next to label
|
2019-11-20 15:48:14 -05:00 |
|
panxi
|
28a04218f9
|
create image model
|
2019-11-20 15:43:26 -05:00 |
|
panxi
|
dde5f1d1a4
|
add caret view model and dash line model
|
2019-11-20 15:30:42 -05:00 |
|
panxi
|
5fd74b695f
|
create model for progress bar, using ModelMoleculeViewProtocol
|
2019-11-20 14:58:58 -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 |
|
Suresh, Kamlesh Jain
|
ec9ac811d5
|
Merge branch 'feature/coding' into 'feature/models'
Feature/coding
See merge request BPHV_MIPS/mvm_core_ui!174
|
2019-11-19 16:02:51 -05:00 |
|
Suresh, Kamlesh
|
bf20fb3104
|
fixes
|
2019-11-19 15:32:35 -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 |
|
Kevin G Christiano
|
1fc2963fca
|
ok.
|
2019-11-19 10:05:44 -05:00 |
|
Kevin G Christiano
|
c38e3c0712
|
DigitEntry in decent place.
|
2019-11-19 09:57:43 -05:00 |
|
Pfeil, Scott Robert
|
82f94cde25
|
Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize
|
2019-11-19 09:18:45 -05:00 |
|
Pfeil, Scott Robert
|
d29e8ea3bd
|
small changes
|
2019-11-19 09:18:15 -05:00 |
|
Kevin G Christiano
|
b9850bed81
|
Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField
|
2019-11-18 17:04:26 -05:00 |
|