uni-elentra-1x-me) repository.
consortium Git remote that points to the Consortium Edition elentra-1x-me repository, then ensure that you add one:git fetch consortium.
uni/staging) and create a new branch based on this branch (e.g., uni/staging-v117) just for easy restore purposes in case it's needed. Once that branch has been created, checkout the original Branded Edition staging branch (e.g., uni/staging) and continue.
consortium remote, then right click on release/1.18 and click Pull consortium/release/1.18 into uni/staging. At this point, you may be asked to resolve any merge conflicts that have been created by making modifications to your Branded Edition that conflict with changes that have been made to the Consortium Edition. Depending on your level of conflict, this could be as simple as a minor modification to the composer.lock file or something much more complex. If you require assistance, please book an appointment with the Elentra Consortium Core Team, or chat with us on Slack in the #developers channel and we will provide you with some guidance on moving forward. As a point of note, we always recommend that Consortium Participants follow the Contribution best practices defined in our documentation, which may help reduce the number of conflicts that you encounter.
uni/staging branch and continue to Part 2 of the instructions.origin remote at this point. Wait until Part 2 has been completed and have finished some initial local testing.master branch.git fetch consortium.
consortium remote, then right click on master and click Pull consortium/master into uni/master. There may be merge conflicts that must be resolved if customizations made to your branded API.
master branch of your Branded API. Push any changes to your Branded API remote.
v4.0.2 and the composer.json provided with Elentra ME 1.18 specifies that the major version of API version must be ~4.0. Create a new tag where the current date follows the patch version: 4.0.2.20200512. More information about tagging API releases can be found here.
composer update elentrapackages/elentra-1x-api and commit the changes to the composer.lock file.www-root/core/config/settings.inc.php with the settings-staging.inc.php and settings-production.inc.php files in the same directory. If you have alternatively named or additional settings files, use those instead. When you compare the Consortium Edition settings.inc.php file with your Branded Edition files, you are looking to add additional settings that have been added to the stock settings.inc.php file and remove any settings that have been removed from the stock settings.inc.php file. In most cases, your Branded Edition settings files should have the same lines (albeit potentially different settings values) as the Consortium Edition. Once you have compared your settings files, commit the changes to your uni/staging branch.
www-root/templates/default directory with your own Branded Edition templates (e.g., www-root/templates/uni). In many cases, you will want to add missing files, update your language files, add any additions to the CSS files, add modifications to your header.tpl.php files, etc. This process can take a bit of time and should be repeated for each additional template that you have created. Once you have compared your templates, commit the changes to your uni/staging branch.elentra-developer Docker container, and change to your uni-elentra-1x-me directory:origin remote.uni/staging branch to your origin remote, you can now deploy the upgrade to your staging environment from within your Docker container.elentra-developer Docker container, and change to your deployment directory:scrub.sh shell script included with the Elentra Platform.uni-elentra-1x-me) repository.
uni/production branch.
uni/staging branch and click "Merge uni/staging into uni/production". This will merge all of the commits that have gone into creating the upgrade, into your uni/production branch.
uni/production branch to your origin remote.Log into your local elentra-developer Docker container, and change to your deployment directory:settings.inc.php by re-adding the quizzes declaration in the $MODULES array, like so:$MODULES["quizzes"] = array("title" => "Manage Quizzes", "resource" => "quiz", "permission" => "update");www-root/core/storage/app/absence-files. You will need to create the folder in your staging and production, otherwise file uploads will fail.user_menu_ordering which allows you to order the menu items in the User Profile Dropdown in the Navbar. The setting comes loaded with a default, however you may edit those values as you see fit.app.json file. If you pull from the release branch, or if you're upgrading for the first time, please run these commands on your serversuser_menu_ordering setting as the first item.