Commit Graph

3276 Commits

Author SHA1 Message Date
Kevin G Christiano
cf6db73acb comments 2020-04-03 11:28:05 -04:00
Kevin G Christiano
c0d85694c6 more updates 2020-04-03 11:25:29 -04:00
Kevin G Christiano
de6fe50c82 updates 2020-04-03 11:19:51 -04:00
Pfeil, Scott Robert
9e241e6d8e Molecule stack fix 2020-04-03 11:03:12 -04:00
Kevin G Christiano
174d26edc4 textview 2020-04-03 10:59:38 -04:00
Kevin G Christiano
9f026b73be Merge branch 'develop' into feature/modern_styler 2020-04-03 10:54:49 -04:00
Kevin G Christiano
daa37c5add textview stuff 2020-04-03 10:46:32 -04:00
Lekshmi S
1efffcf33d Removed spacing 2020-04-03 17:40:46 +05:30
Lekshmi S
dae31e77da 19180(List - Three Column - Speed Test - Divider) commit 2020-04-03 16:40:40 +05:30
Damodaram
e122b8ce23 files added 2020-04-03 16:17:40 +05:30
Damodaram
b350e98b19 Merge branch 'develop' into feature/list_threeColumn_billChanges_divider 2020-04-03 16:06:14 +05:30
Lekshmi S
e88e661e1f Resolving conflicts 2020-04-03 14:38:24 +05:30
Lekshmi S
96cd22e66d Merge branch 'develop' into feature/list_threecolumn_speedtest_divider
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-04-03 14:31:55 +05:30
Damodaram
96115b7a5d border changes updated 2020-04-03 12:45:32 +05:30
Pfeil, Scott Robert
7440a3c665 Merge branch 'feature/list_threecolumn_International_datadivider' into 'develop'
List - Three Column - International Data - Divider

See merge request BPHV_MIPS/mvm_core_ui!343
2020-04-02 20:30:28 -04:00
Pfeil, Scott Robert
bcffe0bbd2 Percent update 2020-04-02 20:28:47 -04:00
Pfeil, Scott Robert
a82f9b4aca Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_threecolumn_International_datadivider 2020-04-02 20:02:58 -04:00
Pfeil, Scott Robert
fcbec4d60f Merge branch 'feature/webviewmodel' into 'develop'
Feature/webviewmodel

See merge request BPHV_MIPS/mvm_core_ui!335
2020-04-02 19:51:52 -04:00
Pfeil, Scott Robert
b302d2ff61 april jira tasks 2020-04-02 19:47:52 -04:00
Xinlei(Ryan) Pan
5068c6d9b5 Merge branch 'develop' into feature/webviewmodel 2020-04-02 18:45:49 -04:00
Kyle Matthew Hedden
5098bc911b code review - extra spacing 2020-04-02 17:51:19 -04:00
Kevin G Christiano
c9bb3ce1f3 including 2.0 legacy as it's being used in some molecular at the moment. 2020-04-02 17:16:04 -04:00
Xinlei(Ryan) Pan
3279ef91fd update did fail method 2020-04-02 13:40:24 -04:00
Kevin G Christiano
1a8324c90b more improvements 2020-04-02 13:35:08 -04:00
Kevin G Christiano
3210f25cd5 more arrow 2020-04-02 12:40:28 -04:00
Pfeil, Scott Robert
cfb2c3c78a Merge branch 'bugfix/form_fix' into 'develop'
fix

See merge request BPHV_MIPS/mvm_core_ui!344
2020-04-02 12:07:10 -04:00
Kevin G Christiano
bdda06629f arrow updates. 2020-04-02 11:47:47 -04:00
Kevin G Christiano
8788d98323 updates 2020-04-02 11:20:17 -04:00
Kevin G Christiano
ed34ae3c19 removed code that was breaking 2020-04-02 11:12:15 -04:00
Kevin G Christiano
60ab87764b f 2020-04-02 11:02:21 -04:00
Kevin G Christiano
65cd734a40 removed duplicate file 2020-04-02 10:45:42 -04:00
Kyle Matthew Hedden
614a2b89c8 code review 2020-04-02 10:42:23 -04:00
Suresh, Kamlesh
39e2001533 fiix 2020-04-02 10:18:40 -04:00
Kevin G Christiano
d039a0a64a matching 2020-04-02 10:09:32 -04:00
Kyle Matthew Hedden
1d725bb6b8 Merge remote-tracking branch 'origin/develop' into feature/bottom_buttons_model_adapter 2020-04-02 09:48:20 -04:00
Kevin G Christiano
c723d96cbf removed comment 2020-04-02 08:48:24 -04:00
Kevin G Christiano
79d0700485 gerging 2020-04-02 08:46:12 -04:00
Kevin G Christiano
20d23483fe Merge branch 'develop' into feature/modern_pagecontrol 2020-04-02 08:44:27 -04:00
Kevin G Christiano
de486bf069 Merge branch 'develop' into feature/designed_external_link 2020-04-02 08:43:06 -04:00
Kruthika KP
59e33c5410 Merge branch 'develop' into feature/list_threecolumn_International_datadivider
* develop: (26 commits)
  remove extra file
  removing redundant code.
  typo fix
  rules are optional
  more
  more
  more additions for radio label
  Button changes committed
  move files
  move files
  move files
  move files
  use another stack
  Minor fixs
  Merge conflicts resolved
  MF-18985 - ListFourColumnDataUsageListItem
  Code cleanup - spacing issues.
  Form Cleaning
  spacing change
  files added after merging
  ...
2020-04-02 12:16:41 +05:30
Xinlei(Ryan) Pan
0edc7a8f00 update based on Scott's comment 2020-04-01 19:51:19 -04:00
Xinlei(Ryan) Pan
4abfeef11a add stop loading, although it not loading 2020-04-01 19:32:36 -04:00
Xinlei(Ryan) Pan
95d305254f add overlay 2020-04-01 19:28:31 -04:00
Xinlei(Ryan) Pan
9cb75817e5 check previous content 2020-04-01 19:15:49 -04:00
Pfeil, Scott Robert
fde871f14d Merge branch 'feature/list_right_variable_button_all_text_and_links' into 'develop'
Feature/list right variable button all text and links

See merge request BPHV_MIPS/mvm_core_ui!322
2020-04-01 18:13:57 -04:00
Pfeil, Scott Robert
56dfb07949 remove extra file 2020-04-01 18:13:22 -04:00
Pfeil, Scott Robert
322f5caee5 removing redundant code. 2020-04-01 18:10:48 -04:00
Pfeil, Scott Robert
bed696b3e7 merge 2020-04-01 17:57:17 -04:00
Xinlei(Ryan) Pan
9851050aca move some code 2020-04-01 17:31:40 -04:00
Xinlei(Ryan) Pan
3e7a1a3250 move some code 2020-04-01 17:30:06 -04:00