Skip to content

Commit

Permalink
Merge pull request #45 from techjoomla/release-1.0.2
Browse files Browse the repository at this point in the history
Merge `Release 1.0.2` into `master`
  • Loading branch information
manojLondhe authored Oct 22, 2019
2 parents c560215 + 571574e commit eb25917
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
8 changes: 2 additions & 6 deletions src/activitystream.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.0" method="upgrade">
<name>com_activitystream</name>
<!-- The following elements are optional and free of formatting constraints -->
<creationDate>8th Feb 2019</creationDate>
<creationDate>22nd Oct 2019</creationDate>
<author>Techjoomla</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<!-- The version string is recorded in the components table -->
<version>1.0.1</version>

<!-- The description is optional and defaults to the name -->
<version>1.0.2</version>
<description>COM_ACTIVITYSTREAM_DESCRIPTION</description>
<scriptfile>script.activitystream.php</scriptfile>
<install>
Expand Down
10 changes: 4 additions & 6 deletions src/admin/sql/install.mysql.utf8.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE TABLE IF NOT EXISTS `#__tj_activities` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`id` INT(11) NOT NULL AUTO_INCREMENT,
`actor` text(900),
`actor_id` text(900),
`object` text(900),
Expand All @@ -8,9 +8,9 @@ CREATE TABLE IF NOT EXISTS `#__tj_activities` (
`target_id` text(900),
`type` text(900),
`client` varchar(20),
`template` text(900),
`template` text,
`default_theme` varchar(20),
`formatted_text` text(900),
`formatted_text` text,
`access` tinyint(2) DEFAULT 1,
`state` tinyint(2) DEFAULT 1,
`location` text(900),
Expand All @@ -19,6 +19,4 @@ CREATE TABLE IF NOT EXISTS `#__tj_activities` (
`created_date` datetime DEFAULT NULL,
`updated_date` datetime DEFAULT NULL,
PRIMARY KEY (`id`)
)
DEFAULT CHARSET =utf8 AUTO_INCREMENT =1;

) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
3 changes: 3 additions & 0 deletions src/admin/sql/updates/mysql/1.0.2.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ALTER TABLE `#__tj_activities` MODIFY `template` text;
ALTER TABLE `#__tj_activities` MODIFY `formatted_text` text;
ALTER TABLE `#__tj_activities` ENGINE = InnoDB;

0 comments on commit eb25917

Please sign in to comment.