Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conditions + element source improvements #10075

Merged
merged 247 commits into from
Nov 27, 2021
Merged

Conditions + element source improvements #10075

merged 247 commits into from
Nov 27, 2021

Commits on Jun 1, 2020

  1. WIP

    @lukeholder
    lukeholder committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    8287bdd View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. Merge branch 'develop' into feature/condition-builder 

    # Conflicts:
#	composer.json
#	src/config/app.php
#	src/services/Structures.php
#	src/web/assets/cp/dist/css/_main.scss
#	src/web/assets/cp/dist/css/craft.css
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.js
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
#	src/web/assets/cp/src/js/LivePreview.js
#	src/web/assets/matrixsettings/dist/MatrixConfigurator.min.js
#	src/web/assets/matrixsettings/dist/MatrixConfigurator.min.js.map
#	tests/unit/services/projectConfig/NoFixturesTest.php
    @lukeholder
    lukeholder committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    bc3b16e View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. Not used

    @lukeholder
    lukeholder committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    dd3d212 View commit details
    Browse the repository at this point in the history

  2. Complex query

    @lukeholder
    lukeholder committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    0478eb5 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2020

  1. Inital work on condition builder 

    - New condition builder asset
- Hard-coded embed of condition builder on entry index page (to be removed)
- `npm run serve` must be run on the condition builder directory to get the entry index page to render,
    @lukeholder
    lukeholder committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    7455d16 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.5' into feature/condition-builder 

    # Conflicts:
#	composer.json
#	src/config/app.php
#	src/web/assets/cp/dist/css/craft.css
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.js
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
#	src/web/assets/cp/src/css/_main.scss
#	src/web/assets/cp/src/js/LivePreview.js
#	src/web/assets/matrixsettings/dist/MatrixConfigurator.min.js
#	src/web/assets/matrixsettings/dist/MatrixConfigurator.min.js.map
    @lukeholder
    lukeholder committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    fdd83c7 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. Merge branch 'develop' into feature/condition-builder

    @lukeholder
    lukeholder committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    68fd43d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/condition-builder

    @lukeholder
    lukeholder committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    d001bcc View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2020

  1. Merge branch 'master' into feature/condition-builder

    @lukeholder
    lukeholder committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    a372ed5 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2021

  1. Merge branch '3.7' into feature/condition-builder

    @lukeholder
    lukeholder committed Jun 13, 2021
    Configuration menu
    Copy the full SHA
    88944c3 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.7' into feature/condition-builder

    @lukeholder
    lukeholder committed Jun 13, 2021
    Configuration menu
    Copy the full SHA
    0a6af3f View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2021

  1. Merge branch '4.0' into feature/condition-builder

    @lukeholder
    lukeholder committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    58284bb View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0' into feature/condition-builder

    @lukeholder
    lukeholder committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    2534f81 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2021

  1. Merge branch 'feature/condition-builder' into feature/dev-75-conditio… 

    …n-builder-framework
    @lukeholder
    lukeholder committed Aug 20, 2021
    Configuration menu
    Copy the full SHA
    0246564 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @lukeholder
    lukeholder committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    4c452ed View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @lukeholder
    lukeholder committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    7d16563 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2021

  1. WIP start of condition builder

    @lukeholder
    lukeholder committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    5df4f28 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @lukeholder
    lukeholder committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    f6aa4c2 View commit details
    Browse the repository at this point in the history

  3. Cleanup since tags

    @lukeholder
    lukeholder committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    f8cb4dd View commit details
    Browse the repository at this point in the history

  4. defineRules() cleanup + public → protected

    @lukeholder
    lukeholder committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    c797603 View commit details
    Browse the repository at this point in the history

  5. Only show query if private debug flag is turned on

    @lukeholder
    lukeholder committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    6bd371c View commit details
    Browse the repository at this point in the history

  6. Fix duplicate query debug output

    @lukeholder
    lukeholder committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    2b52e0a View commit details
    Browse the repository at this point in the history

  7. Allow UIDs to be persisted across requests

    @lukeholder
    lukeholder committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    f061232 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2021

  1. Ceanup

    @lukeholder
    lukeholder committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    2f8bb17 View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @lukeholder
    lukeholder committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    b2c32ad View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    75a5ab6 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    63de5ef View commit details
    Browse the repository at this point in the history

  3. Reformat code

    @brandonkelly
    brandonkelly committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    1b0363b View commit details
    Browse the repository at this point in the history

  4. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    335d2ea View commit details
    Browse the repository at this point in the history

  5. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    966c701 View commit details
    Browse the repository at this point in the history

  6. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    31bb1a4 View commit details
    Browse the repository at this point in the history

  7. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    a9f71a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2021

  1. Cleanup

    @brandonkelly
    brandonkelly committed Sep 4, 2021
    Configuration menu
    Copy the full SHA
    7b36706 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Sep 4, 2021
    Configuration menu
    Copy the full SHA
    9ea0491 View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Sep 4, 2021
    Configuration menu
    Copy the full SHA
    c3cc1d0 View commit details
    Browse the repository at this point in the history

  4. Couple fixes

    @brandonkelly
    brandonkelly committed Sep 4, 2021
    Configuration menu
    Copy the full SHA
    a396174 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2021

  1. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 6, 2021
    Configuration menu
    Copy the full SHA
    0d9913f View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 6, 2021
    Configuration menu
    Copy the full SHA
    6376b99 View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 6, 2021
    Configuration menu
    Copy the full SHA
    f31f805 View commit details
    Browse the repository at this point in the history

  4. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 6, 2021
    Configuration menu
    Copy the full SHA
    ce8ee7e View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2021

  1. Tweaks and cleanup 

    - Switch from handle to uid on condition object
