Skip to content

Commit

Permalink
Merge branch 'feature/2766' into develop
Browse files Browse the repository at this point in the history
* feature/2766: (95 commits)
  minor cleanups #2766
  #2766 Make Text Translatable and let the button disabled
  #2766 load tables for new job queue correctly
  correct the isRequired check #2766
  #2766 update test data to use field.isRequired
  set icon for file fields #2766
  #2766 cf2 fiel field required indicator
  #2766 tests to prove that the isRequired prop is not set correctly server-side
  tests to prove that the field group component is NOT showing a * indicator #2766
  clean up and inline docs in the CalderaFormsFieldGroup component #2766
  #2766 tests to prove that the file field does not indicate that it is required with a * and the right markup
  test to prove that new file field validation does NOT set isRequired to false by default #2766
  cleanup in the test files before adding new tests #2766
  cleanup in the test files before adding new tests #2766
  Resolve conflicts #2766
  Code change based on @Shelob9 comment ( link in description )
  #2766 more cypress tests to ensure that if file fields are not required and they have no value, you can submit the form
  Create a proper job manager for deleting transients etc. (#2802)
  Remove unnecessary unit test
  Adapt unit test for default button text #2766
  ...

# Conflicts:
#	caldera-core.php
#	clients/blocks/build/index.min.js
#	clients/blocks/build/index.min.js.map
#	clients/privacy/build/index.min.js
#	clients/privacy/build/index.min.js.map
#	clients/pro/build/index.min.js
#	clients/pro/build/index.min.js.map
#	cypress/tests.json
#	package-lock.json
#	package.json
#	tests/test-forms-api.php
  • Loading branch information
Josh Pollock committed Nov 20, 2018
2 parents b622d62 + 954c14e commit 59c199c
Show file tree
Hide file tree
Showing 744 changed files with 119,057 additions and 16,483 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ wordpress
wp-content
cypress/screenshots
cypress/videos
build
build

wp-test-case
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ module.exports = function (grunt) {
'assets/build/css/caldera-grid.min.css',
'assets/build/css/caldera-alert.min.css',
'assets/build/css/caldera-form.min.css',
'assets/build/css/fields.min.css'
'assets/build/css/fields.min.css',
'clients/render/build/style.min.css'
],
dest: 'assets/css/caldera-forms-front.css'
},
Expand Down
Empty file modified assets/build/css/admin.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/caldera-alert.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/caldera-form.min.css
100755 → 100644
Empty file.
3 changes: 1 addition & 2 deletions assets/build/css/caldera-forms-front.min.css

Large diffs are not rendered by default.

Empty file modified assets/build/css/caldera-grid.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/caldera-modals.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/caldera-table.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/cfont.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/dashicon.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/editor-grid.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/entry-viewer-2.min.css
100755 → 100644
Empty file.
60 changes: 0 additions & 60 deletions assets/build/css/fields.min.css

This file was deleted.

Empty file modified assets/build/css/fonts/caldera-forms.eot
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/caldera-forms.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/css/fonts/caldera-forms.ttf
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/caldera-forms.woff
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/cf-raty.eot
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/cf-raty.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/css/fonts/cf-raty.ttf
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/cf-raty.woff
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/cfont.eot
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/cfont.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/css/fonts/cfont.ttf
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/cfont.woff
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/icon.eot
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/icon.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/css/fonts/icon.ttf
100755 → 100644
Empty file.
Empty file modified assets/build/css/fonts/icon.woff
100755 → 100644
Empty file.
Binary file removed assets/build/css/minicolor-colors.png
Binary file not shown.
Binary file removed assets/build/css/minicolor-trigger.png
Binary file not shown.
Empty file modified assets/build/css/modals.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/processors-edit.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/remodal-default-theme.min.css
100755 → 100644
Empty file.
Empty file modified assets/build/css/remodal.min.css
100755 → 100644
Empty file.
1 change: 0 additions & 1 deletion assets/build/css/theme-default.min.css

This file was deleted.

Empty file modified assets/build/images/align-justify.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/calculator.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/caldera-globe-logo-sm.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cart-plus.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cc-amex.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cc-discover.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cc-mastercard.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cc-paypal.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cc-stripe.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cc-visa.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cf-pro-logo.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/chain.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/checkmark.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cloud-upload.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/cog.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/credit-card.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/envelope-o.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/envelope-square.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/eye.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/build/images/field.png
100755 → 100644
Empty file modified assets/build/images/folder-open-o.svg
100755 → 100644
Empty file modified assets/build/images/howto.gif
100755 → 100644
Empty file modified assets/build/images/lgo-icon.png
100755 → 100644
Empty file modified assets/build/images/list.svg
100755 → 100644
Empty file modified assets/build/images/loading.gif
100755 → 100644
Empty file modified assets/build/images/lock.svg
100755 → 100644
Empty file modified assets/build/images/mobile.svg
100755 → 100644
Empty file modified assets/build/images/new-icon.png
100755 → 100644
Empty file modified assets/build/images/paint-brush.svg
100755 → 100644
Empty file modified assets/build/images/paypal.svg
100755 → 100644
Empty file modified assets/build/images/plus.svg
100755 → 100644
Empty file modified assets/build/images/processor.png
100755 → 100644
Empty file modified assets/build/images/ra.svg
100755 → 100644
Empty file modified assets/build/images/slack.svg
100755 → 100644
Empty file modified assets/build/images/star.svg
100755 → 100644
Empty file modified assets/build/images/user.svg
100755 → 100644
Empty file modified assets/build/images/volume-control-phone.svg
100755 → 100644
Empty file modified assets/build/images/wordpress.svg
100755 → 100644
2 changes: 1 addition & 1 deletion assets/build/js/ajax-core.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified assets/build/js/api/client.min.js
100755 → 100644
Empty file.
Empty file modified assets/build/js/api/stores.min.js
100755 → 100644
Empty file.
Empty file modified assets/build/js/caldera-clippy.min.js
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions assets/build/js/caldera-forms-front.min.js

Large diffs are not rendered by default.

Empty file modified assets/build/js/caldera-modals.min.js
100755 → 100644
Empty file.
Loading

0 comments on commit 59c199c

Please sign in to comment.