Commit Graph

1636 Commits

Author SHA1 Message Date
Subhankar Acharya
5cdc33ff3a Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_fourcolumn_datausage_divider
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-26 15:20:03 +05:30
Subhankar Acharya
2ec429974a removing updateView. 2020-02-25 21:24:04 +05:30
Subhankar Acharya
54782b1871 Changes in init method and spacing 2020-02-25 20:11:22 +05:30
Kruthika KP
fea1c2e997 added subHeadline and changed the files order 2020-02-25 13:33:40 +05:30
Kruthika KP
5dd1c229f9 Merge branch 'develop' into feature/list_onecolumn_fullwidthtext_bodytextonly
* develop:
  header updates
  undoing removal
  mild updates
  hero is working. commenting done.
  rolled back change.
  moved hero is setWithModel. Was not being set. Mild changes.
  undo commented code
  Caret fix in table view cell code condensing extra init functions
2020-02-25 09:37:28 +05:30
Pfeil, Scott Robert
b255b1acac header updates 2020-02-24 16:53:42 -05:00
Subhankar Acharya
9a8c510b7f minor change 2020-02-24 22:06:31 +05:30
Subhankar Acharya
2f94f3435a Code changes as per condensed code feature branch. 2020-02-24 22:04:28 +05:30
Kevin G Christiano
9b53796266 undoing removal 2020-02-24 10:13:45 -05:00
Kevin G Christiano
e33fe346c6 mild updates 2020-02-24 09:58:47 -05:00
Kevin G Christiano
f889515709 hero is working. commenting done. 2020-02-23 13:34:20 -05:00
Kevin G Christiano
0c11ded577 rolled back change. 2020-02-21 14:41:53 -05:00
Kevin G Christiano
f7058e0a3f Merge branch 'feature/code_condensing' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/code_condensing 2020-02-21 14:32:07 -05:00
Kevin G Christiano
17583c107c moved hero is setWithModel. Was not being set. Mild changes. 2020-02-21 14:31:46 -05:00
Pfeil, Scott Robert
dedcd9de12 undo commented code 2020-02-21 10:16:00 -05:00
Pfeil, Scott Robert
ee66dbe8d5 Caret fix in table view cell
code condensing
extra init functions
2020-02-21 09:27:30 -05:00
Subhankar Acharya
47603e7a59 Added ListOneColumnFullWidthTextAllTextAndLinks molecule class and model files. 2020-02-21 16:58:16 +05:30
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
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
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
0947ba93ef paypal image 2020-02-19 17:31:47 -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
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
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
Pfeil, Scott Robert
29f89154f8 small model fix for images 2020-02-18 16:55:56 -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
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