saxSaxintegration #4
Merged
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
upmerge 5.0.0-rc.1 into master (from 5.x)
…y deletions to this
5.x to master
…eClause/AccessWhereClause classes, created softDelete booleans and handler methods to SessionManagerService class, triggered these methods from Invoker class
…-column-to-entity-table' into 46-create-soft-delete-method
…-column-to-entity-table' into 96-add-trigger-function-to-time-soft-deleted-column-to-show-when-a-entity-was-soft-deleted
…d true to include soft deleted entities in search, false to exclude
…to 96-add-trigger-function-to-time-soft-deleted-column-to-show-when-a-entity-was-soft-deleted # Conflicts: # engine/classes/Elgg/Database/Clauses/AccessWhereClause.php # engine/classes/Elgg/Database/EntityTable.php
…in-table-and-buttons' into 46-create-soft-delete-method
…in-table-and-buttons' into 46-create-soft-delete-method
…' into 96-add-trigger-function-to-time-soft-deleted-column-to-show-when-a-entity-was-soft-deleted
…RemoveSoftDeletedEntitiesHandler class was created and implemented in (engine\classes\Elgg\Database) folder.
…me minor cleanup (bug fix TC 4.2)
# Conflicts: # views/default/forms/entity/chooserestoredestination.php
…t file to include new columns
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.