Merge 2.2 into 2.x #10184
Closed
Merge 2.2 into 2.x #10184
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
When system cache is off, the boot sequence was still trying to load it. This caused no problem as the cache was always empty, but it's a waste of cycles and could be a source of bugs in the future.
In order to fix `canEdit()` in 1.9, `update()` needed to load a fresh copy of entity from the DB to check the persisted attributes. In that fix, Elgg@66eb9e6, a corner case was checked out of my paranoia that a dev would load an invisible entity with access control on, but try to delete it with access off. I now believe this check was unnecessary (we never did similar checks for `delete()`). When the original `canEdit()` attributes issue was resolved in
fix(access): updates no longer mistakenly blocked in some scenarios
These uses of the `ElggCrypto` constructor had not been properly updated when the `SiteSecret` dependency was added.
fix(web_services): create_api_user() and create_user_token() work again
Either sites already added this via a plugin in 2.1 or they didn't want it. Fixes Elgg#9731
If no plugin private settings were going to be preloaded, we no longer run an invalid query. Fixes Elgg#10119
If the supporting view is not defined in the current viewtype, we now temporarily set the `default` viewtype while using the view. This makes sure any nested views also use `default` viewtype. Fixes Elgg#10114
fix(boot): boot cache now respects system cache setting
docs(license): clarifies dual licensing in LICENSE.txt
security(htmlawed): upgrades htmLawed to latest, currently 1.1.22
Merge 1.12 into 2.2
fix(js): output deprecation messages to admins in browser console only
fix(core): boot no longer throws DB exception in some edge cases
fix(reportedcontent): Reported Content admin widget works again
…pagehandler for members page
If `$vars['options']` is given as an array and an element `$option` is also an array, we no longer emit a notice and properly set the `selected` attribute based on `$option['text']`. Fixes Elgg#10154
fix(members): Don't rely on newest members tab set as default tab in pagehandler for members page
fix(views): input/select view can select options more reliably
fix(likes): don't emit notice if a listing's `$vars['list_class']` isn't set
Sets `0` limit on queries for child queries, converts to batches, some small refactoring for clarity.
… strings from bookmarks
chore(bookmarks): Removal of unused 'shares' code and unused language strings from bookmarks plugin
fix(pages): operations keep track of more than 10 child pages
fix(views): some functions that use views fallback to default viewtype
fix(discussions): removes site "Discussions" menu item added in 2.2.0
Adds tests to verify that entities with ACCESS_LOGGED_IN and ACCESS_PUBLIC are treated as accessible with ignored access
chore(tests): test entity accessibility in the notifications flow
Merge 1.12 2.2
fix(plugins): Make activate/deactivate all plugins to work also on Firefox
|
@hypeJunction sigh. same problem https://travis-ci.org/Elgg/Elgg/jobs/158901338#L400 |
|
I think we just ignore that commit check failures. |
|
One thing we could try is remove git clone depth from travis config. Maybe it has something to do with that |
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.
(I've requested StackOverflow help on this. Please leave this open for them and do not restart the Travis builds)