Commit Graph

761 Commits

Author SHA1 Message Date
Khan, Arshad
fe7fb2db03 changing separator to line mapping as per server and Android confirmation. 2019-09-30 22:01:11 +05:30
Khan, Arshad
c7978c52c9 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-09-24 15:20:08 +05:30
Pfeil, Scott Robert
52119f7b31 Merge branch 'feature/eye_head_body_textbtn' into 'develop'
Feature/eye head body textbtn

See merge request BPHV_MIPS/mvm_core_ui!138
2019-09-23 13:39:12 -04:00
Pfeil, Scott Robert
5b5a03b869 condensing 2019-09-23 13:30:35 -04:00
Pfeil, Scott Robert
a0f9470c27 model driven gone 2019-09-23 12:25:49 -04:00
Pfeil, Scott Robert
0bb3c8a719 new molecule and gone state of stack. 2019-09-23 12:21:59 -04:00
Khan, Arshad
07db61f035 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-09-19 22:27:28 +05:30
Pfeil, Scott Robert
430b957742 Merge branch 'feature/molecule_bug_fixes' into 'develop'
bug fixes

See merge request BPHV_MIPS/mvm_core_ui!137
2019-09-19 09:57:41 -04:00
Pfeil, Scott Robert
6cdde756e5 bug fixes 2019-09-19 09:06:14 -04:00
Khan, Arshad
decf0bf9e6 adding settingsList template 2019-09-18 21:58:30 +05:30
Khan, Arshad
b4aa985c63 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-09-18 14:13:13 +05:30
Pan, Xinlei (Ryan)
b353fe5955 Merge branch 'bugfix/CXTDT_28106' into 'develop'
fix for cxtdt_28106

See merge request BPHV_MIPS/mvm_core_ui!135
2019-09-17 14:52:52 -04:00
Murugan, Vimal
44ebfb9294 fix for cxtdt_28106 2019-09-17 16:25:00 +05:30
Khan, Arshad
b51f1b82f5 adding action block, which should only call after user interaction, but not at the time of initial loading.
Fixing apple crash, where even after deletion, apple not updating number of rows, which is leading to index out of bounds crash.
Adding remove list item method which has specific molecule inside.
2019-09-14 04:55:40 +05:30
Pan, Xinlei (Ryan)
52679e95f3 Merge branch 'bugfix/constraining_molecules' into 'develop'
alignment fix issues.

See merge request BPHV_MIPS/mvm_core_ui!133
2019-09-12 09:51:14 -04:00
Pan, Xinlei (Ryan)
0e27266b85 Merge branch 'feature/multiprogress' into 'develop'
Feature/multiprogress

See merge request BPHV_MIPS/mvm_core_ui!132
2019-09-11 16:49:31 -04:00
panxi
f69fe85d83 update based on Scott's comment 2019-09-11 10:19:03 -04:00
panxi
358842e433 update based on Scott's comment 2019-09-11 10:04:19 -04:00
panxi
d52e204721 update multiprogressbar 2019-09-10 15:57:00 -04:00
Pfeil, Scott Robert
d62db8d5ac Merge branch 'feature/tabs_list_item' into 'develop'
Tabs table cell

See merge request BPHV_MIPS/mvm_core_ui!131
2019-09-10 14:42:14 -04:00
Pfeil, Scott Robert
4050b784ed alignment fix issues. 2019-09-10 14:11:09 -04:00
panxi
595a3b1e38 fix typo 2019-09-09 16:49:12 -04:00
panxi
dcd87fb924 add MultiProgress 2019-09-09 16:42:38 -04:00
Pfeil, Scott Robert
b4c53f838b Tabs table cell 2019-09-09 14:07:32 -04:00
Pfeil, Scott Robert
814d470775 Merge branch 'feature/label_accessibility' into 'develop'
Label Accessibility

See merge request BPHV_MIPS/mvm_core_ui!96
2019-09-05 13:53:56 -04:00
Pfeil, Scott Robert
7a85b46ff0 Merge branch 'bugfix/cxtdt-25160' into 'develop'
Adds nil check on contentColor to account for future possibility of...

See merge request BPHV_MIPS/mvm_core_ui!127
2019-09-05 12:50:34 -04:00
Kevin G Christiano
36595efb90 Merge branch 'develop' into feature/label_accessibility 2019-09-05 11:22:13 -04:00
Kevin G Christiano
33754802bb Latest changes. Now including clause changes. 2019-09-05 11:20:55 -04:00
Robinson, Blake
5adce50053 Removed comment and used ternary operator based on code review 2019-09-05 10:28:50 -04:00
Pfeil, Scott Robert
ebc8080abe Merge branch 'bugfix/tableheaderview_height_update' into 'develop'
Bugfix/tableheaderview height update

See merge request BPHV_MIPS/mvm_core_ui!130
2019-09-05 09:49:15 -04:00
Murugan, Vimal
63322a7d24 updated the file 2019-09-05 19:00:07 +05:30
Murugan, Vimal
11db27de88 space updated 2019-09-05 18:54:35 +05:30
Murugan, Vimal
a3e60ef4ac controller reference updated for getting correct width 2019-09-05 18:53:18 +05:30
Murugan, Vimal
e5a66dc1a3 width update for calculate correct height 2019-09-05 14:53:42 +05:30
Pfeil, Scott Robert
0faabb8f17 Merge branch 'feature/styles' into 'develop'
Style

See merge request BPHV_MIPS/mvm_core_ui!129
2019-09-04 15:15:00 -04:00
Kevin G Christiano
a6e732afa9 Merge branch 'develop' into feature/label_accessibility
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-09-04 14:08:10 -04:00
Pfeil, Scott Robert
8f4abb5864 Merge branch 'feature/label_export_box' into 'develop'
Multiple Icon Attachments for Label.

See merge request BPHV_MIPS/mvm_core_ui!116
2019-09-04 13:52:40 -04:00
Pfeil, Scott Robert
3ff48cf700 Style 2019-09-04 13:45:41 -04:00
Kevin G Christiano
556e70db2f Merge branch 'develop' into feature/label_export_box 2019-09-04 13:05:04 -04:00
Kevin G Christiano
880b3fbd3c Merge branch 'feature/label_accessibility' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/label_accessibility 2019-09-04 13:04:51 -04:00
Kevin G Christiano
11b92ac428 Merge branch 'develop' into feature/label_accessibility 2019-09-04 13:04:41 -04:00
Kevin G Christiano
0bf9090b41 updated. 2019-09-04 13:04:04 -04:00
Robinson, Blake
a3757adacd Adds nil check on contentColor to account for future possibility of contentColor having a value in this situation, which would a different tintColor on the button. 2019-09-04 11:25:23 -04:00
Pan, Xinlei (Ryan)
d1d0b07c8a Merge branch 'bugfix/mftextfield_background_fix' into 'develop'
changing mftextfield background to clear color.

See merge request BPHV_MIPS/mvm_core_ui!126
2019-09-04 11:18:06 -04:00
Thirukamu, Ravivarma
1a23ca6e27 Adding outlet view in h file for global access. 2019-09-04 11:17:04 -04:00
Thirukamu, Ravivarma
6883f1a61c Revert "changing mftextfield background to clear color."
This reverts commit 1bf69cb505.
2019-09-04 11:07:18 -04:00
Thirukamu, Ravivarma
1bf69cb505 changing mftextfield background to clear color. 2019-09-04 10:59:03 -04:00
Kevin G Christiano
8a74886928 fixed commed. 2019-09-04 09:58:46 -04:00
Pfeil, Scott Robert
3c349616ab Merge branch 'bugfix/alert_color_x_fix' into 'develop'
Fixes Alert view color issue.

See merge request BPHV_MIPS/mvm_core_ui!125
2019-09-04 09:56:37 -04:00
Kevin G Christiano
9b5b256594 Fixes Alert view color issue. 2019-09-04 09:55:05 -04:00