From edf19e5eb80e6b8c526928d84b2d5d2eb68ff2e9 Mon Sep 17 00:00:00 2001 From: Manoj L Date: Fri, 12 Jul 2019 11:10:54 +0530 Subject: [PATCH] Merge `Release 1.1.0` into `release-1.1.1` (#140) * folder structure changed: moved pligins to tjreports folder * Issue #138 fix: Maintainance: move the plugins folder under the tjreports(src) folder * Issue #139 fix:Install the indexer table from plugin * Update indexer.php --- build/bump.php | 8 ++++---- .../plugins}/actionlog/tjreports/index.html | 0 .../en-GB/en-GB.plg_actionlog_tjreports.ini | 0 .../en-GB.plg_actionlog_tjreports.sys.ini | 0 .../actionlog/tjreports/tjreports.php | 0 .../actionlog/tjreports/tjreports.xml | 2 +- .../content/tjreportsfields/index.html | 0 .../en-GB.plg_content_tjreportsfields.ini | 0 .../en-GB.plg_content_tjreportsfields.sys.ini | 0 .../tjreportsfields/tjreportsfields.php | 0 .../tjreportsfields/tjreportsfields.xml | 8 ++++---- .../plugins}/privacy/tjreports/index.html | 0 .../en-GB/en-GB.plg_privacy_tjreports.ini | 0 .../en-GB/en-GB.plg_privacy_tjreports.sys.ini | 0 .../plugins}/privacy/tjreports/tjreports.php | 0 .../plugins}/privacy/tjreports/tjreports.xml | 2 +- .../plugins}/user/tjreportsindexer/index.html | 0 .../en-GB/en-GB.plg_user_tjreportsindexer.ini | 0 .../en-GB.plg_user_tjreportsindexer.sys.ini | 0 .../sql/tjreportsindexer.install.sql | 3 +++ .../sql/updates/mysql/1.1.0.sql | 3 +++ .../tjreportsindexer/tjreportsindexer.php | 0 .../tjreportsindexer/tjreportsindexer.xml | 20 ++++++++++++++----- tjreports/tjreports.xml | 2 +- 24 files changed, 32 insertions(+), 16 deletions(-) rename {plugins => tjreports/plugins}/actionlog/tjreports/index.html (100%) rename {plugins => tjreports/plugins}/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.ini (100%) rename {plugins => tjreports/plugins}/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.sys.ini (100%) rename {plugins => tjreports/plugins}/actionlog/tjreports/tjreports.php (100%) rename {plugins => tjreports/plugins}/actionlog/tjreports/tjreports.xml (97%) rename {plugins => tjreports/plugins}/content/tjreportsfields/index.html (100%) rename {plugins => tjreports/plugins}/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.ini (100%) rename {plugins => tjreports/plugins}/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.sys.ini (100%) rename {plugins => tjreports/plugins}/content/tjreportsfields/tjreportsfields.php (100%) rename {plugins => tjreports/plugins}/content/tjreportsfields/tjreportsfields.xml (81%) rename {plugins => tjreports/plugins}/privacy/tjreports/index.html (100%) rename {plugins => tjreports/plugins}/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.ini (100%) rename {plugins => tjreports/plugins}/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.sys.ini (100%) rename {plugins => tjreports/plugins}/privacy/tjreports/tjreports.php (100%) rename {plugins => tjreports/plugins}/privacy/tjreports/tjreports.xml (95%) rename {plugins => tjreports/plugins}/user/tjreportsindexer/index.html (100%) rename {plugins => tjreports/plugins}/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.ini (100%) rename {plugins => tjreports/plugins}/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.sys.ini (100%) create mode 100755 tjreports/plugins/user/tjreportsindexer/sql/tjreportsindexer.install.sql create mode 100755 tjreports/plugins/user/tjreportsindexer/sql/updates/mysql/1.1.0.sql rename {plugins => tjreports/plugins}/user/tjreportsindexer/tjreportsindexer.php (100%) rename {plugins => tjreports/plugins}/user/tjreportsindexer/tjreportsindexer.xml (64%) diff --git a/build/bump.php b/build/bump.php index e97c595..be4ac5c 100644 --- a/build/bump.php +++ b/build/bump.php @@ -49,10 +49,10 @@ function usage($command) // This file will vary from component to component $coreXmlFiles = array( '/tjreports/tjreports.xml', - '/plugins/actionlog/tjreports/tjreports.xml', - '/plugins/content/tjreportsfields/tjreportsfields.xml', - '/plugins/privacy/tjreports/tjreports.xml', - '/plugins/user/tjreportsindexer/tjreportsindexer.xml' + '/tjreports/plugins/actionlog/tjreports/tjreports.xml', + '/tjreports/plugins/content/tjreportsfields/tjreportsfields.xml', + '/tjreports/plugins/privacy/tjreports/tjreports.xml', + '/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml' ); $antJobFile = '/build.xml'; diff --git a/plugins/actionlog/tjreports/index.html b/tjreports/plugins/actionlog/tjreports/index.html similarity index 100% rename from plugins/actionlog/tjreports/index.html rename to tjreports/plugins/actionlog/tjreports/index.html diff --git a/plugins/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.ini b/tjreports/plugins/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.ini similarity index 100% rename from plugins/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.ini rename to tjreports/plugins/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.ini diff --git a/plugins/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.sys.ini b/tjreports/plugins/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.sys.ini similarity index 100% rename from plugins/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.sys.ini rename to tjreports/plugins/actionlog/tjreports/language/en-GB/en-GB.plg_actionlog_tjreports.sys.ini diff --git a/plugins/actionlog/tjreports/tjreports.php b/tjreports/plugins/actionlog/tjreports/tjreports.php similarity index 100% rename from plugins/actionlog/tjreports/tjreports.php rename to tjreports/plugins/actionlog/tjreports/tjreports.php diff --git a/plugins/actionlog/tjreports/tjreports.xml b/tjreports/plugins/actionlog/tjreports/tjreports.xml similarity index 97% rename from plugins/actionlog/tjreports/tjreports.xml rename to tjreports/plugins/actionlog/tjreports/tjreports.xml index 7a55939..a249168 100644 --- a/plugins/actionlog/tjreports/tjreports.xml +++ b/tjreports/plugins/actionlog/tjreports/tjreports.xml @@ -2,7 +2,7 @@ plg_actionlog_tjreports Techjoomla - 24th Jun 2019 + 11th Jul 2019 Copyright (C) 2016 - 2019 Techjoomla. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL extensions@techjoomla.com diff --git a/plugins/content/tjreportsfields/index.html b/tjreports/plugins/content/tjreportsfields/index.html similarity index 100% rename from plugins/content/tjreportsfields/index.html rename to tjreports/plugins/content/tjreportsfields/index.html diff --git a/plugins/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.ini b/tjreports/plugins/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.ini similarity index 100% rename from plugins/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.ini rename to tjreports/plugins/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.ini diff --git a/plugins/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.sys.ini b/tjreports/plugins/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.sys.ini similarity index 100% rename from plugins/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.sys.ini rename to tjreports/plugins/content/tjreportsfields/language/en-GB/en-GB.plg_content_tjreportsfields.sys.ini diff --git a/plugins/content/tjreportsfields/tjreportsfields.php b/tjreports/plugins/content/tjreportsfields/tjreportsfields.php similarity index 100% rename from plugins/content/tjreportsfields/tjreportsfields.php rename to tjreports/plugins/content/tjreportsfields/tjreportsfields.php diff --git a/plugins/content/tjreportsfields/tjreportsfields.xml b/tjreports/plugins/content/tjreportsfields/tjreportsfields.xml similarity index 81% rename from plugins/content/tjreportsfields/tjreportsfields.xml rename to tjreports/plugins/content/tjreportsfields/tjreportsfields.xml index 9ffc25a..396f974 100644 --- a/plugins/content/tjreportsfields/tjreportsfields.xml +++ b/tjreports/plugins/content/tjreportsfields/tjreportsfields.xml @@ -3,12 +3,12 @@ plg_content_tjreportsfields PLG_CONTENT_TJREPORTSFIELDS_XML_DESCRIPTION Techjoomla - contact@techjoomla.com + extensions@techjoomla.com https://techjoomla.com - 24th May 2019 - Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + 11th Jul 2019 + Copyright (C) 2016 - 2019 Techjoomla. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL - 1.0.0 + 1.1.0 tjreportsfields.php diff --git a/plugins/privacy/tjreports/index.html b/tjreports/plugins/privacy/tjreports/index.html similarity index 100% rename from plugins/privacy/tjreports/index.html rename to tjreports/plugins/privacy/tjreports/index.html diff --git a/plugins/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.ini b/tjreports/plugins/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.ini similarity index 100% rename from plugins/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.ini rename to tjreports/plugins/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.ini diff --git a/plugins/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.sys.ini b/tjreports/plugins/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.sys.ini similarity index 100% rename from plugins/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.sys.ini rename to tjreports/plugins/privacy/tjreports/language/en-GB/en-GB.plg_privacy_tjreports.sys.ini diff --git a/plugins/privacy/tjreports/tjreports.php b/tjreports/plugins/privacy/tjreports/tjreports.php similarity index 100% rename from plugins/privacy/tjreports/tjreports.php rename to tjreports/plugins/privacy/tjreports/tjreports.php diff --git a/plugins/privacy/tjreports/tjreports.xml b/tjreports/plugins/privacy/tjreports/tjreports.xml similarity index 95% rename from plugins/privacy/tjreports/tjreports.xml rename to tjreports/plugins/privacy/tjreports/tjreports.xml index 4e15571..635f810 100644 --- a/plugins/privacy/tjreports/tjreports.xml +++ b/tjreports/plugins/privacy/tjreports/tjreports.xml @@ -2,7 +2,7 @@ plg_privacy_tjreports 1.1.0 - 24th Jun 2019 + 11th Jul 2019 Techjoomla extensions@techjoomla.com https://techjoomla.com diff --git a/plugins/user/tjreportsindexer/index.html b/tjreports/plugins/user/tjreportsindexer/index.html similarity index 100% rename from plugins/user/tjreportsindexer/index.html rename to tjreports/plugins/user/tjreportsindexer/index.html diff --git a/plugins/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.ini b/tjreports/plugins/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.ini similarity index 100% rename from plugins/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.ini rename to tjreports/plugins/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.ini diff --git a/plugins/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.sys.ini b/tjreports/plugins/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.sys.ini similarity index 100% rename from plugins/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.sys.ini rename to tjreports/plugins/user/tjreportsindexer/language/en-GB/en-GB.plg_user_tjreportsindexer.sys.ini diff --git a/tjreports/plugins/user/tjreportsindexer/sql/tjreportsindexer.install.sql b/tjreports/plugins/user/tjreportsindexer/sql/tjreportsindexer.install.sql new file mode 100755 index 0000000..4e64539 --- /dev/null +++ b/tjreports/plugins/user/tjreportsindexer/sql/tjreportsindexer.install.sql @@ -0,0 +1,3 @@ +CREATE TABLE IF NOT EXISTS `#__tjreports_com_users_user` ( + `record_id` int(11) NOT NULL +)ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/tjreports/plugins/user/tjreportsindexer/sql/updates/mysql/1.1.0.sql b/tjreports/plugins/user/tjreportsindexer/sql/updates/mysql/1.1.0.sql new file mode 100755 index 0000000..f6fe47b --- /dev/null +++ b/tjreports/plugins/user/tjreportsindexer/sql/updates/mysql/1.1.0.sql @@ -0,0 +1,3 @@ +CREATE TABLE IF NOT EXISTS `#__tjreports_com_users_user` ( + `record_id` int(11) NOT NULL, +)ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/plugins/user/tjreportsindexer/tjreportsindexer.php b/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.php similarity index 100% rename from plugins/user/tjreportsindexer/tjreportsindexer.php rename to tjreports/plugins/user/tjreportsindexer/tjreportsindexer.php diff --git a/plugins/user/tjreportsindexer/tjreportsindexer.xml b/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml similarity index 64% rename from plugins/user/tjreportsindexer/tjreportsindexer.xml rename to tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml index d899e0f..dd50538 100644 --- a/plugins/user/tjreportsindexer/tjreportsindexer.xml +++ b/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml @@ -3,16 +3,26 @@ plg_user_tjreportsindexer PLG_USER_TJREPORTSINDEXER_XML_DESCRIPTION Techjoomla - contact@techjoomla.com + extensions@techjoomla.com https://techjoomla.com - 24th May 2019 - Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + 11th Jul 2019 + Copyright (C) 2016 - 2019 Techjoomla. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL - 1.0.0 - + 1.1.0 + + + sql/tjreportsindexer.install.sql + + + + + sql/updates/mysql + + tjreportsindexer.php index.html + sql diff --git a/tjreports/tjreports.xml b/tjreports/tjreports.xml index 001c638..ec5b296 100644 --- a/tjreports/tjreports.xml +++ b/tjreports/tjreports.xml @@ -6,7 +6,7 @@ https://techjoomla.com Copyright (C) 2016 - 2019 Techjoomla. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL - 24th Jun 2019 + 11th Jul 2019 1.1.0 This component is used to access all the report at single place.