8000 Merge `Release 2.5.1` into `master` by manojLondhe · Pull Request #110 · techjoomla/com_api · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merge Release 2.5.1 into master #110

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Oct 22, 2019
Merged

Merge Release 2.5.1 into master #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b54593
Merge `master` into `Release 2.5.1` (#105)
manojLondhe Jul 3, 2019
2391c2d
Task #108 chore: Change the charset of tables
Jul 18, 2019
5b3ba7a
Update 2.5.1.sql
manojLondhe Oct 22, 2019
c7fe242
Task #108 chore: Change the charset of tables (#109)
manojLondhe Oct 22, 2019
5ca8889
Task #108 chore: Change version, date
manojLondhe Oct 22, 2019
File filter

Filter by extension

Filter by extension
10000
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions build/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
{
"com_api": {
"2.5.2": {
"com_api": {
"version": "2.5.2",
"repoUrl": "git@github.com:techjoomla/com_api.git",
"branch": "release-2.5.2"
}
},
"2.5.1": {
"com_api": {
"version": "2.5.1",
"repoUrl": "git@github.com:techjoomla/com_api.git",
"branch": "release-2.5.1"
}
},
"2.5.0": {
"com_api": {
"version": "2.5.0",
Expand Down
4 changes: 2 additions & 2 deletions code/admin/sql/install.mysql.utf8.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `#__api_keys` (
`last_used` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`per_hour` int(10) NOT NULL,
PRIMARY KEY (`id`)
) DEFAULT CHARSET=utf8;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;


CREATE TABLE IF NOT EXISTS `#__api_logs` (
Expand All @@ -22,4 +22,4 @@ CREATE TABLE IF NOT EXISTS `#__api_logs` (
`request` varchar(255) NOT NULL,
`post_data` text NOT NULL,
PRIMARY KEY (`id`)
) DEFAULT CHARSET=utf8;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
2 changes: 2 additions & 0 deletions code/admin/sql/updates/mysql/2.5.1.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `#__api_keys` ENGINE = InnoDB;
ALTER TABLE `#__api_logs` ENGINE = InnoDB;
4 changes: 2 additions & 2 deletions code/api.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.0" method="upgrade">
<name>com_api</name>
<creationDate>2nd Jul 2019</creationDate>
<creationDate>22nd Oct 2019</creationDate>
<copyright>Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.</copyright>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<author>Techjoomla</author>
<authorEmail>extensions@techjoomla.com</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
<version>2.5.0</version>
<version>2.5.1</version>
<description>Multi-purpose REST API framework for Joomla</description>
<install>
<!-- Runs on install -->
Expand Down
4 changes: 2 additions & 2 deletions code/plugins/authentication/tjapi/tjapi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<author>Techjoomla</author>
<authorEmail>extensions@techjoomla.com</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
<creationDate>2nd Jul 2019</creationDate>
<creationDate>22nd Oct 2019</creationDate>
<copyright>Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.</copyright>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.5.0</version>
<version>2.5.1</version>

<files>
<filename plugin="tjapi">tjapi.php</filename>
Expand Down
4 changes: 2 additions & 2 deletions code/plugins/system/tjtokenlogin/tjtokenlogin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<author>Techjoomla</author>
<authorEmail>extensions@techjoomla.com</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
<creationDate>2nd Jul 2019</creationDate>
<creationDate>22nd Oct 2019</creationDate>
<copyright>Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.</copyright>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.5.0</version>
<version>2.5.1</version>

<files>
<filename plugin="tjtokenlogin">tjtokenlogin.php</filename>
Expand Down
2 changes: 1 addition & 1 deletion scripts/jenkins-pipelines/nightly.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// Get / Set release name
// TODO - remove hardcoded value
def apiVersion = '2.5.0' //env.getProperty("apiVersion")
def apiVersion = '2.5.2' //env.getProperty("apiVersion")
echo apiVersion

pipeline {
Expand Down
0