- Cleanup phpdocs
- Remove custom namespace in for to use standard 'condition'.
    @lukeholder
    lukeholder committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    565e65d View commit details
    Browse the repository at this point in the history

  2. Fix comment

    @lukeholder
    lukeholder committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    6ad6994 View commit details
    Browse the repository at this point in the history

  3. Use UID for values

    @lukeholder
    lukeholder committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    c61138a View commit details
    Browse the repository at this point in the history

  4. Store element source settings in the project config 

    - craft\services\ElementIndexes → ElementSources
- Also includes initial work on custom sources

Resolves #8616
    @brandonkelly
    brandonkelly committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    bd8a3fd View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2021

  1. Merge branch 'feature/dev-75-condition-builder-framework' of github.c… 

    …om:pixelandtonic/cms-internal into feature/dev-75-condition-builder-framework
    @lukeholder
    lukeholder committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    c1d4d88 View commit details
    Browse the repository at this point in the history

  2. Cleanup 

    - Updated names of base condition rule classes
- Added condition builder asset
- Added sortable and htmx assets
- Added sortable js library an htmx lib to gulp builder etc
- Removed builder.twig template
- Start test file for Entry query condition
    @lukeholder
    lukeholder committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    1903a28 View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @lukeholder
    lukeholder committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    62e1cef View commit details
    Browse the repository at this point in the history

  4. Cleanup

    @lukeholder
    lukeholder committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    3ce76fb View commit details
    Browse the repository at this point in the history

  5. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    ebdfd64 View commit details
    Browse the repository at this point in the history

  6. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    d9d7031 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2021

  1. Cleanup 

    - Fix author entry condition selectize issues
- Fix value names for condition rules
    @lukeholder
    lukeholder committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    7a61689 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/dev-75-condition-builder-framework' of github.c… 

    …om:pixelandtonic/cms-internal into feature/dev-75-condition-builder-framework
    @lukeholder
    lukeholder committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    e9e409c View commit details
    Browse the repository at this point in the history

  3. Cleanup

    @lukeholder
    lukeholder committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    227a00e View commit details
    Browse the repository at this point in the history

  4. Cleanup

    @lukeholder
    lukeholder committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    a18dbef View commit details
    Browse the repository at this point in the history

  5. Added isAjax option to builder 

    - web condition controller will always set ajax to true
