Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update icon submodule #11696

Merged
merged 6 commits into from May 15, 2017
Merged

Update icon submodule #11696

merged 6 commits into from May 15, 2017

Conversation

Findus23
Copy link
Member

Some tests are failing, but I think none are because of my changes.

@sgiehl sgiehl added this to the 3.0.4 milestone May 13, 2017
@sgiehl sgiehl added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Task Indicates an issue is neither a feature nor a bug and it's purely a "technical" change. labels May 13, 2017
@Findus23
Copy link
Member Author

Again the system test fails because of /home/travis/build/piwik/piwik/plugins/DevicesDetection/tests/System/processed/test___DevicesDetection.getBrand_day.xml

--- Expected
+++ Actual
@@ @@
     <revenue>62.26</revenue>
-    <logo>plugins/Morpheus/icons/dist/brand/Unknown.png</logo>
+    <logo>plugins/Morpheus/icons/dist/brand/unk.png</logo>
     <segment>deviceBrand==Unknown</segment>
   </row>
   <row>
     <label>HTC</label>
     <nb_uniq_visitors>1</nb_uniq_visitors>
     <nb_visits>1</nb_visits>
     <nb_actions>2</nb_actions>
     <nb_users>0</nb_users>
     <max_actions>2</max_actions>
     <sum_visit_length>721</sum_visit_length>
     <bounce_count>0</bounce_count>
     <goals>
       <row idgoal="1">
         <nb_conversions>1</nb_conversions>
         <nb_visits_converted>1</nb_visits_converted>
         <revenue>42.26</revenue>
       </row>
     </goals>
     <nb_conversions>1</nb_conversions>
     <revenue>42.26</revenue>
     <logo>plugins/Morpheus/icons/dist/brand/HTC.png</logo>
     <segment>deviceBrand==HTC</segment>
   </row>
   <row>
     <label>Philips</label>
     <nb_uniq_visitors>1</nb_uniq_visitors>
     <nb_visits>1</nb_visits>
     <nb_actions>1</nb_actions>
     <nb_users>0</nb_users>
     <max_actions>1</max_actions>
     <sum_visit_length>0</sum_visit_length>
     <bounce_count>1</bounce_count>
     <nb_visits_converted>0</nb_visits_converted>
     <logo>plugins/Morpheus/icons/dist/brand/Philips.png</logo>
     <segment>deviceBrand==Philips</segment>
   </row>
   <row>
     <label>Samsung</label>
     <nb_uniq_visitors>1</nb_uniq_visitors>
     <nb_visits>1</nb_visits>
     <nb_actions>1</nb_actions>
     <nb_users>0</nb_users>
     <max_actions>1</max_actions>
     <sum_visit_length>0</sum_visit_length>
     <bounce_count>1</bounce_count>
     <nb_visits_converted>0</nb_visits_converted>
     <logo>plugins/Morpheus/icons/dist/brand/Samsung.png</logo>
     <segment>deviceBrand==Samsung</segment>
   </row>
   <row>
     <label>ViewSonic</label>
     <nb_uniq_visitors>1</nb_uniq_visitors>
     <nb_visits>1</nb_visits>
     <nb_actions>1</nb_actions>
     <nb_users>0</nb_users>
     <max_actions>1</max_actions>
     <sum_visit_length>1084</sum_visit_length>
     <bounce_count>1</bounce_count>
     <goals>
       <row idgoal="1">
         <nb_conversions>1</nb_conversions>
         <nb_visits_converted>1</nb_visits_converted>
         <revenue>10</revenue>
       </row>
     </goals>
     <nb_conversions>1</nb_conversions>
     <revenue>10</revenue>
     <logo>plugins/Morpheus/icons/dist/brand/ViewSonic.png</logo>
     <segment>deviceBrand==ViewSonic</segment>
   </row>
 </result>

@mattab
Copy link
Member

mattab commented May 15, 2017

Thanks for the PR @Findus23 and making most of the tests pass 👍

@mattab mattab merged commit 6a93af8 into 3.x-dev May 15, 2017
@mattab mattab deleted the update-icon-submodule branch May 15, 2017 05:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Task Indicates an issue is neither a feature nor a bug and it's purely a "technical" change.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants