Merge pull request #217 from techjoomla/release-1.1.6

Merge `Release 1.1.6` into `master`
techjoomla · Jul 12, 2021 · 8feaacb · 8feaacb
2 parents 76099dc + b8fb3d0
commit 8feaacb
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 24 deletions.
diff --git a/tjreports/languages/administrator/en-GB/en-GB.com_tjreports.ini b/tjreports/languages/administrator/en-GB/en-GB.com_tjreports.ini
@@ -147,7 +147,7 @@ COM_TJREPORTS_CLIENT_DESC="Client descending"
 COM_TJREPORTS_SAVED_QUERY_ASC="Saved Query ascending"
 COM_TJREPORTS_SAVED_QUERY_DESC="Saved Query descending"
 
-; Added in __DEPLOY_VERSION__
+; Added in 1.1.6
 COM_TJREPORTS_REPORT_SUMMARY="Summary Report"
 COM_TJREPORTS_REPORT_DETAILS="Details Report"
 COM_TJREPORTS_NO_RECORDS_FOUND_SUMMARY="No records found. Either you do not have any records or fields types found in records are not supported for showing summary report."
diff --git a/tjreports/languages/site/en-GB/en-GB.com_tjreports.ini b/tjreports/languages/site/en-GB/en-GB.com_tjreports.ini
@@ -107,6 +107,6 @@ LIB_TECHJOOMLA_CSV_EXPORT_ABORT="Abort"
 LIB_TECHJOOMLA_CSV_EXPORT_CONFIRM_ABORT="Are you sure to abort CSV Export?"
 LIB_TECHJOOMLA_CSV_EXPORT_UESR_ABORTED="Export aborted."
 
-; Since __DEPLOY_VERSION__
+; Since 1.1.6
 COM_TJREPORTS_REPORT_DETAILS="Details Report"
 COM_TJREPORTS_REPORT_SUMMARY="Summary Report"
diff --git a/tjreports/plugins/actionlog/tjreports/tjreports.xml b/tjreports/plugins/actionlog/tjreports/tjreports.xml
@@ -2,12 +2,12 @@
 <extension version="3.9" type="plugin" group="actionlog" method="upgrade">
 	<name>plg_actionlog_tjreports</name>
 	<author>Techjoomla</author>
-	<creationDate>11th Nov 2019</creationDate>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<creationDate>12th Jul 2021</creationDate>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<version>1.1.4</version>
+	<version>1.1.6</version>
 	<description>PLG_ACTIONLOG_TJREPORTS_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="tjreports">tjreports.php</filename>

diff --git a/tjreports/plugins/api/reports/reports/gdsfields.php b/tjreports/plugins/api/reports/reports/gdsfields.php
@@ -17,7 +17,7 @@
  * Tjreports API Gs fields class
  * This is used to get the fields for the Google studio connector
  *
- * @since  __DEPLOY_VERSION__
+ * @since  1.1.6
  */
 class ReportsApiResourceGdsfields extends ApiResource
 {

diff --git a/tjreports/plugins/api/reports/reports/gdsreports.php b/tjreports/plugins/api/reports/reports/gdsreports.php
@@ -15,7 +15,7 @@
 /**
  * Tjreports API to get the tjreports plugin those support Google studio connector
  *
- * @since  __DEPLOY_VERSION__
+ * @since  1.1.6
  */
 class ReportsApiResourceGdsreports extends ApiResource
 {

diff --git a/tjreports/plugins/content/tjreportsfields/tjreportsfields.xml b/tjreports/plugins/content/tjreportsfields/tjreportsfields.xml
@@ -5,10 +5,10 @@
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>11th Nov 2019</creationDate>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<creationDate>12th Jul 2021</creationDate>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>1.1.4</version>
+	<version>1.1.6</version>
 
 	<files>
 		<filename plugin="tjreportsfields">tjreportsfields.php</filename>

diff --git a/tjreports/plugins/privacy/tjreports/tjreports.xml b/tjreports/plugins/privacy/tjreports/tjreports.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.4" type="plugin" group="privacy" method="upgrade">
 	<name>plg_privacy_tjreports</name>
-	<version>1.1.4</version>
-	<creationDate>11th Nov 2019</creationDate>
+	<version>1.1.6</version>
+	<creationDate>12th Jul 2021</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>PLG_PRIVACY_TJREPORTS_XML_DESCRIPTION</description>
 	<files>

diff --git a/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml b/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml
@@ -5,10 +5,10 @@
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>11th Nov 2019</creationDate>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<creationDate>12th Jul 2021</creationDate>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>1.1.4</version>
+	<version>1.1.6</version>
 	<install>
         <sql>
             <file driver="mysql" charset="utf8">sql/tjreportsindexer.install.sql</file>

diff --git a/tjreports/site/models/reports.php b/tjreports/site/models/reports.php
@@ -105,15 +105,15 @@ class TjreportsModelReports extends ListModel
 	 * Show button to display option as Summary Report & Details Report
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  1.1.6
 	 */
 	public $showSummaryReport = 'No';
 
 	/**
 	 * Array about field type which suppport for summary report
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  1.1.6
 	 */
 	public $supportedFieldTypesForSummaryReport = array ('radio', 'checkbox', 'rating');
 
@@ -1600,7 +1600,7 @@ public function addTjReportsPlugins()
 	 *
 	 * @return  Array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   1.1.6
 	 */
 	protected function getUserGroups($userId)
 	{

diff --git a/tjreports/site/views/reports/view.html.php b/tjreports/site/views/reports/view.html.php
@@ -159,8 +159,8 @@ protected function addDocumentHeaderData()
 			HTMLHelper::stylesheet(Uri::root() . '/media/techjoomla_strapper/bs3/css/bootstrap.min.css');
 		}
 
-		HTMLHelper::_('script', 'components/com_tjreports/assets/js/tjrContentService.min.js');
-		HTMLHelper::_('script', 'components/com_tjreports/assets/js/tjrContentUI.min.js');
+		HTMLHelper::_('script', 'components/com_tjreports/assets/js/tjrContentService.min.js', array("relative" => true));
+		HTMLHelper::_('script', 'components/com_tjreports/assets/js/tjrContentUI.min.js', array("relative" => true));
 		HTMLHelper::_('stylesheet', 'components/com_tjreports/assets/css/tjreports.min.css');
 
 		$document->addScriptDeclaration('tjrContentUI.base_url = "' . Uri::base() . '"');

diff --git a/tjreports/tjreports.xml b/tjreports/tjreports.xml
@@ -4,10 +4,10 @@
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<creationDate>11th Nov 2019</creationDate>
-	<version>1.1.4</version>
+	<creationDate>12th Jul 2021</creationDate>
+	<version>1.1.6</version>
 	<description>This component is used to access all the report at single place.</description>
 	<install>
 		<!-- Runs on install -->