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

Fixes #149 and #163 #165

Merged
merged 2 commits into from
Sep 30, 2020
Merged

Conversation

SerheyDolgushev
Copy link
Contributor

@SerheyDolgushev SerheyDolgushev commented Sep 29, 2020

Question Answer
JIRA issue N/A
Bug/Improvement yes
New feature no
Target version 2.1
BC breaks no
Tests pass yes
Doc needed no

With this PR I want to clean up the mess created in #148. Per my understanding, the following happened:

  1. EZP-31632: Floating table toolbar #148 and EZP-31641: Unable to manage links in table cells #149 were submitted at the same time.
  2. EZP-31641: Unable to manage links in table cells #149 was based on 2.0 and it was QAed and merged almost right after submission.
  3. EZP-31632: Floating table toolbar #148 was based on master and it wasn't updated for a few months.
  4. A few months later I was asked to sync the latest master changes in EZP-31632: Floating table toolbar #148. And some of those changes caused an issue that was related to previously merged and QAed EZP-31641: Unable to manage links in table cells #149.
  5. Instead of submitting a new PR I put 30c2ac0 as part of EZP-31632: Floating table toolbar #148.
  6. EZP-31933: Fixed custom tag link edit #163 was recently submitted, QAed and merged. And be4fb0a has some fixes related to EZP-31933: Fixed custom tag link edit #163. be4fb0a was also pushed to EZP-31632: Floating table toolbar #148.
  7. Just to make things more simple and clean, be4fb0a and be4fb0a were reverted in EZP-31632: Floating table toolbar #148. And those two commits were added as this PR.

@dew326 @lserwatka

Please note, this PR has nothing common to #148. But without this PR issue mentioned in #149 still persist. So it would be very nice to get this PR merged in the next release. While #148 can wait.

TODO:

  • Implement feature / fix a bug.
  • Implement tests.
  • Fix new code according to Coding Standards ($ composer fix-cs).
  • Ask for Code Review.

@lserwatka lserwatka merged commit a25a958 into ezsystems:2.1 Sep 30, 2020
@lserwatka
Copy link
Member

@dew326 could you merge it up? I need this for 3.1.3 release.

@dew326
Copy link
Member

dew326 commented Sep 30, 2020

Merged to master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants