Commit Graph

1854 Commits

Author SHA1 Message Date
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
Lekshmi S
43a809aba0 Modified code as labels are optional. 2020-02-18 16:33:28 +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
Subhankar Acharya
c43a3da712 Code commit after adding a createPayPal function. 2020-02-18 16:06:30 +05:30
Lekshmi S
77476e1355 19162- List - Four Column - Data Usage - Divider story initial commit.
Added molecule class, model class.
2020-02-18 14:31:26 +05:30
Prateek Arora
f8fea032b5 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-18 13:42:31 +05:30
Suresh, Kamlesh
e2860efaf6 fixes 2020-02-17 22:28:09 -05:00
Lekshmi S
391cd9ae2c Merge branch 'develop' into feature/rightVariable_payments_list
# Conflicts:
#	MVMCoreUI/Atoms/Views/ImageViewModel.swift
2020-02-18 08:29:39 +05:30
Suresh, Kamlesh
a2700e81b4 remove file 2020-02-17 21:54:47 -05:00
Suresh, Kamlesh
d8acbec046 fixes 2020-02-17 19:07:23 -05:00
Pfeil, Scott Robert
d40d15e344 Merge branch 'feature/moar_colors' into 'develop'
changing pumpkin to orange for design update.

See merge request BPHV_MIPS/mvm_core_ui!263
2020-02-17 17:48:11 -05:00
Suresh, Kamlesh Jain
6d819897bd Merge branch 'feature/model_fixes' into 'develop'
fixes

See merge request BPHV_MIPS/mvm_core_ui!262
2020-02-17 17:46:42 -05:00
Suresh, Kamlesh
9211d6c86d public 2020-02-17 17:44:12 -05:00
Suresh, Kamlesh
3e14e39542 public 2020-02-17 17:37:46 -05:00
Suresh, Kamlesh
68bf45f583 content mode 2020-02-17 17:35:20 -05:00
Suresh, Kamlesh
347928a9b6 remove files 2020-02-17 16:48:42 -05:00
Suresh, Kamlesh
79eceb693e moleculeName 2020-02-17 15:06:33 -05:00
Suresh, Kamlesh
438661dfe1 moleculeName 2020-02-17 15:05:02 -05:00
Suresh, Kamlesh
6de4fc4864 fill color 2020-02-17 14:19:17 -05:00
Suresh, Kamlesh
cf4832bca7 fixes 2020-02-17 13:39:13 -05:00
Kevin G Christiano
06fe32f37b changing pumpkin to orange for design update. 2020-02-17 12:21:32 -05:00
Subhankar Acharya
273b131714 Code commit - changes has to be done to model. 2020-02-17 22:50:43 +05:30
Suresh, Kamlesh
87dcde3317 WIP 2020-02-17 12:11:57 -05:00
Pan, Xinlei (Ryan)
02f959de8c Merge branch 'bugfix/keyname_update' into 'develop'
Keyname fix.

See merge request BPHV_MIPS/mvm_core_ui!261
2020-02-17 08:57:52 -05:00
Suresh, Kamlesh
e431ea2de9 fixes 2020-02-14 15:56:36 -05:00
Kevin G Christiano
7708678fec Merge branch 'develop' 2020-02-14 09:18:26 -05:00
Kevin G Christiano
ee85a8972e relaigning key name with legacy name. 2020-02-14 08:58:32 -05:00
Subhankar Acharya
5da415d0fc removed line break. 2020-02-14 18:17:10 +05:30
Subhankar Acharya
21fc9c1802 Adding up the percentages for stacks. 2020-02-14 17:46:56 +05:30
Lekshmi S
0d6322b693 Removed percent for stackitems. 2020-02-14 16:02:05 +05:30
Lekshmi S
6cbf4a53bc Restructured file group. 2020-02-14 14:09:03 +05:30