Commit Graph

442 Commits

Author SHA1 Message Date
Pan, Xinlei (Ryan)
2ad746353d Merge branch 'feature/bottom_tab_bar' into 'develop'
Tab updates

See merge request BPHV_MIPS/mvm_core!85
2020-06-02 11:43:35 -04:00
Pfeil, Scott Robert
61aecf2079 Tab updates 2020-05-29 15:51:27 -04:00
Pfeil, Scott Robert
544d5767e0 Merge branch 'release/7_7_0' into 'develop'
Release/7 7 0

See merge request BPHV_MIPS/mvm_core!84
2020-05-26 12:49:13 -04:00
Suresh, Kamlesh Jain
db7e37f894 Merge branch 'feature/global_headers' into 'release/7_7_0'
global headers

See merge request BPHV_MIPS/mvm_core!83
2020-05-22 19:47:50 -04:00
Suresh, Kamlesh
519348f6bb global headers 2020-05-22 19:32:05 -04:00
Pfeil, Scott Robert
e5e46662a6 Merge branch 'feature/decoder_delegate' into 'develop'
delegate object for model decoding functions

See merge request BPHV_MIPS/mvm_core!82
2020-05-12 09:21:06 -04:00
Pfeil, Scott Robert
5abda67b00 delegate object for model decoding functions 2020-05-11 16:14:43 -04:00
Pfeil, Scott Robert
0ac85efff1 Merge branch 'feature/template_and_navigation' into 'develop'
navigation and template

See merge request BPHV_MIPS/mvm_core!80
2020-04-24 11:50:09 -04:00
Pfeil, Scott Robert
9b7f09dcf4 add convenience inits. 2020-04-24 11:38:58 -04:00
Pfeil, Scott Robert
3b47067dbc Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core into feature/template_and_navigation 2020-04-23 13:14:34 -04:00
Pfeil, Scott Robert
9ecd797570 Merge branch 'release/7_6_0' into 'develop'
Release/7 6 0

See merge request BPHV_MIPS/mvm_core!81
2020-04-23 10:47:05 -04:00
Pfeil, Scott Robert
8124292b7d navigation and template 2020-04-21 15:51:50 -04:00
Suresh, Kamlesh Jain
fa55078bdb Merge branch 'feature/move_legacy' into 'release/7_6_0'
move legacy files

See merge request BPHV_MIPS/mvm_core!76
2020-04-21 13:19:57 -04:00
Suresh, Kamlesh Jain
f467a4445f Merge branch 'release/7_6_0' into 'develop'
Release/7 6 0

See merge request BPHV_MIPS/mvm_core!79
2020-04-20 13:41:54 -04:00
Pfeil, Scott Robert
dc4fa9b8df Merge branch 'feature/april_modify' into 'release/7_6_0'
april jira tasks

See merge request BPHV_MIPS/mvm_core!77
2020-04-15 18:11:31 -04:00
Pfeil, Scott Robert
cd374bfacc Fix to models check 2020-04-13 17:19:50 -04:00
Pfeil, Scott Robert
0d0a6c4a81 Merge branch 'develop' into feature/april_modify 2020-04-13 15:40:54 -04:00
Pfeil, Scott Robert
18ffc7e203 Merge branch 'bugfix/image' into 'develop'
bugfix for load gif file form different bundle

See merge request BPHV_MIPS/mvm_core!78
2020-04-13 09:16:58 -04:00
Xinlei(Ryan) Pan
b60a3532c4 bugfix for load gif file form different bundle 2020-04-12 19:25:20 -04:00
Pfeil, Scott Robert
68897db764 april jira tasks 2020-04-02 19:47:52 -04:00
Pfeil, Scott Robert
7663c50679 move legacy files 2020-03-31 11:05:13 -04:00
Pfeil, Scott Robert
93657580aa Merge branch 'feature/model_cleanup' into 'develop'
Feature/model cleanup

See merge request BPHV_MIPS/mvm_core!75
2020-03-26 11:44:35 -04:00
Pfeil, Scott Robert
df4ee3377a Warning and analyze fixes 2020-03-24 09:54:18 -04:00
Pfeil, Scott Robert
072db2920f Merge branch 'feature/swift_controllers' into 'develop'
Feature/swift controllers

See merge request BPHV_MIPS/mvm_core!73
2020-03-23 16:58:01 -04:00
Pfeil, Scott Robert
d454316d05 Merge branch 'feature/swift_controllers' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core into feature/swift_controllers 2020-03-20 15:56:27 -04:00
Pfeil, Scott Robert
86a9905280 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core into feature/swift_controllers 2020-03-20 15:56:16 -04:00
Pfeil, Scott Robert
bab6621492 remove change 2020-03-20 10:21:06 -04:00
Pfeil, Scott Robert
fa48923e1f remove comment out 2020-03-20 10:20:01 -04:00
Pfeil, Scott Robert
8da16fe18b required identifiers 2020-03-19 16:28:35 -04:00
Pfeil, Scott Robert
57fa72545b Merge branch 'develop' into feature/swift_controllers 2020-03-19 10:23:28 -04:00
Pfeil, Scott Robert
b927c493e7 Merge branch 'feature/new_actions' into 'develop'
add new action models

See merge request BPHV_MIPS/mvm_core!72
2020-03-18 13:49:45 -04:00
Pfeil, Scott Robert
a4149911e5 no more fake settings 2020-03-18 13:45:23 -04:00
Pfeil, Scott Robert
9b2812bc39 remove unnecessary settings check 2020-03-18 13:28:51 -04:00
Pfeil, Scott Robert
e64560b9e1 merge 2020-03-18 13:27:04 -04:00
Pfeil, Scott Robert
a7e3c8c1d1 cleanup 2020-03-18 13:25:44 -04:00
Xinlei(Ryan) Pan
d30b21bbd7 remove encode, decode method since actionType already handled by default encode behavior 2020-03-17 16:59:30 -04:00
Xinlei(Ryan) Pan
92584d935f add codable method to avoid set actionType value 2020-03-17 16:17:58 -04:00
Xinlei(Ryan) Pan
68b805a417 move position of some action model 2020-03-17 15:06:34 -04:00
Xinlei(Ryan) Pan
1bad7f5639 add new actions 2020-03-17 12:40:03 -04:00
Xinlei(Ryan) Pan
6f52553719 add new action models 2020-03-17 11:34:15 -04:00
Pfeil, Scott Robert
9e641c7300 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core into feature/swift_controllers 2020-03-13 12:09:14 -04:00
Suresh, Kamlesh Jain
9fa667d16a Merge branch 'bugfix/customUserAgent_data_type_fix' into 'develop'
customUserAgent data type fix

See merge request BPHV_MIPS/mvm_core!71
2020-03-13 11:49:03 -04:00
Khan, Arshad
2725c39d3e customUserAgent data type fix 2020-03-13 20:59:11 +05:30
Pfeil, Scott Robert
7884736227 Merge branch 'bugfix/model_name_update' into 'develop'
matching name change in model

See merge request BPHV_MIPS/mvm_core!70
2020-03-13 10:17:08 -04:00
Pfeil, Scott Robert
1eda14b2ef swift 2020-03-13 10:04:47 -04:00
Kevin G Christiano
30d0b6f90c matching name change in model 2020-03-13 09:20:00 -04:00
Pfeil, Scott Robert
53a464d346 Merge branch 'bugfix/shared' into 'develop'
Correcting name

See merge request BPHV_MIPS/mvm_core!69
2020-03-12 13:20:11 -04:00
Kevin G Christiano
4dee1866ed corecting name 2020-03-12 12:54:53 -04:00
Suresh, Kamlesh
29afdf10ed Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core into develop 2020-03-06 17:37:55 -05:00
Suresh, Kamlesh
6ca805a950 comment == temporarily 2020-03-06 17:37:23 -05:00