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.

Sign up for GitHub

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

Jump to bottom

Added new archive and lab icon #11249

Merged
merged 7 commits into from Jan 22, 2017
Merged

Added new archive and lab icon #11249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05cb66d
added new form icon
tsteur Jan 19, 2017
b282bff
add archive and lab icon
tsteur Jan 19, 2017
c96be15
UI tests
mattab Jan 21, 2017
93a5c87
Merge branch '3.x-dev' into fontupdate
mattab Jan 21, 2017
a7d3385
Merge branch 'fontupdate' of github.com:piwik/piwik into fontupdate
tsteur Jan 19, 2017
d224461
Custom Alerts submodule
mattab Jan 22, 2017
e0b1c0d
Merge remote-tracking branch 'origin/3.x-dev' into fontupdate
mattab Jan 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions LEGALNOTICE
View file
Open in desktop
Expand Up @@ -268,11 +268,11 @@ THIRD-PARTY CONTENT
License: GPL
By: Alessandro Rei - http://www.kde-look.org/usermanager/search.php?username=mentalrey

Name: Material icons ("icon-info2" "icon_outline" "icon_settings") in plugins/Morpheus/fonts
Name: Material icons ("icon-info2" "icon-outline" "icon-settings", "icon-form") in plugins/Morpheus/fonts
Link: https://design.google.com/icons/
License: Apache License Version 2.0

Name: IcoMoon - Free icons ("icon-funnel") in plugins/Morpheus/fonts
Name: IcoMoon - Free icons ("icon-funnel", "icon-lab", "icon-archive") in plugins/Morpheus/fonts
Link: https://icomoon.io/#icons-icomoon
License: GPL

Expand Down
2 changes: 1 addition & 1 deletion plugins/CustomAlerts
Open in desktop
Submodule CustomAlerts updated from e59fd1 to e98ea4
2 changes: 2 additions & 0 deletions plugins/Morpheus/fonts/piwik.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/Morpheus/fonts/piwik.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified plugins/Morpheus/fonts/piwik.woff
View file
Open in desktop
Binary file not shown.