Synch #1
Merged
Synch #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…an shown in the summary (#12863) * Show info message in visitor profile if there have been more visits than shown in the summary * show limited profile message in visit list as well * fix tests
Removed '-' when editing password, so it does not need to be manually removed Fixed indentation issues.
* Hide GeoIP2 server module settings by default * upates tests
* Allow to provide secondy sort column for reports * rename method * Adds two simple tests to prove secondary column sorting * invoke sort callback with datatable as second parameter
* Do not use sync ajax requests * adds deprecation comments * convert some methods to be fully async * adds minimum waittime after page load in ui tests * improve wait times
…ySQL InnoDB Cluster (#11885) * Columns added to support mysql group replication (every table must have a primary key) * changed integer to bigint as "there are issues at other places where INTEGER is simply too small." * Update script created for 3.1.0 to Fix #11596 * corrected php syntax and made the columns primary keys on add * updated the db upgrade to reflect the inclusion in version 3.2 instead of 3.1 * changed tabs to spaces * replaced tabs with spaces * Use consistent column names * Use consistent column names * Will be in 3.2.1 * Change Update version + bump version. * Version bump fail.
…st.propagateAjax`, `broadcast.pageLoad` (#12363) * deprecates broadcast.propagateAjax() * make overlay js independed from history service and some broadcast methods * deprecates historyService alogn with some broadcast methods * make popovers work in widgetized dashboard without history service * do not update overlay page/sidebar when iframe url didn't change prevents reloading data when opening a popover
* replace sparkline library with modern equivalent * test setting $enableSparklineImages to true for UI tests * update LEGALNOTICE * add minimum and maximum dots * further improve sparklines - no minimum/maximum if they are the same - add offset to the top so that maximum isn't stuck at the border - doubled resolution of image as it was a bit blurry and it's still <1.5KB * fix display size of sparklines * make Sparklines red * fix sparkline size in rowEvoluton * change line colors to black * lastPoint and padding * update Sparkline to new version * remove possibility to disable sparklines ($enableSparklineImages) * handle formatted numbers * Updates UI files
* Prevent caching of tracker in proxies * Also send Cache-Control with 204 responses. Varnish default config violates the HTTP spec in this respect. * Test Cache-Control header * Update changelog * Use no-store instead of no-cache
* Format metrics in row evolution popover correctly * Update UI files
* set correct lineThickness and fix default fill color * update UI files
* Check license correctly and disable if needed * make sure instance has internet features * make sure to verify it in tracker mode * because the text changed we need to change the translation key * prevent update check from being executed * simplify and improve performance * set caching time to 6 hours and invalidate cache when viewing subscriptions * fix tests * update ui screenshot
…t it will have. (#13089)
* Ignore IP Whitelist for Opt Out IFrame * Prevent bypassing IP Whitelist check while tracking if authentication is required
…CoreHome javascript to update page title with date string. (#12222) Correctly set date in page title when period changed via period selector
* Use translation for console update success message * Replace Piwik w/ Matomo in core:update output * fix integration test * makes update command fully translatable
… inside a widget container. (#13088) * Use saved ViewDataTable parameters mechanism for datatables displayed inside a widget container. * apply PR feedback
Our mission statement was changed a few years back, but we had never updated the readme. in this PR we update the mission statement from https://matomo.org/roadmap/ Soon we will update again our mission statement! See discussion in #8518 Also I update the number of sites using it to 1,400,000 as per source: https://trends.builtwith.com/analytics/Matomo
…#13445) * Create periods with timezones in a couple places that are missing it. * tweak * Apply timezone only if endDate is not a normal date. * add comment
…frame. (#13446) * Use postMessage instead of directly making API calls in the overlay iframe. * Make sure it will work when Matomo is on a subfolder. * Increase overlay security with domain and method whitelists. * Try to fix UI test. * Fix tests + UI test blacklist check. * broadcast.getValuesFromUrl does not decode URL params.
…il footer content. (#13421) * Use placeholder for unsubscribe link and place it near the normal email footer content. * padding tweak for whitelabel * fix unsubscribe link escaping replace issue * Move _htmlReportFooter contents to _htmlEmailFooter.twig. * Remove stray 'c'
* Fix more tests. * Update more files.
* Remove alias from user settings. * Update UI test screenshot.
* Fix replace not defined JS error Fixes error https://code.angularjs.org/1.6.5/docs/error/$interpolate/interr?p0=%7B%7B%20%27CoreHome_ClickToEditX%27%7Ctranslate%3A%28featureName%7Cescape%29%20%7D%7D&p1=TypeError%3A%20Cannot%20read%20property%20%27replace%27%20of%20undefined which I get when loading the UI * tabbing tweak
* Add possibility to manage and view Intranet websites #7724 * more tweaks * ui tests * fix some tests * added missing name * remove intranet setting, added test for tracking * fix various tests * remove test * Update RequestProcessor.php * Update en.json * fix some tests * do not throw exception if site does not exist * seeing just now it is fine to trigger exception * debug error * log only certain requests * Update piwik.php * Update JsProxyTest.php * trying to fix tests * remove debug code * trying to fix tests
* Updates device detector to latest 3.11.2 * update expected test file
* limit Sparkline size * set height/width to maximum if too large * remove useless empty line
* Fix license information may not be shown correctly * Update Controller.php
* Update screenshots. * Update two more screenshots.
* Changed wording of YouAreOptedIn * Update en.json
…e matches what is in the DB. (#13573)
* support window.Matomo in JS Tracker * Fix integration tests.
…13285) * Implements wrapper method for a more secure unserialize * run AllTests on PHP 7 * trigger a debug message if unserialize fails on PHP 7 + tests * Add string to deserialize to debug log.
InfinityVoid
pushed a commit
that referenced
this pull request
Oct 11, 2018
…mo-org#13132) Otherwise it would create a connection just to destroy it. Noticed this when my tests were failing because of this. ``` Failed to setup fixture: TEST INITIALIZATION FAILED: SQLSTATE[HY000] [1049] Unknown database 'piwik_tests' #0 libs/Zend/Db/Adapter/Pdo/Mysql.php(109): Zend_Db_Adapter_Pdo_Abstract->_connect() #1 core/Db/Adapter/Pdo/Mysql.php(96): Zend_Db_Adapter_Pdo_Mysql->_connect() matomo-org#2 core/Db/Adapter/Pdo/Mysql.php(74): Piwik\Db\Adapter\Pdo\Mysql->_connect() matomo-org#3 core/Db/Adapter.php(51): Piwik\Db\Adapter\Pdo\Mysql->getConnection() matomo-org#4 core/Db.php(122): Piwik\Db\Adapter::factory('PDO\\MYSQL', Array) matomo-org#5 core/Db.php(54): Piwik\Db::createDatabaseObject() matomo-org#6 core/DbHelper.php(142): Piwik\Db::get() matomo-org#7 core/Db.php(144): Piwik\DbHelper::disconnectDatabase() matomo-org#8 tests/PHPUnit/Framework/Fixture.php(869): Piwik\Db::destroyDatabaseObject() matomo-org#9 tests/PHPUnit/Framework/Fixture.php(227): Piwik\Tests\Framework\Fixture::connectWithoutDatabase() matomo-org#10 tests/PHPUnit/Framework/TestCase/SystemTestCase.php(76): Piwik\Tests\Framework\Fixture->performSetUp() matomo-org#11 tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php(61): Piwik\Tests\Framework\TestCase\SystemTestCase::setUpBeforeClass() ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.