Skip to content

Commit

Permalink
🔀 Merge branch 'main' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
MatzeKitt committed Jul 1, 2023
2 parents b14cf0f + aff67d0 commit 8a76c34
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 68 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# Changelog

## 1.1.1
* Fixed: Design issue with labels of checkboxes and radio buttons

## 1.1.0
* Added: Rich text editor for labels
* Added: Option to set an email field as "reply-to" in the email notification
* Added: Preparation to fully support Form Block Pro version 1.0.0
* Improved: Displaying of values from checkboxes and radio buttons
* Improved: Design if reset and submit buttons (thanks [@zu](https://github.com/zu) for reporting)
* Fixed: Getting correc values for form field name attributes
* Improved: Design of reset and submit buttons (thanks [@zu](https://github.com/zu) for reporting)
* Fixed: Getting correct values for form field name attributes

## 1.0.2
* Fixed: Security issue regarding an CSRF (thanks [@DanielRuf](https://github.com/DanielRuf) for reporting)
Expand Down
59 changes: 0 additions & 59 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -278,62 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

rh-odin
Copyright (C) 2018 plugins

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:

Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.

{signature of Ty Coon}, 1 April 1989
Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ We usually only support the latest major version.

| Version | Supported |
| ------- | ------------------ |
| 1.0.x | :white_check_mark: |
| < 1.0 | :x: |
| 1.1.x | :white_check_mark: |
| < 1.1 | :x: |

## Reporting a Vulnerability

Expand Down
1 change: 1 addition & 0 deletions assets/style/form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
}

.form-block__label {
flex: 0 0 calc(100% - (1em + 4px));
order: 0;
}
}
Expand Down
4 changes: 2 additions & 2 deletions form-block.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Plugin Name: Form Block
Plugin URI: https://formblock.pro/en/
Description: An extensive yet user-friendly form block.
Version: 1.1.0
Version: 1.1.1
Author: Epiphyt
Author URI: https://epiph.yt
License: GPL2
Expand All @@ -43,7 +43,7 @@
// exit if ABSPATH is not defined
defined( 'ABSPATH' ) || exit;

define( 'FORM_BLOCK_VERSION', '1.1.0' );
define( 'FORM_BLOCK_VERSION', '1.1.1' );

if ( ! defined( 'EPI_FORM_BLOCK_BASE' ) ) {
define( 'EPI_FORM_BLOCK_BASE', WP_PLUGIN_DIR . '/form-block/' );
Expand Down
9 changes: 6 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Contributors: epiphyt, kittmedia
Tags: contact, form, contact form, gutenberg, block editor
Requires at least: 6.0
Stable tag: 1.1.0
Stable tag: 1.1.1
Tested up to: 6.2
Requires PHP: 7.4
License: GPL2
Expand Down Expand Up @@ -43,13 +43,16 @@ We are [Epiphyt](https://epiph.yt/), your friendly neighborhood WordPress plugin

== Changelog ==

= 1.1.1 =
* Fixed: Design issue with labels of checkboxes and radio buttons

= 1.1.0 =
* Added: Rich text editor for labels
* Added: Option to set an email field as "reply-to" in the email notification
* Added: Preparation to fully support Form Block Pro version 1.0.0
* Improved: Displaying of values from checkboxes and radio buttons
* Improved: Design if reset and submit buttons (thanks [@zu](https://github.com/zu) for reporting)
* Fixed: Getting correc values for form field name attributes
* Improved: Design of reset and submit buttons (thanks [@zu](https://github.com/zu) for reporting)
* Fixed: Getting correct values for form field name attributes

= 1.0.2 =
* Fixed: Security issue regarding an CSRF (thanks [@DanielRuf](https://github.com/DanielRuf) for reporting)
Expand Down

0 comments on commit 8a76c34

Please sign in to comment.