Skip to content
Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
tecpromotion committed Jul 17, 2018
2 parents ac217d2 + af0f5ee commit 130fdfd361ed8ea2931bc310f482587999d1b7db
@@ -20,9 +20,12 @@ No rocket science required - just install it using the normal Joomla installer.
- Niels Nübel @niels_nuebel
- Stefan Wendhausen @inwend

### Copyright
2018 Kicktemp UG (haftungsbeschraenkt)

### Licence
GNU GENERAL PUBLIC LICENSE V3

### Feel free to support the Project
Buy me a Beer by [paypal.me/NielsNuebel](https://www.paypal.me/NielsNuebel/)
Buy us a Beer by [paypal.me/kicktemp](https://www.paypal.me/kicktemp/)

@@ -2,8 +2,8 @@
/**
* @package Joomla.Plugin
* @subpackage System.kickgdpr
* @author Niels Nübel <niels@niels-nuebel.de>
* @copyright 2018 Niels Nübel
* @author Niels Nübel <niels@kicktemp.com>
* @copyright 2018 Kicktemp UG (haftungsbeschraenkt)
* @license GNU/GPLv3 <http://www.gnu.org/licenses/gpl-3.0.de.html>
* @link https://kicktemp.com
*/
@@ -15,14 +15,15 @@
/**
* Form Field class for Kubik-Rubik Joomla! Extensions.
* Provides a donation code check.
* credits Viktor Vogel
*/
class JFormFieldKickDonation extends JFormField
{
protected $type = 'kickdonation';
protected function getInput()
{
$html = '<a class="btn btn-success" href="https://www.paypal.me/NielsNuebel/5" target="_blank"><span class="icon-smiley-2 icon-white" aria-hidden="true"></span> 5 €</a> <a class="btn btn-success" href="https://www.paypal.me/NielsNuebel/10" target="_blank"><span class="icon-thumbs-up icon-white" aria-hidden="true"></span> 10 €</a> <a class="btn btn-success" href="https://www.paypal.me/NielsNuebel/" target="_blank"><span class="icon-star icon-white" aria-hidden="true"></span> # €</a>';
$html = '<a class="btn btn-success" href="https://www.paypal.me/kicktemp/5" target="_blank"><span class="icon-smiley-2 icon-white" aria-hidden="true"></span> 5 €</a> <a class="btn btn-success" href="https://www.paypal.me/kicktemp/10" target="_blank"><span class="icon-thumbs-up icon-white" aria-hidden="true"></span> 10 €</a> <a class="btn btn-success" href="https://www.paypal.me/kicktemp/" target="_blank"><span class="icon-star icon-white" aria-hidden="true"></span> # €</a>';
return $html;
}
@@ -2,8 +2,8 @@
/**
* @package Joomla.Plugin
* @subpackage System.kickgdpr
* @author Niels Nübel <niels@niels-nuebel.de>
* @copyright 2018 Niels Nübel
* @author Niels Nübel <niels@kicktemp.com>
* @copyright 2018 Kicktemp UG (haftungsbeschraenkt)
* @license GNU/GPLv3 <http://www.gnu.org/licenses/gpl-3.0.de.html>
* @link https://kicktemp.com
*/
@@ -2,12 +2,12 @@
<extension version="3.4" type="plugin" group="system" method="upgrade">
<name>plg_system_kickgdpr</name>
<author>Niels Nübel</author>
<creationDate>May 2018</creationDate>
<copyright>(c) 2009 - 2018 Kicktemp. All rights reserved.</copyright>
<creationDate>June 2018</creationDate>
<copyright>(c) 2018 Kicktemp UG (haftungsbeschraenkt). All rights reserved.</copyright>
<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
<authorEmail>info@kicktemp.com</authorEmail>
<authorUrl>www.kicktemp.com</authorUrl>
<version>2.3.2</version>
<version>2.4.0</version>
<description>PLG_SYSTEM_KICKGDPR_XML_DESCRIPTION</description>
<files>
<folder>language</folder>
@@ -320,7 +320,7 @@
</config>
<updateservers>
<server type="extension" priority="1" name="PLG_CONTENT_KICKGDPR">
https://raw.githubusercontent.com/nielsnuebel/kickgdpr/master/update.xml
https://raw.githubusercontent.com/kicktemp/kickgdpr/master/update.xml
</server>
</updateservers>
</extension>
@@ -1,2 +1,2 @@
PLG_SYSTEM_KICKGDPR="System - Kick GDPR / DSGVO"
PLG_SYSTEM_KICKGDPR_XML_DESCRIPTION="Cookie-Hinweis Plugin basierend auf der Cookie-Consent Lösung zur datenschutzkonformen Cookie-Nutzung inkl. Google Analytics Integration.<br /><br />Du willst das Projekt unterstützen? <a href="_QQ_"https://www.paypal.me/NielsNuebel/"_QQ_" target="_QQ_"_blank"_QQ_">paypal.me/NielsNuebel</a>"
PLG_SYSTEM_KICKGDPR="System - Kick GDPR / DSGVO Cookie-Plugin"
PLG_SYSTEM_KICKGDPR_XML_DESCRIPTION="Cookie-Hinweis Plugin basierend auf der Cookie-Consent Lösung zur datenschutzkonformen Cookie-Nutzung inkl. Google Analytics Integration.<br /><br />Du willst das Projekt unterstützen? <a href="_QQ_"https://www.paypal.me/kicktemp/"_QQ_" target="_QQ_"_blank"_QQ_">paypal.me/kicktemp</a>"
@@ -1,2 +1,2 @@
PLG_SYSTEM_KICKGDPR="System - Kick GDPR"
PLG_SYSTEM_KICKGDPR_XML_DESCRIPTION="Cookie hint plugin based on Cookie Consent. Integrates Google Analytics the easy way.<br /><br />Support the project? Buy me a Beer by <a href="_QQ_"https://www.paypal.me/NielsNuebel/"_QQ_" target="_QQ_"_blank"_QQ_">paypal.me/NielsNuebel</a>"
PLG_SYSTEM_KICKGDPR="System - Kick GDPR Cookie-Plugin"
PLG_SYSTEM_KICKGDPR_XML_DESCRIPTION="Cookie hint plugin based on Cookie Consent. Integrates Google Analytics the easy way.<br /><br />Support the project? Buy me a Beer by <a href="_QQ_"https://www.paypal.me/kicktemp/"_QQ_" target="_QQ_"_blank"_QQ_">paypal.me/kicktemp</a>"
@@ -2,8 +2,8 @@
/**
* @package Joomla.Plugin
* @subpackage System.kickgdpr
* @author Niels Nübel <niels@niels-nuebel.de>
* @copyright 2018 Niels Nübel
* @author Niels Nübel <niels@kicktemp.com>
* @copyright 2018 Kicktemp UG (haftungsbeschraenkt)
* @license GNU/GPLv3 <http://www.gnu.org/licenses/gpl-3.0.de.html>
* @link https://kicktemp.com
*/
@@ -1,5 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<updates>
<update>
<version>2.4.0</version>
<name>System - KickGDPR</name>
<description>KickGDPR Plugin</description>
<element>kickgdpr</element>
<type>plugin</type>
<folder>system</folder>
<client>0</client>
<infourl title="KickGDPR Plugin">https://github.com/kicktemp/kickgdpr/</infourl>

<downloads>
<downloadurl type="full" format="zip">https://github.com/kicktemp/kickgdpr/archive/2.4.0.zip</downloadurl>
</downloads>

<tags>
<tag>stable</tag>
</tags>

<section>updates</section>
<maintainer>Kicktemp UG (haftungsbeschraenkt)</maintainer>
<maintainerurl>https://www.kicktemp.com</maintainerurl>

<php_minimum>7.0.0</php_minimum>
<targetplatform name="joomla" version="3.[89]"/>
</update>
<update>
<version>2.3.2</version>
<name>System - KickGDPR</name>

0 comments on commit 130fdfd

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.