- added example rules in config on dashbaord
    @lukeholder
    lukeholder committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    e0c9f25 View commit details
    Browse the repository at this point in the history

  6. Addded Status condition rule 

    - Renamed Slug condition rule
    @lukeholder
    lukeholder committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    1b15c68 View commit details
    Browse the repository at this point in the history

  7. Add Trashed and Status element rules 

    - Added base lightswitch condition rule
    @lukeholder
    lukeholder committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    19e8a81 View commit details
    Browse the repository at this point in the history

  8. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    5a8bfcc View commit details
    Browse the repository at this point in the history

  9. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    ef60cdc View commit details
    Browse the repository at this point in the history

  10. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    b846f29 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2021

  1. Add new default rules for testing condition builder

    @lukeholder
    lukeholder committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    7966c40 View commit details
    Browse the repository at this point in the history

  2. Use onload again 

    - Since the builder has the the isAjax option we can use onload again
    @lukeholder
    lukeholder committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    45b4084 View commit details
    Browse the repository at this point in the history

  3. Cleanup

    @lukeholder
    lukeholder committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    9d57e48 View commit details
    Browse the repository at this point in the history

  4. Remove default rules

    @lukeholder
    lukeholder committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    28a1037 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2021

  1. Typo

    @brandonkelly
    brandonkelly committed Sep 11, 2021
    Configuration menu
    Copy the full SHA
    db2671e View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2021

  1. Merge branch 'feature/dev-75-condition-builder-framework' of github.c… 

    …om:pixelandtonic/cms-internal into feature/dev-75-condition-builder-framework
    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    167edce View commit details
    Browse the repository at this point in the history

  2. Initial work on custom sources

    @brandonkelly
    brandonkelly committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    931f555 View commit details
    Browse the repository at this point in the history

  3. WIP 

    - Add BaseQueryCondition
- Add BaseQueryConditionRule
- Related to experiment field
- added options passthrough to getHtml in rules from the builder
    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    2a03532 View commit details
    Browse the repository at this point in the history

  4. Improve logging

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    9713344 View commit details
    Browse the repository at this point in the history

  5. Not needed for now

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    a94dea5 View commit details
    Browse the repository at this point in the history

  6. Only load into header and footer for ajax requests

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    f1caaf9 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/dev-75-condition-builder-framework' of github.c… 

    …om:pixelandtonic/cms-internal into feature/dev-75-condition-builder-framework
    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    16555a7 View commit details
    Browse the repository at this point in the history

  8. isAjax true when htmx header tells us

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    f7b7f31 View commit details
    Browse the repository at this point in the history

  9. Pass the elements not the ID values

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    3121d19 View commit details
    Browse the repository at this point in the history

  10. Remove from dashboard

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    2a47b8a View commit details
    Browse the repository at this point in the history

  11. Remove isAjax HTML builder option

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    28cc8ed View commit details
    Browse the repository at this point in the history

  12. Fix head and body html naming

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    6281e73 View commit details
    Browse the repository at this point in the history

  13. Working with div on dashboard

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    08ac8ce View commit details
    Browse the repository at this point in the history

  14. Rename

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    280c06f View commit details
    Browse the repository at this point in the history

  15. Rename

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    10d2f18 View commit details
    Browse the repository at this point in the history

  16. Rename

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    ecd9f6b View commit details
    Browse the repository at this point in the history

  17. Remove for now

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    8314514 View commit details
    Browse the repository at this point in the history

  18. Need to run htmx.process on the ajax loaded html

    @lukeholder
    lukeholder committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    8491f7e View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2021

  1. Cleanup

    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    a6502b0 View commit details
    Browse the repository at this point in the history

  2. Namespaced inputs with js insertion

    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    c3fe831 View commit details
    Browse the repository at this point in the history

  3. Performance improvement and cleanup

    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    7545398 View commit details
    Browse the repository at this point in the history

  4. Not needed since we only use getConfig

    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    8f3072c View commit details
    Browse the repository at this point in the history

  5. Fix bug when adding single related to item

    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    0a2bc00 View commit details
    Browse the repository at this point in the history

  6. Not used yet

    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    a8ebfee View commit details
    Browse the repository at this point in the history

  7. Added validateCondition() to rules

    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    72c902c View commit details
    Browse the repository at this point in the history

  8. Adding Has URL condition to entry condition

    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    ce424bf View commit details
    Browse the repository at this point in the history

  9. Performance improvement 

    - Not needed as the operator doesnt affect the whole condition
    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    d68392c View commit details
    Browse the repository at this point in the history

  10. Fix has URL import

    @lukeholder
    lukeholder committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    3f46f4f View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2021

  1. Ensure that the

    @lukeholder
    lukeholder committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    23f52ee View commit details
    Browse the repository at this point in the history

  2. Ensure all inputs in container are submitted

    @lukeholder
    lukeholder committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    cb38ff9 View commit details
    Browse the repository at this point in the history

  3. Added post date and expiry date conditions 

    - Added base date range condition
    @lukeholder
    lukeholder committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    28a3fbc View commit details
    Browse the repository at this point in the history

  4. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @lukeholder
    lukeholder committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    8143ab7 View commit details
    Browse the repository at this point in the history

  5. Cleanup code

    @lukeholder
    lukeholder committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    2fe2473 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2021

  1. Not used

    @lukeholder
    lukeholder committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    9973bdf View commit details
    Browse the repository at this point in the history

  2. Default to ElementQueryCondition

    @brandonkelly
    brandonkelly committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    5078ac3 View commit details
    Browse the repository at this point in the history

  3. Bug fixes

    @brandonkelly
    brandonkelly committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    fdaac53 View commit details
    Browse the repository at this point in the history

  4. Get custom source conditions working

    @brandonkelly
    brandonkelly committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    2e846af View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @lukeholder
    lukeholder committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    2f8cf5c View commit details
    Browse the repository at this point in the history

  2. Unused cleanup

    @lukeholder
    lukeholder committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    f2c919c View commit details
    Browse the repository at this point in the history

  3. general → sliders

    @brandonkelly
    brandonkelly committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    7595cda View commit details
    Browse the repository at this point in the history

  4. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    3cf3ee6 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2021

  1. .text.clearable

    @brandonkelly
    brandonkelly committed Sep 18, 2021
    Configuration menu
    Copy the full SHA
    49a1922 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2021

  1. Cleanup

    @brandonkelly
    brandonkelly committed Sep 19, 2021
    Configuration menu
    Copy the full SHA
    b9a1864 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2021

  1. Add mainId option to builder 

    - Main ID defaults to the baseInputName converted to an ID compatible format
- Switched to load from afterOnLoad in CpHtmx.js
    @lukeholder
    lukeholder committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    17c945d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/dev-75-condition-builder-framework' of github.c… 

    …om:pixelandtonic/cms-internal into feature/dev-75-condition-builder-framework
    @lukeholder
    lukeholder committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    aea92a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Fix endtag

    @lukeholder
    lukeholder committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    d202e8a View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	src/web/assets/cp/dist/css/craft.css.map
    @brandonkelly
    brandonkelly committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    7729c58 View commit details
    Browse the repository at this point in the history

  3. Reformat code

    @brandonkelly
    brandonkelly committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    a9a57cd View commit details
    Browse the repository at this point in the history

  4. Cleanup

    @brandonkelly
    brandonkelly committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    91eec55 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2021

  1. Condition styleing improvements

    @brandonkelly
    brandonkelly committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    aaf27e5 View commit details
    Browse the repository at this point in the history

  2. Updates to condition builder 

    - Added sortable builder option (bool)
- Allow override of condition rule types with setConditionRuleTypes
- Removed ValidateConditionRule in favour or $rule::isSelectable()
    @lukeholder
    lukeholder committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    0ef39ba View commit details
    Browse the repository at this point in the history

  3. Add a couple things to the ConditionInterface

    @brandonkelly
    brandonkelly committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    a35258e View commit details
    Browse the repository at this point in the history

  4. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    c065d71 View commit details
    Browse the repository at this point in the history

  5. Cleanup

    @brandonkelly
    brandonkelly committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    9ace21a View commit details
    Browse the repository at this point in the history

  6. Add 'data-hx' and 'hx' to Html::$dataAttributes

    @brandonkelly
    brandonkelly committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    7fd791f View commit details
    Browse the repository at this point in the history

  7. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	src/web/assets/cp/dist/css/craft.css.map
    @brandonkelly
    brandonkelly committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    17d0979 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. Element index filters

    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    caa075e View commit details
    Browse the repository at this point in the history

  2. Update the filter button state when switching sources

    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    2cf5af0 View commit details
    Browse the repository at this point in the history

  3. Use HeaderCollection::has()

    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    1711679 View commit details
    Browse the repository at this point in the history

  4. Fix 7px top padding on footer when no rules

    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    30c12a8 View commit details
    Browse the repository at this point in the history

  5. Cleanup + fixes 

    - Moved inner-HTML generation to `getBuilderInnerHtml()` (fixes bug where you’d get a new container added inside the previous container after HTMX updates)
