Commit Graph

1831 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
ee66dbe8d5 Caret fix in table view cell
code condensing
extra init functions
2020-02-21 09:27:30 -05:00
Pfeil, Scott Robert
cc5536a8d1 Minor fixes 2020-02-20 19:07:54 -05:00
Pfeil, Scott Robert
d8a5dd336b Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/ListLeftVar_Checkbox-_Right_Caret 2020-02-20 18:34:50 -05:00
Pfeil, Scott Robert
0157454c50 Merge branch 'feature/circular_progress_bar' into 'develop'
Feature/circular progress bar

See merge request BPHV_MIPS/mvm_core_ui!266
2020-02-20 18:33:32 -05:00
Pfeil, Scott Robert
ae62d161fd code improvements 2020-02-20 18:33:03 -05:00
Prateek Arora
3f1e37c878 Using stack as per review comments 2020-02-20 20:45:20 +05:30
Acharya, Subhankar
0f0e544962 Merge branch 'develop' into 'feature/ListLeftVar_Checkbox-_Right_Caret'
# Conflicts:
#   MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
#   MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-20 07:40:14 -05:00
Prateek Arora
22285dda62 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-20 18:02:42 +05:30
Subhankar Acharya
eacaff5a10 changing eybrow variable as per contract 2020-02-20 17:58:50 +05:30
Subhankar Acharya
d7a13704f2 Reference files 2020-02-20 15:56:02 +05:30
Subhankar Acharya
4803e20363 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/ListLeftVar_Checkbox-_Right_Caret
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-20 14:52:57 +05:30
Subhankar Acharya
576ce2ff56 renamed model 2020-02-20 14:41:01 +05:30
Subhankar Acharya
dc3178815c Renaming of molecule file, class and model 2020-02-20 14:08:47 +05:30
Prateek Arora
8093568559 Review comment fixes 2020-02-20 13:42:17 +05:30
Pfeil, Scott Robert
93127bc72a Merge branch 'feature/rightVariable_payments_list' into 'develop'
Feature/right variable payments list

See merge request BPHV_MIPS/mvm_core_ui!257
2020-02-19 17:32:08 -05:00
Pfeil, Scott Robert
0947ba93ef paypal image 2020-02-19 17:31:47 -05:00
Pfeil, Scott Robert
a8c96cfa82 Merge branch 'feature/rightVariable_payments_list' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-19 17:19:49 -05:00
Pfeil, Scott Robert
6563a14ff7 moleculeName coddle 2020-02-19 17:19:36 -05:00
Pfeil, Scott Robert
51732b72a9 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-19 17:14:08 -05:00
Pfeil, Scott Robert
50d1d1a13a Fixes to allow bundle improvements 2020-02-19 17:12:50 -05:00
Suresh, Kamlesh Jain
a5e31137c1 Merge branch 'feature/parse' into 'develop'
remove typo

See merge request BPHV_MIPS/mvm_core_ui!270
2020-02-19 14:48:52 -05:00
Xinlei(Ryan) Pan
6b1a02c369 fix typo 2020-02-19 14:48:31 -05:00
Xinlei(Ryan) Pan
5c42c4bf28 remove typo 2020-02-19 14:45:51 -05:00
Pan, Xinlei (Ryan)
7d5ddfe523 Merge branch 'feature/parse' into 'develop'
moleculeName

See merge request BPHV_MIPS/mvm_core_ui!269
2020-02-19 14:29:14 -05:00
Xinlei(Ryan) Pan
f38b577321 add missing moleculeName 2020-02-19 14:26:52 -05:00
Suresh, Kamlesh
b5ac3b0b76 fixes 2020-02-19 14:09:34 -05:00
Suresh, Kamlesh
08cf275ba4 space 2020-02-19 13:59:28 -05:00
Pfeil, Scott Robert
d96ceb0063 Merge branch 'feature/copy_link_text' into 'develop'
New Action share

See merge request BPHV_MIPS/mvm_core_ui!267
2020-02-19 12:39:02 -05:00
Kevin G Christiano
23fa0c5bad reverting 2020-02-19 12:36:28 -05:00
Suresh, Kamlesh
cbe01463d9 moleculeName 2020-02-19 11:26:24 -05:00
Subhankar Acharya
7dd0a718c0 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-19 20:36:01 +05:30
Pfeil, Scott Robert
a845c37f17 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-19 09:40:43 -05:00
Pfeil, Scott Robert
fa0ec8ab45 minor fixes 2020-02-19 09:40:17 -05:00
Suresh, Kamlesh Jain
377b26e40d Merge branch 'feature/parse' into 'develop'
small model fix for images

See merge request BPHV_MIPS/mvm_core_ui!268
2020-02-18 17:04:40 -05:00
Pfeil, Scott Robert
29f89154f8 small model fix for images 2020-02-18 16:55:56 -05:00
Suresh, Kamlesh Jain
ca20bd62ce Merge branch 'feature/parse' into 'develop'
fixes

See merge request BPHV_MIPS/mvm_core_ui!265
2020-02-18 16:53:51 -05:00
Kevin G Christiano
8b309c928f conflict resolution 2020-02-18 15:56:21 -05:00
Kevin G Christiano
633eb4ec21 adding a new action type. updated action map flow. 2020-02-18 15:19:28 -05:00
Pfeil, Scott Robert
a620dd2401 some fixes for catching and remove file 2020-02-18 14:59:17 -05:00
Pfeil, Scott Robert
db8a27ec2f update to label attributes 2020-02-18 14:29:35 -05:00
Pfeil, Scott Robert
0360258c31 Merge branch 'feature/parse' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/parse 2020-02-18 13:39:22 -05:00
Suresh, Kamlesh
ff0758106e init 2020-02-18 12:31:55 -05:00
Suresh, Kamlesh
4378a6f132 Merge branch 'develop' into feature/parse 2020-02-18 11:15:41 -05:00
Pfeil, Scott Robert
241e77f782 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/parse 2020-02-18 10:02:49 -05:00
Pfeil, Scott Robert
3fc476a576 Merge branch 'feature/unlock_s7_server_query_params' into 'develop'
add toggle for server s7 params

See merge request BPHV_MIPS/mvm_core_ui!260
2020-02-18 09:48:58 -05:00
Hedden, Kyle Matthew
a29b4b17a0 add toggle for server s7 params 2020-02-18 09:48:58 -05:00
Prateek Arora
c97c3fe734 Code changes and cleaning 2020-02-18 19:22:17 +05:30
Prateek Arora
a7ebc798d2 Removing hardcoded constraints replacing with multiplier 2020-02-18 19:01:08 +05:30
Lekshmi S
72d0a24061 Modified code as image is optional. 2020-02-18 16:50:03 +05:30
Subhankar Acharya
5646c27adf Merge branch 'feature/rightVariable_payments_list' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-18 16:09:45 +05:30