Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Conversation

@madsnorgaard
Copy link
Collaborator

@madsnorgaard madsnorgaard commented Jan 10, 2022

I am unsure as to why we are seeing 57 additional commits even though master and develop are different only by this PR - https://github.com/OS2Forms/os2forms_forloeb/pull/107/files

Any suggestions as to how we fix this are welcome?

Mads Nørgaard and others added 30 commits October 8, 2021 10:33
… shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used.
Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used.
…ith_multiple_webforms

Support multiple parties with multiple webforms
mBoegvald and others added 18 commits November 26, 2021 12:22
…k_type

[#46800] Created new task-type for inheriting webform in flow
)

* Enable URL override for webform submissions and hashed url patterns

* Move pathauto.settings.yml to profile
…k_type

[#46800] Adding all form fields to 'prepareTaskForSave'
* Merge develop with master (#90)

* Fixing composer.lock to fetch fixed Forløb module release.

* Add function to set username from webform submission.

* Adding example webforms to enable flow with multiple webforms.

* Make basic workflow work, without copying of fields.

* New task class in place - now ready to implement the functionality.

* Commit day's work.

* Added form_alter hook to intercept submit on WebformMultiple task.

* It works, next step some prettification.

* Lint changes.

* Fix notification by variable for part1

* Changed so that field names in source forms are prefixed with unique ID.

* Remove composer update from CI check

* Set composer update to get latest version per tag

* Brushup before review.

* Travis CI fix.

* Remove tag versioning of forloeb module

* Fix linting error.

* Update README.md

* Refactor unused webforms and flows

* Add, install and configure r4032login module

* Adjust description text

* Rename template

* Change category

* Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used.

* Remove rules modules as dependency

* lock to dev branch

* Remove Forløb profile as a dependency

Co-authored-by: Carsten Agger <carstena@magenta-aps.dk>
Co-authored-by: Carsten Agger <carstena@magenta.dk>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>

* Pre-release PR develop into master (#95)

* Fixing composer.lock to fetch fixed Forløb module release.

* Add function to set username from webform submission.

* Adding example webforms to enable flow with multiple webforms.

* Make basic workflow work, without copying of fields.

* New task class in place - now ready to implement the functionality.

* Commit day's work.

* Added form_alter hook to intercept submit on WebformMultiple task.

* It works, next step some prettification.

* Lint changes.

* Fix notification by variable for part1

* Changed so that field names in source forms are prefixed with unique ID.

* Remove composer update from CI check

* Set composer update to get latest version per tag

* Brushup before review.

* Travis CI fix.

* Remove tag versioning of forloeb module

* Fix linting error.

* Update README.md

* Refactor unused webforms and flows

* Add, install and configure r4032login module

* Adjust description text

* Rename template

* Change category

* Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used.

* Remove rules modules as dependency

* lock to dev branch

* Remove Forløb profile as a dependency

* [#46780] Removed all parts of HK/Holstebro, to make the webform generic and reusable for everyone.

* [#46800] Created new task-type for inheriting webform in flow

* [#46800] adding returns after logs

* [#46800] Adding all form fields to 'prepareTaskForSave'

* Enable URL override for webform submissions and hashed url patterns (#93)

* Enable URL override for webform submissions and hashed url patterns

* Move pathauto.settings.yml to profile

* [#46800] Added custom field to parent prepareTaskForSave method

Co-authored-by: Carsten Agger <carstena@magenta-aps.dk>
Co-authored-by: Carsten Agger <carstena@magenta.dk>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

Co-authored-by: Carsten Agger <carstena@magenta-aps.dk>
Co-authored-by: Carsten Agger <carstena@magenta.dk>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>
…t_to_module

[#46800] Adding MaestroWebformInherit to os2forms_forloeb.module
* Fix to bug on default purge setting not saving.

* Better handling of submissions purge logic

* Refactor and webform save error

* Small change to purge logic

* Remove save_webform check logic to always save changes.

* Refactor upon review
To be able update project to Webform 6 we need to have coc_forms_auto_export updated to higher verison
* Merge develop with master (#90)

* Fixing composer.lock to fetch fixed Forløb module release.

* Add function to set username from webform submission.

* Adding example webforms to enable flow with multiple webforms.

* Make basic workflow work, without copying of fields.

* New task class in place - now ready to implement the functionality.

* Commit day's work.

* Added form_alter hook to intercept submit on WebformMultiple task.

* It works, next step some prettification.

* Lint changes.

* Fix notification by variable for part1

* Changed so that field names in source forms are prefixed with unique ID.

* Remove composer update from CI check

* Set composer update to get latest version per tag

* Brushup before review.

* Travis CI fix.

* Remove tag versioning of forloeb module

* Fix linting error.

* Update README.md

* Refactor unused webforms and flows

* Add, install and configure r4032login module

* Adjust description text

* Rename template

* Change category

* Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used.

* Remove rules modules as dependency

* lock to dev branch

* Remove Forløb profile as a dependency

Co-authored-by: Carsten Agger <carstena@magenta-aps.dk>
Co-authored-by: Carsten Agger <carstena@magenta.dk>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>

* Pre-release PR develop into master (#95)

* Fixing composer.lock to fetch fixed Forløb module release.

* Add function to set username from webform submission.

* Adding example webforms to enable flow with multiple webforms.

* Make basic workflow work, without copying of fields.

* New task class in place - now ready to implement the functionality.

* Commit day's work.

* Added form_alter hook to intercept submit on WebformMultiple task.

* It works, next step some prettification.

* Lint changes.

* Fix notification by variable for part1

* Changed so that field names in source forms are prefixed with unique ID.

* Remove composer update from CI check

* Set composer update to get latest version per tag

* Brushup before review.

* Travis CI fix.

* Remove tag versioning of forloeb module

* Fix linting error.

* Update README.md

* Refactor unused webforms and flows

* Add, install and configure r4032login module

* Adjust description text

* Rename template

* Change category

* Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used.

* Remove rules modules as dependency

* lock to dev branch

* Remove Forløb profile as a dependency

* [#46780] Removed all parts of HK/Holstebro, to make the webform generic and reusable for everyone.

* [#46800] Created new task-type for inheriting webform in flow

* [#46800] adding returns after logs

* [#46800] Adding all form fields to 'prepareTaskForSave'

* Enable URL override for webform submissions and hashed url patterns (#93)

* Enable URL override for webform submissions and hashed url patterns

* Move pathauto.settings.yml to profile

* [#46800] Added custom field to parent prepareTaskForSave method

Co-authored-by: Carsten Agger <carstena@magenta-aps.dk>
Co-authored-by: Carsten Agger <carstena@magenta.dk>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Added changes related to Drupal 9 compatibility

* Updated ckeditor_a11ychecker module to 2.0.0-alpha1version

Co-authored-by: Mads Nørgaard <madsnorgaard@live.dk>
Co-authored-by: Carsten Agger <carstena@magenta-aps.dk>
Co-authored-by: Carsten Agger <carstena@magenta.dk>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>
…ror_handling

Added errormessage for WebformInherit
@madsnorgaard madsnorgaard changed the base branch from master to d9 January 10, 2022 12:41
@madsnorgaard madsnorgaard changed the base branch from d9 to master January 10, 2022 12:41
Mads Nørgaard added 2 commits January 10, 2022 14:44
# Conflicts:
#	src/Plugin/EngineTasks/MaestroWebformInheritTask.php
@rimi-itk
Copy link
Collaborator

I don't know why we see all these commits, but you can probably remedy it by running git reset master (on the develop branch) on this PR. Sometimes git just acts up (or maybe we just don't always know how to use it correctly).

@madsnorgaard madsnorgaard merged commit 4b4bd5e into master Jan 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants