Skip to content

Conversation

@stephywells
Copy link
Contributor

How about a final review and release?

add toggle switch css
add include_fields and exclude_fields to frm-show-entry shortcode
# Conflicts:
#	css/_single_theme.css.php
#	css/custom_theme.css.php
# Conflicts:
#	classes/helpers/FrmAppHelper.php
#	formidable.php
work on scale fields Strategy11/formidable-pro#1446
fix issue when select field moves when changing between blank and not blank
It can be added back in when we're ready
# Conflicts:
#	classes/helpers/FrmAppHelper.php
#	formidable.php
# Conflicts:
#	classes/controllers/FrmEntriesController.php
#	classes/controllers/FrmFieldsController.php
#	classes/controllers/FrmFormsController.php
#	classes/controllers/FrmHooksController.php
#	classes/models/FrmEntryFormat.php
#	classes/models/FrmNotification.php
@stephywells stephywells merged commit 10e837b into master Jan 20, 2017
@jwahlin jwahlin deleted the uploads branch May 16, 2017 22:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants