Features #2
Open
Features #2
Conversation
This file contains 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
jeabakker
force-pushed
the
features
branch
3 times, most recently
from
a15d5ff to
337b1bd
Compare
jeabakker
force-pushed
the
features
branch
3 times, most recently
from
4e485ce to
fa66496
Compare
jeabakker
force-pushed
the
features
branch
3 times, most recently
from
00f2173 to
6535d38
Compare
jeabakker
force-pushed
the
features
branch
3 times, most recently
from
7a922f3 to
11377fd
Compare
Also set focus back to the popup trigger when it's closed and the focus was inside the popup
feat(ckeditor): updated to v40.0.0
fix(css): fixed some margin issues on elgg-field form elements
chore(i18n): update translations
chore(release): v5.1.0
chore(i18n): update Transifex config to support Elgg 6.0
# Conflicts: # composer.lock # engine/classes/Elgg/Application/SystemEventHandlers.php # engine/classes/Elgg/Export/Data.php # engine/classes/Elgg/Export/Entity.php # engine/tests/phpunit/integration/Elgg/Integration/ElggCoreMetastringsTest.php # engine/tests/phpunit/integration/Elgg/Integration/ElggDataFunctionsTest.php # engine/tests/phpunit/unit/Elgg/Http/ResponseFactoryUnitTest.php # mod/ckeditor/views/default/ckeditor/config/base.js # views/default/elgg/comments.js
Upmerge 5.1.5 into master (from 5.x)
chore(core): scrutinizer issues
chore(icons): save cropping coordinates with correct icon type
updating composer dependencies
feat(ckeditor): updated to ckeditor v41.3
chore(github): set correct branch for release action
chore(core): scrutinizer issues
chore(release): v6.0.0-beta.1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.