Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync master #2322

Merged
merged 5 commits into from Dec 4, 2018
Merged

Sync master #2322

merged 5 commits into from Dec 4, 2018

Conversation

mitogh
Copy link
Contributor

@mitogh mitogh commented Dec 3, 2018

Merge latest master changes into the release/M18.18

bordoni and others added 5 commits November 29, 2018 12:14
@bordoni
Dev Changelogs
8225611
Add in backquote to readme
08ad9a5
@mitogh
Update language location placement
060a160
@bordoni
Prevent loading of an Activation hook when outdate Common
6cc751b 
When we are activating The Events Calendar and we have an outdated version of Common we need to make sure we are not triggering the activation hook of The Events Calendar, because it could lead into fatals due to older version of Common been loaded first.

The implementation here delays that Activation trigger to another request, so it can have the latest Common loaded via normal common-lib version comparing.
@bordoni
Merge pull request #2311 from moderntribe/spotfix/prevent-activation-…
aace669 
…hook-outdated-common-version

Prevent loading of an Activation hook when outdate Common
@mitogh mitogh added the code review Status: requires a code review. label Dec 3, 2018
@tr1b0t
Copy link
Contributor

tr1b0t commented Dec 3, 2018

Status Message Line
⚠️ Comment refers to a TODO task Main.php:450

via jenkins/codesniffer-phpcs

@juanfra juanfra added merge Status: ready to merge. and removed code review Status: requires a code review. labels Dec 4, 2018
@bordoni bordoni merged commit ae595e6 into release/M18.18 Dec 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juanfra juanfra juanfra approved these changes

@bordoni bordoni Awaiting requested review from bordoni

@paulmskim paulmskim Awaiting requested review from paulmskim

@nealfennimore nealfennimore Awaiting requested review from nealfennimore

Assignees
No one assigned
Labels
merge Status: ready to merge.
Projects
None yet
Milestone
No milestone
4 participants
@mitogh @tr1b0t @juanfra @bordoni