Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PrestaSafe/prettyblocks
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: PrestaSafe/prettyblocks
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 16 commits
  • 58 files changed
  • 2 contributors

Commits on Oct 15, 2024

  1. ✨ Connected Employee 

    Employee connected - Alert message when more than one employee is in edit mode in the backoffice
    @aaraujoaxome
    aaraujoaxome committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    21dfd6f View commit details
    Browse the repository at this point in the history

  2. 🐛 Forgot main.js

    @aaraujoaxome
    aaraujoaxome committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    8649bd6 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. 🐛 Fix table name prettyblocks_connected_employee

    @aaraujoaxome
    aaraujoaxome committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    dc7f779 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Add some fixes 

    Fix bad URL 'PrettyBlocks'
Fix JavaScript error
Add Translate message with PrettyBlocks API
Remove FrontController (increase security)
Fix cleanData on update method
add backend Route
    @PrestaSafe
    PrestaSafe committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    d839156 View commit details
    Browse the repository at this point in the history

  2. php-cs-fixer + autoindex

    @PrestaSafe
    PrestaSafe committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    0da5b10 View commit details
    Browse the repository at this point in the history

  3. remove unused var

    @PrestaSafe
    PrestaSafe committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    778a51d View commit details
    Browse the repository at this point in the history

  4. add upgrade and autocreate db if wrong upgrade

    @PrestaSafe
    PrestaSafe committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    2191bd6 View commit details
    Browse the repository at this point in the history

  5. add translations

    @PrestaSafe
    PrestaSafe committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    3492d0a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #269 from PrestaSafe/pr/268-fixes-optimise 

    Pr/268 fixes optimise
    @PrestaSafe
    PrestaSafe authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    e6d4ea7 View commit details
    Browse the repository at this point in the history

  7. add update version

    @PrestaSafe
    PrestaSafe committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    82e6da4 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2025

  1. Refactor: Update build scripts, dependencies, and frontend configurat… 

    …ions

Refactor: Update build scripts, dependencies, and frontend configurations

- Update package dependencies in _dev/package.json and _dev/package-lock.json
- Modify watch and build scripts to use concurrently
- Update Tailwind CSS and related configurations
- Adjust frontend component behavior (e.g., Header.vue navigation)
- Remove redundant CSS and configuration files
- Update CSS generation and distribution process
    @PrestaSafe
    PrestaSafe committed Mar 2, 2025
    Configuration menu
    Copy the full SHA
    63ba801 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #289 from PrestaSafe/update-package-blocks 

    Update package blocks
    @PrestaSafe
    PrestaSafe authored Mar 2, 2025
    Configuration menu
    Copy the full SHA
    2af1044 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2025

  1. Update ZoneSelect.vue 

    set size 200%
    @PrestaSafe
    PrestaSafe authored Mar 21, 2025
    Configuration menu
    Copy the full SHA
    2b8e559 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2025

  1. v4

    @PrestaSafe
    PrestaSafe committed Mar 26, 2025
    Configuration menu
    Copy the full SHA
    ad4cfac View commit details
    Browse the repository at this point in the history

  2. add test section

    @PrestaSafe
    PrestaSafe committed Mar 26, 2025
    Configuration menu
    Copy the full SHA
    c6022cb View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2025

  1. Merge branch 'develop' of https://github.com/PrestaSafe/prettyblocks … 

    …into develop
    @PrestaSafe
    PrestaSafe committed Mar 28, 2025
    Configuration menu
    Copy the full SHA
    bdc325d View commit details
    Browse the repository at this point in the history
Loading