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

Feature: Event and Task Type Selection #321

Merged
merged 31 commits into from
Nov 27, 2023
Merged

Feature: Event and Task Type Selection #321

merged 31 commits into from
Nov 27, 2023

Commits on Oct 23, 2023

  1. Add initial swimlane implementation

    @matthiaslehnertum
    matthiaslehnertum committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    0d71812 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Update unit tests

    @matthiaslehnertum
    matthiaslehnertum committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    3f7c076 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Merge branch 'develop' into feature/swimlanes

    @matthiaslehnertum
    matthiaslehnertum authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    0f11c4a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/swimlanes

    @matthiaslehnertum
    matthiaslehnertum authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    ce9e292 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Add log lint rule

    @matthiaslehnertum
    matthiaslehnertum committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    50bd020 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. Merge branch 'develop' into feature/swimlanes

    @matthiaslehnertum
    matthiaslehnertum authored Oct 28, 2023
    Configuration menu
    Copy the full SHA
    731a0b3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/swimlanes

    @matthiaslehnertum
    matthiaslehnertum authored Oct 28, 2023
    Configuration menu
    Copy the full SHA
    82ceecb View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Merge branch 'develop' into feature/swimlanes

    @matthiaslehnertum
    matthiaslehnertum authored Oct 30, 2023
    Configuration menu
    Copy the full SHA
    407540f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/swimlanes 

    # Conflicts:
#	src/main/i18n/de.json
#	src/main/i18n/en.json
#	src/main/packages/bpmn/bpmn-diagram-preview.ts
#	src/main/packages/bpmn/index.ts
#	src/main/packages/components.ts
#	src/main/packages/popups.ts
#	src/main/packages/uml-elements.ts
#	src/tests/unit/packages/bpmn/bpmn-annotation/bpmn-annotation-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-call-activity/bpmn-call-activity-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-conversation/bpmn-conversation-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-end-event/bpmn-end-event-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-flow/bpmn-flow-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-gateway/bpmn-gateway-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-intermediate-event/bpmn-intermediate-event-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-start-event/bpmn-start-event-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-subprocess/bpmn-subprocess-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-task/bpmn-task-component-test.tsx
#	src/tests/unit/packages/bpmn/bpmn-transaction/bpmn-transaction-component-test.tsx
    @matthiaslehnertum
    matthiaslehnertum committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    c9ab89a View commit details
    Browse the repository at this point in the history

  3. Resolve merge issues

    @matthiaslehnertum
    matthiaslehnertum committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    fec8bd8 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Merge branch 'develop' into feature/swimlanes 

    # Conflicts:
#	src/main/i18n/de.json
#	src/main/i18n/en.json
#	src/main/packages/bpmn/bpmn-diagram-preview.ts
#	src/main/packages/bpmn/index.ts
#	src/main/packages/components.ts
#	src/main/packages/uml-elements.ts
    @matthiaslehnertum
    matthiaslehnertum committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    49d42df View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Update element styling

    @matthiaslehnertum
    matthiaslehnertum committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    b07e220 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Update unit tests and imports

    @matthiaslehnertum
    matthiaslehnertum committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    afd3c87 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. allow direct editing of lanes in the pool update panel

    @matthiaslehnertum
    matthiaslehnertum committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    a09edc8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/swimlanes

    @matthiaslehnertum
    matthiaslehnertum authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    1d15a70 View commit details
    Browse the repository at this point in the history

  3. Fix issue with upgrade to swimlane based

    @matthiaslehnertum
    matthiaslehnertum committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    b420d62 View commit details
    Browse the repository at this point in the history

  4. Fix codacy remarks

    @matthiaslehnertum
    matthiaslehnertum committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    3eb936f View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. allow selecting BPMN event types

    @matthiaslehnertum
    matthiaslehnertum committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    a5cddf3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/bpmn-2.0-adaptions 

    # Conflicts:
#	src/main/packages/bpmn/bpmn-end-event/bpmn-end-event.ts
#	src/main/packages/bpmn/bpmn-gateway/bpmn-gateway-component.tsx
#	src/main/packages/bpmn/bpmn-gateway/bpmn-gateway-update.tsx
#	src/main/packages/bpmn/bpmn-gateway/bpmn-gateway.ts
#	src/main/packages/bpmn/bpmn-pool/bpmn-pool-update.tsx
#	src/main/packages/bpmn/bpmn-start-event/bpmn-start-event.ts
#	src/main/packages/popups.ts
    @matthiaslehnertum
    matthiaslehnertum committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    b4f6046 View commit details
    Browse the repository at this point in the history

  3. merge with develop

    @matthiaslehnertum
    matthiaslehnertum committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    4aea371 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Add task specification

    @matthiaslehnertum
    matthiaslehnertum committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    72a87f1 View commit details
    Browse the repository at this point in the history

  2. Update manual task icon

    @matthiaslehnertum
    matthiaslehnertum committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    6098b87 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/bpmn-2.0-adaptions

    @matthiaslehnertum
    matthiaslehnertum authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    ec3d131 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Update snapshot tests

    @matthiaslehnertum
    matthiaslehnertum committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    58af71a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/bpmn-2.0-adaptions' of https://github.com/ls1in… 

    …tum/Apollon into feature/bpmn-2.0-adaptions
    @matthiaslehnertum
    matthiaslehnertum committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    a9572ad View commit details
    Browse the repository at this point in the history

  3. Ensure that labels are rendered homogenous between events

    @matthiaslehnertum
    matthiaslehnertum committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    1826332 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2023

  1. Update snapshots

    @matthiaslehnertum
    matthiaslehnertum committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    60a8a9b View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Increase test coverage

    @matthiaslehnertum
    matthiaslehnertum committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    d3cf260 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/bpmn-2.0-adaptions

    @matthiaslehnertum
    matthiaslehnertum authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    0525b4e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/bpmn-2.0-adaptions

    @matthiaslehnertum
    matthiaslehnertum authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    8bd0f74 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feature/bpmn-2.0-adaptions

    @matthiaslehnertum
    matthiaslehnertum authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    240737f View commit details
    Browse the repository at this point in the history