Sync latest 405 Stable - #25
Merged
Merged
Conversation
* make button texts in adminapprove step configurable * bugfix for empty texts * add behat test for admin approve w/wo customisation * pass coding checks * no actual change * cosmetic changes in behat test * set first char to lowercase on multiple actions * handle missing button texts (for existing workflows) * adminapprove: add behat test for default configuration * admin approve: pass behat tests * update help text * update version number
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
git merge --no-edit upstream/MOODLE_405_STABLE
Auto-merging classes/local/manager/trigger_manager.php
Auto-merging settings.php
CONFLICT (content): Merge conflict in settings.php
Auto-merging step/lib.php
CONFLICT (content): Merge conflict in step/lib.php
Auto-merging trigger/lib.php
CONFLICT (content): Merge conflict in trigger/lib.php
Auto-merging version.php
CONFLICT (content): Merge conflict in version.php
Automatic merge failed; fix conflicts and then commit the result.
Kept changes from both branches - non-conflicting changes so kept both
Resolved conflicts and updated version.php and db/upgrade.php to keep the version numbers in the Catalyst fork