- Renamed `mainId` → `id` to be consistent with other UI components’ `id` settings
- Fixed namespacing support
    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    625eeac View commit details
    Browse the repository at this point in the history

  6. Drop references to BaseCondition

    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    71e7b65 View commit details
    Browse the repository at this point in the history

  7. Cleanup

    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    4d71204 View commit details
    Browse the repository at this point in the history

  8. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    0037ebe View commit details
    Browse the repository at this point in the history

  9. Drop baseInputName option 

    (that's what namespaces are for)
    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    85b3a84 View commit details
    Browse the repository at this point in the history

  10. Drop condition UIDs

    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    aea175b View commit details
    Browse the repository at this point in the history

  11. Fixed rule removal

    @brandonkelly
    brandonkelly committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    a36000b View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2021

  1. Cleanup

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    a91f620 View commit details
    Browse the repository at this point in the history

  2. Not necessary anymore

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    9d885b1 View commit details
    Browse the repository at this point in the history

  3. Nicer add button

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    79f3889 View commit details
    Browse the repository at this point in the history

  4. Cleanup

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    15645ad View commit details
    Browse the repository at this point in the history

  5. Use queryParams() for custom source rule exclusion too

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    61a33c6 View commit details
    Browse the repository at this point in the history

  6. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    bff3de4 View commit details
    Browse the repository at this point in the history

  7. Polish up the Related To condition rule

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    e00fe9c View commit details
    Browse the repository at this point in the history

  8. Drop StatusConditionRule 

    Element indexes already have a status filter
    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    0d10e05 View commit details
    Browse the repository at this point in the history

  9. queryParams() → exclusiveQueryParams()

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    4f505d5 View commit details
    Browse the repository at this point in the history

  10. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    bc246db View commit details
    Browse the repository at this point in the history

  11. More rule cleanup

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    94ae233 View commit details
    Browse the repository at this point in the history

  12. Fixed error when passing a string to Author Group rules

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    9278993 View commit details
    Browse the repository at this point in the history

  13. BaseMultiSelectOperatorConditionRule cleanup

    @brandonkelly
    brandonkelly committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    b4a9f6e View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2021

  1. no longer used

    @lukeholder
    lukeholder committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    aac770f View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    e9a0c05 View commit details
    Browse the repository at this point in the history

  3. Fixed new custom source creation

    @brandonkelly
    brandonkelly committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    f0d21f6 View commit details
    Browse the repository at this point in the history

  4. Drop console.log()

    @brandonkelly
    brandonkelly committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    7addd3f View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2021

  1. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    ca4b62c View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    7c6f660 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    42a7e88 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	CHANGELOG.md
#	src/base/ElementInterface.php
#	src/controllers/TemplatesController.php
#	src/db/Table.php
#	src/services/ElementIndexes.php
    @brandonkelly
    brandonkelly committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    9ba3407 View commit details
    Browse the repository at this point in the history

  3. PATH_ELEMENT_SOURCES

    @brandonkelly
    brandonkelly committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    13e3f40 View commit details
    Browse the repository at this point in the history

  4. Include elementType in RelatedToConditionRule config

    @brandonkelly
    brandonkelly committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    c82091a View commit details
    Browse the repository at this point in the history

  5. Store condition config in project config, not post data

    @brandonkelly
    brandonkelly committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    f41a6c4 View commit details
    Browse the repository at this point in the history

  6. Rebuild custom sources' conditions from ProjectConfig::rebuild()

    @brandonkelly
    brandonkelly committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    1c90556 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2021

  1. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    0dbcf05 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2021

  1. Fix slug condition rule 

    - Base Operator condition rule only has equals by default
    @lukeholder
    lukeholder committed Oct 25, 2021
    Configuration menu
    Copy the full SHA
    fde4218 View commit details
    Browse the repository at this point in the history

  2. Add base number operator confition rule

    @lukeholder
    lukeholder committed Oct 25, 2021
    Configuration menu
    Copy the full SHA
    f653c08 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2021

  1. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	lib/axios/axios.min.js
#	lib/axios/axios.min.map
#	package.json
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    9013d27 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2021

  1. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	src/web/assets/cp/dist/css/craft.css.map
    @brandonkelly
    brandonkelly committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    e5fecd6 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    de5bf6f View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    c133667 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2021

  1. Remove debug output

    @lukeholder
    lukeholder committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    442c746 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2021

  1. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework

# Conflicts:
#	package-lock.json
#	package.json
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    68a6b0f View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0-internal' into feature/dev-75-condition-builder-fra… 

    …mework
    @brandonkelly
    brandonkelly committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    1de9bcc View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. Conditions cleanup + support rule type defs w/ configs

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    4f96a91 View commit details
    Browse the repository at this point in the history

  2. Foundation for custom field rule types + PlainTextConditionRule

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    624069b View commit details
    Browse the repository at this point in the history

  3. Cleanup

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    22e6f49 View commit details
    Browse the repository at this point in the history

  4. Only preserve rule attributes when their declaring class hasn't changed

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    6996594 View commit details
    Browse the repository at this point in the history

  5. Drop condition rule UIDs

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    a49df07 View commit details
    Browse the repository at this point in the history

  6. Cleanup

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    11084fd View commit details
    Browse the repository at this point in the history

  7. Add the first rule, sorted by label

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    0a3945e View commit details
    Browse the repository at this point in the history

  8. Query conditions shouldn't be sortable by default

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    95a65e7 View commit details
    Browse the repository at this point in the history

  9. singleUseTypes builder options + enable it for query conditions by de… 

    …fault
    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    8683b90 View commit details
    Browse the repository at this point in the history

  10. Fix PHP error

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    8cae58a View commit details
    Browse the repository at this point in the history

  11. Revert "Drop condition rule UIDs" 

    This reverts commit a49df07.

Turns out UIDs were needed for removing rules
    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    5960b6d View commit details
    Browse the repository at this point in the history

  12. Cleanup

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    466dd1c View commit details
    Browse the repository at this point in the history

  13. Oops

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    cb92490 View commit details
    Browse the repository at this point in the history

  14. getConditionRules() now returns an array

    @brandonkelly
    brandonkelly committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    852602f View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2021

  1. Cleanup

    @brandonkelly
    brandonkelly committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    3f3206d View commit details
    Browse the repository at this point in the history

  2. supportsProjectConfig() + projectConfigTypes builder option

    @brandonkelly
    brandonkelly committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    b1d30c5 View commit details
    Browse the repository at this point in the history

  3. Fixed tests

    @brandonkelly
    brandonkelly committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    b5f3063 View commit details
    Browse the repository at this point in the history

  4. Fixed test

    @brandonkelly
    brandonkelly committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    dfc591d View commit details
    Browse the repository at this point in the history

  5. Fixed bug

    @brandonkelly
    brandonkelly committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    21a9462 View commit details
    Browse the repository at this point in the history

  6. Don't re-render text rules when edited

    @brandonkelly
    brandonkelly committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    d98573d View commit details
    Browse the repository at this point in the history

  7. Only add sortable class for sortable conditions

    @brandonkelly
    brandonkelly committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    b7e68d6 View commit details
    Browse the repository at this point in the history

  8. var → let/const

    @brandonkelly
    brandonkelly committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    a153fd1 View commit details
    Browse the repository at this point in the history

  9. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	src/migrations/Install.php
#	src/migrations/m210624_235115_json_columns.php
#	src/services/ElementIndexes.php
    @brandonkelly
    brandonkelly committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    5978c80 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2021

  1. Sortable.js → Garnish.DragSort

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    a4a2c7f View commit details
    Browse the repository at this point in the history

  2. PlainTextConditionRule → TextFieldConditionRule

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    d73e533 View commit details
    Browse the repository at this point in the history

  3. overflow: visible for element filter HUDs

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    74bde07 View commit details
    Browse the repository at this point in the history

  4. Allow getQueryConditionRuleType() to return an array

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    0024db6 View commit details
    Browse the repository at this point in the history

  5. Flesh out remaining field type condition rules

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    0c63984 View commit details
    Browse the repository at this point in the history

  6. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    122ff4b View commit details
    Browse the repository at this point in the history

  7. Swap modifyQuery() and defaultBuilderOptions()

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    6063bbf View commit details
    Browse the repository at this point in the history

  8. getSelectableConditionRules() + isConditionRuleSelectable() 

    Lets the condition class decide which instantiated rules should be selectable.

Now BaseQueryCondition can choose whether to make rules selectable based on their exclusive query params, rather than forcing all rules to be single-use. So now it's possible to have multiple RelatedTo rules, etc.
    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    8c8c2f1 View commit details
    Browse the repository at this point in the history

  9. Full-width text rules

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    e89a320 View commit details
    Browse the repository at this point in the history

  10. Drop setConditionRuleTypes() 

    No longer needed now that BaseQueryCondiiton is doing its own selectable rule filtering
    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    6967471 View commit details
    Browse the repository at this point in the history

  11. Cleanup

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    4f5f98b View commit details
    Browse the repository at this point in the history

  12. Make HasUrl available to all elmeent types w/ URLs

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    7daa5d7 View commit details
    Browse the repository at this point in the history

  13. Don’t call _validValues() until we need to 

    Avoids a PHP error if options() is expecting all properties to be initialized already
    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    f68bbec View commit details
    Browse the repository at this point in the history

  14. getConfig() after defineRules()

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    53872b1 View commit details
    Browse the repository at this point in the history

  15. Preserve the whole condition config, not just its class

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    f9e3e48 View commit details
    Browse the repository at this point in the history

  16. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    d264759 View commit details
    Browse the repository at this point in the history

  17. Cleanup

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    c158b68 View commit details
    Browse the repository at this point in the history

  18. Delete m210624_235115_json_columns

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    d230bcf View commit details
    Browse the repository at this point in the history

  19. Set condition rules last 

    Some available condition rules may only be available depending on the rest of the config
    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    b1c961e View commit details
    Browse the repository at this point in the history

  20. Just log a warning if a condition rule isn't valid

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    d5f9eb4 View commit details
    Browse the repository at this point in the history

  21. Trashed is already covered by the status menu

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    102f659 View commit details
    Browse the repository at this point in the history

  22. Date, ID, and URI condition rules

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    5689de9 View commit details
    Browse the repository at this point in the history

  23. Undefined

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    2ce24c4 View commit details
    Browse the repository at this point in the history

  24. Entry → Entry Type

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    ee8021c View commit details
    Browse the repository at this point in the history

  25. BaseElementSelectConditionRule

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    37fa912 View commit details
    Browse the repository at this point in the history

  26. Sort lines

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    c3bd543 View commit details
    Browse the repository at this point in the history

  27. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	CHANGELOG.md
    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    891b607 View commit details
    Browse the repository at this point in the history

  28. Author entry condiiton rule

    @brandonkelly
    brandonkelly committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    d30ddd6 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    a232f53 View commit details
    Browse the repository at this point in the history

  2. AssetQueryCondition + rules

    @brandonkelly
    brandonkelly committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    a058900 View commit details
    Browse the repository at this point in the history

  3. A

    @brandonkelly
    brandonkelly committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    72a6eaf View commit details
    Browse the repository at this point in the history

  4. CategoryQueryCondition + group rule

    @brandonkelly
    brandonkelly committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    b72f395 View commit details
    Browse the repository at this point in the history

  5. TagQueryCondition + group rule

    @brandonkelly
    brandonkelly committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    ca97921 View commit details
    Browse the repository at this point in the history

  6. Pluralize the element condition namespaces

    @brandonkelly
    brandonkelly committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    9fdb331 View commit details
    Browse the repository at this point in the history

  7. Set lightswitch rules to “on” by default

    @brandonkelly
    brandonkelly committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    9976516 View commit details
    Browse the repository at this point in the history

  8. UserQueryCondition + rules

    @brandonkelly
    brandonkelly committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    352e809 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    4e51d58 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    83ce1a9 View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	CHANGELOG.md
    @brandonkelly
    brandonkelly committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    b4ffee4 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2021

  1. User Groups setting for custom sources

    @brandonkelly
    brandonkelly committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    ae825be View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	src/web/assets/cp/dist/css/craft.css.map
    @brandonkelly
    brandonkelly committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    7d799b6 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	gulpfile.js
#	package.json
#	src/web/assets/cp/dist/css/craft.css
#	src/web/assets/cp/dist/css/craft.css.map
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/cp/dist/js/Craft.min.js.map
    @brandonkelly
    brandonkelly committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    e52bfda View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	src/web/assets/cp/dist/js/Craft.min.js
    @brandonkelly
    brandonkelly committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    64e7cc9 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    bb7f3fc View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @brandonkelly
    brandonkelly committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    5e47bde View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    2c306e1 View commit details
    Browse the repository at this point in the history

  4. Ignore htmx:load events for the body element

    @brandonkelly
    brandonkelly committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    672fdaf View commit details
    Browse the repository at this point in the history

  5. Accessibility improvements

    @brandonkelly
    brandonkelly committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    5fd691b View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework

    @brandonkelly
    brandonkelly committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    9c49a33 View commit details
    Browse the repository at this point in the history

  2. Drop the gulpfile

    @brandonkelly
    brandonkelly committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    cb031c2 View commit details
    Browse the repository at this point in the history

  3. Update translations

    @brandonkelly
    brandonkelly committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    4263b43 View commit details
    Browse the repository at this point in the history

  4. Htmx asset bundle cleanup

    @brandonkelly
    brandonkelly committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    8d76e79 View commit details
    Browse the repository at this point in the history

  5. Update the changelog

    @brandonkelly
    brandonkelly committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    bbe9ec0 View commit details
    Browse the repository at this point in the history

  6. Fixed testCanAddRules

    @brandonkelly
    brandonkelly committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    e308b76 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2021

  1. Merge branch '4.0' into feature/dev-75-condition-builder-framework 

    # Conflicts:
#	package-lock.json
#	package.json
#	src/web/assets/cp/dist/css/cp.css
#	src/web/assets/cp/dist/js/Craft.min.js
#	src/web/assets/craftsupport/dist/CraftSupportWidget.js
#	src/web/assets/dashboard/dist/Dashboard.js
#	src/web/assets/deprecationerrors/dist/deprecator.js
#	src/web/assets/edituser/dist/AccountSettingsForm.js
#	src/web/assets/edituser/dist/profile.js
#	src/web/assets/generalsettings/dist/rebrand.js
#	src/web/assets/graphiql/dist/graphiql.js
#	src/web/assets/installer/dist/install.js
#	src/web/assets/login/dist/login.js
#	src/web/assets/plugins/dist/PluginManager.js
#	src/web/assets/pluginstoreoauth/dist/PluginStoreOauthCallback.js
#	src/web/assets/routes/dist/routes.js
#	src/web/assets/systemmessages/dist/system_messages.js
#	src/web/assets/updater/dist/Updater.js
#	src/web/assets/updates/dist/UpdatesUtility.js
#	src/web/assets/userpermissions/dist/UserPermissions.js
    @brandonkelly
    brandonkelly committed Nov 26, 2021
    Configuration menu
    Copy the full SHA
    b59fd22 View commit details
    Browse the repository at this point in the history

  2. Accessibility improvements

    @brandonkelly
    brandonkelly committed Nov 26, 2021
    Configuration menu
    Copy the full SHA
    57eb55b View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2021

  1. Condition rule accessibily improvements / cleanup

    @brandonkelly
    brandonkelly committed Nov 27, 2021
    Configuration menu
    Copy the full SHA
    97ba8f9 View commit details
    Browse the repository at this point in the history