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

Jump to bottom

add help links in error message #9691

Merged
merged 1 commit into from Feb 4, 2016
Merged

add help links in error message #9691

merged 1 commit into from Feb 4, 2016

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Feb 3, 2016

fixes #9686

@tsteur tsteur added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Feb 3, 2016
@tsteur tsteur added this to the 2.16.0 milestone Feb 3, 2016
tsteur
tsteur reviewed Feb 3, 2016
View reviewed changes
core/Config.php
@@ -157,7 +157,8 @@ public function getClientSideOptions()
'action_url_category_delimiter' => $general['action_url_category_delimiter'],
'autocomplete_min_sites' => $general['autocomplete_min_sites'],
'datatable_export_range_as_day' => $general['datatable_export_range_as_day'],
'datatable_row_limits' => $this->getDatatableRowLimits()
'datatable_row_limits' => $this->getDatatableRowLimits(),
'are_ads_enabled' => $general['piwik_pro_ads_enabled']
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I named it are_ads_enabled instead of piwik_pro_ads_enabled as I wasn't sure if WhiteLabel plugin would replace the word Piwik there and lead to problems in the end

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI white label plugin only replaces Piwik with capital P

@tsteur
Copy link
Member Author

tsteur commented Feb 3, 2016

screenshot at feb 04 09-01-35
screenshot at feb 04 09-02-02

screenshot at feb 04 09-02-19

screenshot at feb 04 09-11-31

@tsteur
Copy link
Member Author

tsteur commented Feb 3, 2016

FYI: We very likely need to reimplement this in Piwik 3.0

mattab pushed a commit that referenced this pull request Feb 4, 2016
Merge pull request #9691 from piwik/9686
281524a 
add help links in error message to Piwik PRO
@mattab mattab merged commit 281524a into master Feb 4, 2016
@mattab
Copy link
Member

mattab commented Feb 4, 2016

Great 👍

@mattab mattab deleted the 9686 branch February 4, 2016 00:24
@tsteur tsteur restored the 9686 branch March 28, 2016 20:06
@sgiehl sgiehl deleted the 9686 branch April 15, 2016 20:31
@mattab mattab changed the title add help links in error message to Piwik PRO add help links in error message Jan 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Milestone
2.16.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@tsteur @mattab