mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
725 Commits 64 Branches 0 Tags 46 MiB
33754802bb
Commit Graph

725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin G Christiano
33754802bb Latest changes. Now including clause changes. 2019-09-05 11:20:55 -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
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
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
Kevin G Christiano
81490ae3cf Moved line. 2019-09-04 09:04:02 -04:00
Kevin G Christiano
b7d76eb015 Merge branch 'develop' into feature/label_export_box 2019-09-04 09:00:45 -04:00
Kevin G Christiano
9e914941ad Merge branch 'develop' into feature/label_export_box 2019-09-04 08:58:25 -04:00
Pan, Xinlei (Ryan)
a80b68dc14 Merge branch 'bugfix/secondary_button_color' into 'develop' 
border the button

See merge request BPHV_MIPS/mvm_core_ui!124
 2019-09-03 17:31:31 -04:00
Pan, Xinlei (Ryan)
81f6a36ec6 Merge branch 'feature/accordion_list_item' into 'develop' 
Feature/accordion list item

See merge request BPHV_MIPS/mvm_core_ui!123
 2019-09-03 17:16:03 -04:00
Pfeil, Scott Robert
2fd55f0aff border the button 2019-09-03 17:12:17 -04:00
Pfeil, Scott Robert
ea13603b7d font update 2019-09-03 16:52:10 -04:00
Pfeil, Scott Robert
cc75139860 Merge branch 'bugfix/align_with_x_button_changes' into 'develop' 
Aligning with text to image change.

See merge request BPHV_MIPS/mvm_core_ui!122
 2019-09-03 16:16:06 -04:00
Kevin G Christiano
b32cbd8566 objc. 2019-09-03 16:09:55 -04:00
Kevin G Christiano
9b336dc2ec remove unneeded method call and set default tint as black. 2019-09-03 16:09:01 -04:00
Pfeil, Scott Robert
32b2ab825b hide separator flag 2019-09-03 15:52:23 -04:00
Kevin G Christiano
e75b0d6d9a Set UIImageRenderingModeAlwaysTemplate to allow the tint change. 2019-09-03 15:49:43 -04:00
Pfeil, Scott Robert
aeaf7ecc5e Merge remote-tracking branch 'refs/remotes/origin/develop' 2019-09-03 15:14:21 -04:00
Pfeil, Scott Robert
658ed16bbd accordion list item 2019-09-03 15:14:12 -04:00
Kevin G Christiano
255cde58e6 Aligning with text to image change. 2019-09-03 14:56:48 -04:00
Kevin G Christiano
87cc0842de removed programmatic space insert. 2019-09-03 10:36:16 -04:00
Kevin G Christiano
890c1221d3 Merge branch 'develop' into feature/label_export_box 2019-09-03 10:07:38 -04:00
Kevin G Christiano
62418f5132 Moved hasAttachmentImage to a function. 2019-09-03 10:07:15 -04:00
Kevin G Christiano
38912a4f85 some changes made. More to come. 2019-08-29 16:21:30 -04:00
Pfeil, Scott Robert
b13400ab56 Merge branch 'feature/align_actiondetaiimage_with_android' into 'develop' 
Changed code to align with Android.

See merge request BPHV_MIPS/mvm_core_ui!115
 2019-08-29 15:42:18 -04:00
Kevin G Christiano
c2a432fd25 Updated localizable strings to include spanish. Renamed the variable to be more in line with its generic purpose. 2019-08-29 14:58:02 -04:00
Kevin G Christiano
2792808c9e Further changes made. 2019-08-29 14:20:42 -04:00
Kevin G Christiano
8e216f8b90 Corrections made. 2019-08-29 14:13:44 -04:00
Kevin G Christiano
0a97774098 Merge branch 'develop' into feature/align_actiondetaiimage_with_android 2019-08-29 13:29:16 -04:00
Pfeil, Scott Robert
740aaf09e0 Merge branch 'feature/switches' into 'develop' 
Feature/switches

See merge request BPHV_MIPS/mvm_core_ui!119
 2019-08-29 12:44:53 -04:00
Kevin G Christiano
40b771f2da Merge branch 'develop' into feature/align_actiondetaiimage_with_android 2019-08-29 10:52:45 -04:00
Kevin G Christiano
4f47aa9ad5 changed key. 2019-08-29 10:52:20 -04:00
Pfeil, Scott Robert
3e426cb80b Fix to two button view 2019-08-29 10:19:28 -04:00
Kevin G Christiano
1c5b2e448e Merge branch 'develop' into feature/label_accessibility 2019-08-29 09:39:37 -04:00
Kevin G Christiano
5351c31b1c latest from develop. 2019-08-29 09:39:22 -04:00
Pfeil, Scott Robert
3234a6ee7e estimated heights update 2019-08-29 08:35:27 -04:00
Pfeil, Scott Robert
b5276f5519 New molecules and arranging files 2019-08-29 08:28:07 -04:00
Kevin G Christiano
e0643d834e adding dimension ratio. 2019-08-28 10:40:43 -04:00
Kevin G Christiano
c7501f9cd6 Added asychronous behavior to adding image. 2019-08-27 16:28:19 -04:00
Pfeil, Scott Robert
4bc22dbb8e switches 2019-08-26 12:35:04 -04:00
Kevin G Christiano
f73d5e73a5 altered comments. 2019-08-22 11:37:50 -04:00