Stable release of v2.0.2

Adds missing Marked JS file.
This commit is contained in:
Robot 2023-07-26 12:07:55 +02:00
parent 9d707d1800
commit cc1678dc49
Signed by: Robot
GPG Key ID: 14DECD44E7E1BB95
13 changed files with 78 additions and 21 deletions

View File

@ -9,3 +9,7 @@
- New Notes system - New Notes system
- New Search system - New Search system
- Integration with OpenAI - Integration with OpenAI
# v2.0.2
- Adds missing Marked JS file

View File

@ -1,4 +1,4 @@
# Get Bible (2.0.1) # Get Bible (2.0.2)
![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible") ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible")
@ -19,7 +19,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Name*: [Get Bible](https://getbible.net) + *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015 + *First Build*: 3rd December, 2015
+ *Last Build*: 26th July, 2023 + *Last Build*: 26th July, 2023
+ *Version*: 2.0.1 + *Version*: 2.0.2
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@ -31,8 +31,8 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.) > never making one mistake or taking any coffee break.)
+ *Line count*: **189808** + *Line count*: **189871**
+ *File count*: **1660** + *File count*: **1662**
+ *Folder count*: **161** + *Folder count*: **161**
**349 Hours** or **44 Eight Hour Days** (the actual time the author spent) **349 Hours** or **44 Eight Hour Days** (the actual time the author spent)

View File

@ -1,4 +1,4 @@
# Get Bible (2.0.1) # Get Bible (2.0.2)
![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible") ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible")
@ -19,7 +19,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Name*: [Get Bible](https://getbible.net) + *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015 + *First Build*: 3rd December, 2015
+ *Last Build*: 26th July, 2023 + *Last Build*: 26th July, 2023
+ *Version*: 2.0.1 + *Version*: 2.0.2
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@ -31,8 +31,8 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.) > never making one mistake or taking any coffee break.)
+ *Line count*: **189808** + *Line count*: **189871**
+ *File count*: **1660** + *File count*: **1662**
+ *Folder count*: **161** + *Folder count*: **161**
**349 Hours** or **44 Eight Hour Days** (the actual time the author spent) **349 Hours** or **44 Eight Hour Days** (the actual time the author spent)

View File

@ -47,6 +47,22 @@
/> />
<field type="spacer" name="spacerHistory" hr="true" /> <field type="spacer" name="spacerHistory" hr="true" />
<!-- Gitea_token Field. Type: Password. (joomla) -->
<field
type="password"
name="gitea_token"
label="COM_GETBIBLE_CONFIG_GITEA_TOKEN_LABEL"
size="128"
description="COM_GETBIBLE_CONFIG_GITEA_TOKEN_DESCRIPTION"
message="Error! Please add token here."
class="text_area"
readonly="false"
disabled="false"
required="false"
filter="STRING"
hint="COM_GETBIBLE_CONFIG_GITEA_TOKEN_HINT"
autocomplete="off"
/>
<!-- Show_install_button Field. Type: Radio. (joomla) --> <!-- Show_install_button Field. Type: Radio. (joomla) -->
<field <field
type="radio" type="radio"

View File

@ -263,6 +263,9 @@ COM_GETBIBLE_CONFIG_ENABLE_OPEN_AI_ORG_LABEL="Enable Organisation Openai"
COM_GETBIBLE_CONFIG_EXACT_MATCH="Exact Match" COM_GETBIBLE_CONFIG_EXACT_MATCH="Exact Match"
COM_GETBIBLE_CONFIG_EXACT_PHRASE="Exact Phrase" COM_GETBIBLE_CONFIG_EXACT_PHRASE="Exact Phrase"
COM_GETBIBLE_CONFIG_FORCE_LOAD="Force" COM_GETBIBLE_CONFIG_FORCE_LOAD="Force"
COM_GETBIBLE_CONFIG_GITEA_TOKEN_DESCRIPTION="To get updates, add your access token from VDM here."
COM_GETBIBLE_CONFIG_GITEA_TOKEN_HINT="API Access Tokens"
COM_GETBIBLE_CONFIG_GITEA_TOKEN_LABEL="VDM Access Token<br /><small>Get <a href='https://git.vdm.dev/user/settings/applications' target='_blank'>token</a> from VDM.</small>"
COM_GETBIBLE_CONFIG_GLOBAL_DESC="The Global Parameters" COM_GETBIBLE_CONFIG_GLOBAL_DESC="The Global Parameters"
COM_GETBIBLE_CONFIG_GLOBAL_LABEL="Global" COM_GETBIBLE_CONFIG_GLOBAL_LABEL="Global"
COM_GETBIBLE_CONFIG_GPT35TURBO="gpt-3.5-turbo" COM_GETBIBLE_CONFIG_GPT35TURBO="gpt-3.5-turbo"

View File

@ -102,7 +102,7 @@ class GetbibleModelAjax extends ListModel
public function getVersion($version = null) public function getVersion($version = null)
{ {
// get the token if set // get the token if set
$token = $this->app_params->get('gitea_token', false); $token = $this->app_params->get('gitea_token');
// only add if token is set // only add if token is set
if ($token) if ($token)
@ -204,8 +204,11 @@ class GetbibleModelAjax extends ListModel
{ {
try try
{ {
// get the token if set
$token = $this->app_params->get('gitea_token');
// load the API details // load the API details
// Factory::_('Gitea.Repository.Wiki')->load_('https://git.vdm.dev', ''); Factory::_('Gitea.Repository.Wiki')->load_('https://git.vdm.dev', $token);
// get the gitea wiki page im markdown // get the gitea wiki page im markdown
$wiki = Factory::_('Gitea.Repository.Wiki')->get('getBible', 'joomla-component', $name); $wiki = Factory::_('Gitea.Repository.Wiki')->get('getBible', 'joomla-component', $name);

View File

@ -0,0 +1 @@

View File

@ -7,9 +7,9 @@
<authorUrl>https://getbible.net</authorUrl> <authorUrl>https://getbible.net</authorUrl>
<copyright>Copyright (C) 2015. All Rights Reserved</copyright> <copyright>Copyright (C) 2015. All Rights Reserved</copyright>
<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license> <license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
<version>2.0.1</version> <version>2.0.2</version>
<description><![CDATA[ <description><![CDATA[
<h1>Get Bible (v.2.0.1)</h1> <h1>Get Bible (v.2.0.2)</h1>
<div style="clear: both;"></div> <div style="clear: both;"></div>
<p>Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide. <p>Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide.

View File

@ -67,17 +67,24 @@ abstract class Api
/** /**
* Load/Reload API. * Load/Reload API.
* *
* @param string $url The url. * @param string|null $url The url.
* @param token $token The token. * @param token|null $token The token.
* *
* @return void * @return void
* @since 3.2.0 * @since 3.2.0
**/ **/
public function load_(string $url, string $token) public function load_(?string $url = null, ?string $token = null)
{
if ($url !== null)
{ {
$this->uri->setUrl($url); $this->uri->setUrl($url);
}
if ($token !== null)
{
$this->http->setToken($token); $this->http->setToken($token);
} }
}
} }

View File

@ -831,6 +831,5 @@ class Repository implements ServiceProviderInterface
$container->get('Gitea.Utilities.Response') $container->get('Gitea.Utilities.Response')
); );
} }
} }

6
media/js/marked.js Normal file

File diff suppressed because one or more lines are too long

View File

@ -1539,7 +1539,7 @@ class com_getbibleInstallerScript
echo '<a target="_blank" href="https://getbible.net" title="Get Bible"> echo '<a target="_blank" href="https://getbible.net" title="Get Bible">
<img src="components/com_getbible/assets/images/vdm-component.jpg"/> <img src="components/com_getbible/assets/images/vdm-component.jpg"/>
</a> </a>
<h3>Upgrade to Version 2.0.1 Was Successful! Let us know if anything is not working as expected.</h3>'; <h3>Upgrade to Version 2.0.2 Was Successful! Let us know if anything is not working as expected.</h3>';
// Set db if not set already. // Set db if not set already.
if (!isset($db)) if (!isset($db))

View File

@ -17,4 +17,22 @@
<maintainerurl>https://getbible.net</maintainerurl> <maintainerurl>https://getbible.net</maintainerurl>
<targetplatform name="joomla" version="3.*"/> <targetplatform name="joomla" version="3.*"/>
</update> </update>
<update>
<name>Get Bible</name>
<description>The Bible for Joomla</description>
<element>pkg_getbible</element>
<type>component</type>
<client>site</client>
<version>2.0.2</version>
<infourl title="Get Bible!">https://getbible.net</infourl>
<downloads>
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v2.0.2.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
</tags>
<maintainer>Llewellyn van der Merwe</maintainer>
<maintainerurl>https://getbible.net</maintainerurl>
<targetplatform name="joomla" version="3.*"/>
</update>
</updates> </updates>