Commit Graph

1380 Commits

Author SHA1 Message Date
Suresh, Kamlesh
cf0e9ffbdb Merge branch 'feature/coding' into feature/doughnutchart_from_coding 2020-01-14 21:31:09 -05:00
Pfeil, Scott Robert
74eea1ac2d Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 21:10:40 -05:00
Pfeil, Scott Robert
9a01d9de5b merge 2020-01-14 21:09:55 -05:00
Pfeil, Scott Robert
952c3bdb53 Toggle model temporary 2020-01-14 21:08:48 -05:00
Pfeil, Scott Robert
8936f510b2 temporary change to match 2020-01-14 20:35:53 -05:00
Pfeil, Scott Robert
a737b3b94c Remove adding view constraining view 2020-01-14 20:23:14 -05:00
Pfeil, Scott Robert
76b14f6e8e fix typo 2020-01-14 20:20:02 -05:00
Suresh, Kamlesh
c3433c2f80 merge 2020-01-14 19:29:37 -05:00
Pfeil, Scott Robert
f87ddf3448 name update 2020-01-14 18:41:54 -05:00
Pfeil, Scott Robert
9477218d78 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 18:35:35 -05:00
Pfeil, Scott Robert
e85270d038 new molecules to model 2020-01-14 18:33:34 -05:00
Pfeil, Scott Robert
7723ffb260 verbose errors 2020-01-14 17:40:51 -05:00
Pfeil, Scott Robert
fc2326e9a8 button size 2020-01-14 16:32:42 -05:00
Pfeil, Scott Robert
7255c0c354 Merge remote-tracking branch 'refs/remotes/origin/feature/coding'
Conflicts:
	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
	MVMCoreUI/Molecules/Items/TableViewCell.swift
	MVMCoreUI/Molecules/ModelMoleculeViewProtocol.swift
	MVMCoreUI/Organisms/MoleculeStackView.swift
2020-01-14 15:58:12 -05:00
Pfeil, Scott Robert
27793931f5 fix for static functions 2020-01-14 15:55:18 -05:00
Suresh, Kamlesh
5560084c1d Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 15:52:16 -05:00
Suresh, Kamlesh
147ce53c90 name for class 2020-01-14 15:50:46 -05:00
Pfeil, Scott Robert
3d2fd02ac5 undo view constraining removal code
fix molecule table cell
fix corner labels
2020-01-14 13:58:18 -05:00
Pfeil, Scott Robert
a204603616 temp corner labels fix 2020-01-14 12:19:26 -05:00
Pfeil, Scott Robert
979718d4b8 Defaults, percent fix 2020-01-14 11:56:50 -05:00
Pfeil, Scott Robert
7790a20ad3 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 11:18:31 -05:00
Pfeil, Scott Robert
2f6859f543 button model fix 2020-01-14 11:17:10 -05:00
Suresh, Kamlesh
0090b686a5 default stryle and spacing 2020-01-14 11:11:28 -05:00
Murugan, Vimal
46b37a5f56 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 20:50:24 +05:30
Pfeil, Scott Robert
9c0bea033c actionType fix 2020-01-14 10:13:19 -05:00
Pfeil, Scott Robert
77af932f5d update old key 2020-01-14 09:26:04 -05:00
Pfeil, Scott Robert
447df655df make the error throwable 2020-01-14 09:12:09 -05:00
Pfeil, Scott Robert
198ebe722b missed name change 2020-01-14 08:59:58 -05:00
Pfeil, Scott Robert
461a51d880 stack item change decoding 2020-01-13 22:18:40 -05:00
Pfeil, Scott Robert
96d533780f update multi progress to match color 2020-01-13 21:25:24 -05:00
Pfeil, Scott Robert
145b9d5423 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 21:16:03 -05:00
Pfeil, Scott Robert
6b7bb180fc corner labels temporary 2020-01-13 21:15:21 -05:00
Ryan
255fce072b merge from develop 2020-01-13 15:47:27 -05:00
Pfeil, Scott Robert
4437338620 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:29:07 -05:00
Pfeil, Scott Robert
5c2f93e06f move register to init for now
dash line update temporary for legacy
2020-01-13 15:28:53 -05:00
Pfeil, Scott Robert
f64424a2c5 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:27:27 -05:00
Pfeil, Scott Robert
57753f6697 Change keys 2020-01-13 15:26:51 -05:00
Pfeil, Scott Robert
9a18346fca Merge branch 'feature/button' into 'develop'
Translates MFCustomButton to Button

See merge request BPHV_MIPS/mvm_core_ui!205
2020-01-13 14:51:05 -05:00
Pfeil, Scott Robert
b35056b985 Merge branch 'bugfix/dashfix' into 'develop'
some class is using a xib.

See merge request BPHV_MIPS/mvm_core_ui!219
2020-01-13 14:47:18 -05:00
Kevin G Christiano
ad4eddb450 some class is using a xib. 2020-01-13 14:43:16 -05:00
Kevin G Christiano
223ab11783 Merge branch 'develop' into feature/button
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:35:23 -05:00
Ryan
595cc04ec0 merge from feature/coding 2020-01-13 14:18:47 -05:00
Ryan
cea1ecd52c merge from develop 2020-01-13 14:02:20 -05:00
Murugan, Vimal
ec451d1f2e Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 00:04:39 +05:30
Pan, Xinlei (Ryan)
a4c7ebda3a Merge branch 'feature/swiftified_textField' into 'develop'
Swiftifield EntryField

See merge request BPHV_MIPS/mvm_core_ui!186
2020-01-13 13:30:42 -05:00
Kevin G Christiano
b79ddf7346 additions for accessibility. 2020-01-13 12:45:49 -05:00
Pfeil, Scott Robert
788145332f Two button view temporary model fix
primary button model
2020-01-13 12:44:05 -05:00
Murugan, Vimal
be094b3cf9 review comments updated 2020-01-13 22:49:51 +05:30
Pfeil, Scott Robert
5c0d57fded Merge branch 'feature/model_wip_kamlesh' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-13 11:33:59 -05:00
Pfeil, Scott Robert
bb0be72519 Link update 2020-01-13 11:33:44 -05:00