feature/os2forms 2.8 #31
Merged
+1
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
madsnorgaard
approved these changes
Dec 16, 2021
Collaborator
|
Jeg mener denne håndtering tager sig af alles interesser for nu. |
rimi-itk
force-pushed
the
feature/os2forms-2.8
branch
from
0612b5d to
1218d6c
Compare
Collaborator
Author
|
Merger du så til |
Collaborator
|
Vi laver release når denne PR er merged: #32 Der er en enkelt konflikt. |
Collaborator
Author
|
Hvem forventes at løses konflikten? Det er ret enkelt og nogle gange forstår jeg ikke hvorfor |
Collaborator
|
Fremadrettet tænker jeg at vi håndterer konflikter som opretter af PR? Men du har ret, det er en triviel opgave. Mener også at Gitlab håndterer den slags ved at tjekke efter enhver fletning til base branchen. |
madsnorgaard
added a commit
that referenced
this pull request
Dec 20, 2021
* Changing webform permissions for flowdesigner * [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted * [#44224] Changed permission to allow page to be added through the 'references'-tab * [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside * Add almost copy of Leder role as Borger role * [#46397] Added menu overrides, which moves 'Webforms' and 'Maestro templates' to the main navigation * Remove rules modules (#23) * Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro). * Remove Rules modules Co-authored-by: Toke Fritzemeier <toke@magenta.dk> * Remove rules (#24) * Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro). * Merge Develop into Main (#21) * Changing webform permissions for flowdesigner * [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted * [#44224] Changed permission to allow page to be added through the 'references'-tab * [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside * Add almost copy of Leder role as Borger role Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> * Remove rules branch * No installation of Rules modules * Update Forløb module version 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> * Add patch to dynamic entity reference module (#27) * Add patch to dynamic entity reference module * Add link to patch comment * Updated os2forms/os2forms and os2forms/os2forms_forloeb (#29) * Added changes related to Drupal 9 compatibility (#30) * Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro). * Merge Develop into Main (#21) * Changing webform permissions for flowdesigner * [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted * [#44224] Changed permission to allow page to be added through the 'references'-tab * [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside * Add almost copy of Leder role as Borger role Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> * Develop into main (#25) * Changing webform permissions for flowdesigner * [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted * [#44224] Changed permission to allow page to be added through the 'references'-tab * [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside * Add almost copy of Leder role as Borger role * Remove rules modules (#23) * Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro). * Remove Rules modules Co-authored-by: Toke Fritzemeier <toke@magenta.dk> * Remove rules (#24) * Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro). * Merge Develop into Main (#21) * Changing webform permissions for flowdesigner * [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted * [#44224] Changed permission to allow page to be added through the 'references'-tab * [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside * Add almost copy of Leder role as Borger role Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> * Remove rules branch * No installation of Rules modules * Update Forløb module version 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: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> * Develop (#28) * Changing webform permissions for flowdesigner * [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted * [#44224] Changed permission to allow page to be added through the 'references'-tab * [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside * Add almost copy of Leder role as Borger role * [#46397] Added menu overrides, which moves 'Webforms' and 'Maestro templates' to the main navigation * Remove rules modules (#23) * Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro). * Remove Rules modules Co-authored-by: Toke Fritzemeier <toke@magenta.dk> * Remove rules (#24) * Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro). * Merge Develop into Main (#21) * Changing webform permissions for flowdesigner * [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted * [#44224] Changed permission to allow page to be added through the 'references'-tab * [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside * Add almost copy of Leder role as Borger role Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> * Remove rules branch * No installation of Rules modules * Update Forløb module version 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> * Add patch to dynamic entity reference module (#27) * Add patch to dynamic entity reference module * Add link to patch comment Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> * Added changes related to Drupal 9 compatibility * Upgrade os2forms/os2forms_forloeb to latest version Co-authored-by: Mads Nørgaard <madsnorgaard@live.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: mn <mn@magenta-aps.dk> * Downgrade os2forms/os2forms (#31) * Update composer.json Upgrade to latest version of OS2forms med Forløb 1.9.0 Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> Co-authored-by: Mikkel Ricky <rimi@aarhus.dk> Co-authored-by: Andriyun <andriy.yun@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
"os2forms/os2forms": "^3.0"and"os2forms/os2forms_forloeb": "^1.8"conflict when runningcomposer install.