Commit Graph

6090 Commits

Author SHA1 Message Date
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
Kevin G Christiano
df34e1574c latest, updating. 2019-11-18 17:04:16 -05:00
Kevin G Christiano
0cbaf38644 date picker. 2019-11-18 17:03:59 -05:00
Kevin G Christiano
871ca090a0 Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField 2019-11-18 15:41:10 -05:00
Kevin G Christiano
1af47ab98d wip. 2019-11-18 15:40:27 -05:00
Kevin G Christiano
1d08842d47 wip. 2019-11-18 15:40:11 -05:00
Kevin G Christiano
9b581a6132 no line. 2019-11-18 14:30:42 -05:00
Kevin G Christiano
588f801322 Adding Base TextField. More improvements. 2019-11-18 14:18:36 -05:00
Kevin G Christiano
89fa23c0d0 Merge branch 'develop' into feature/swiftified_textField 2019-11-18 09:39:01 -05:00
Pan, Xinlei (Ryan)
6e17e36d64 Merge branch 'feature/topacc' into 'release/7_1_0'
add top accessory view

See merge request BPHV_MIPS/mvm_core_ui!176
2019-11-15 17:15:56 -05:00
Pan, Xinlei (Ryan)
9f8681f12f Merge branch 'revert-0ed49c65' into 'develop'
Revert "Merge branch 'feature/top_accessory' into 'develop'"

See merge request BPHV_MIPS/mvm_core_ui!177
2019-11-15 16:54:13 -05:00
Suresh, Kamlesh Jain
8376e5c79e Revert "Merge branch 'feature/top_accessory' into 'develop'"
This reverts merge request !175
2019-11-15 16:53:18 -05:00
Suresh, Kamlesh
a865664cff add top accessory view 2019-11-15 16:52:13 -05:00
Suresh, Kamlesh Jain
0ed49c65e1 Merge branch 'feature/top_accessory' into 'develop'
top accessory view

See merge request BPHV_MIPS/mvm_core_ui!175
2019-11-15 14:36:08 -05:00
Suresh, Kamlesh
89cbfe00ba clean up 2019-11-15 12:09:20 -05:00
Suresh, Kamlesh
cd5f66875d Merge branch 'feature/top_accessory' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/top_accessory 2019-11-15 11:42:34 -05:00
Suresh, Kamlesh
84f50f3b80 optimize 2019-11-15 11:42:29 -05:00
Murugan, Vimal
76cd37d121 code cleanup 2019-11-15 21:10:37 +05:30
Kevin G Christiano
92b988d9fb setting up dropdown. 2019-11-15 08:52:29 -05:00
Suresh, Kamlesh
627114ded8 top accessory in tableview controller 2019-11-14 19:27:56 -05:00
Suresh, Kamlesh
f1b8a61e04 top accessory view 2019-11-14 18:15:22 -05:00
Kevin G Christiano
ebccc6bd28 The latest state of entry. 2019-11-14 14:59:39 -05:00
Kevin G Christiano
80c700ba55 Further improvements made to dropdaown. 2019-11-14 11:41:02 -05:00