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

*WIP Move Jstree to composer #7296

Open
wants to merge 64 commits into
base: develop
Choose a base branch
from

Conversation

Dillon-Brown
Copy link
Contributor

@Dillon-Brown Dillon-Brown commented May 17, 2019

Description

Removes jstree from include and moves it to composer.

How To Test This

  1. Check that the JS tree in the email module works as expected.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Final checklist

  • My code follows the code style of this project found here.
  • My change requires a change to the documentation.
  • I have read the How to Contribute guidelines.

isleshocky77 and others added 30 commits February 20, 2018 14:36
* Update command to allow for cache directory specified in config
* Remove warnings/errors when no cached directory present
* Update to have namespace "cache" so we can add other cache commands later
  * Leave alias for current command
* Use provided toolsets required by robo for implementation
* Print cleaned directories
* Confirm before cleaning directory
  * Allow for force override
…-notes

# Conflicts:
#	modules/Campaigns/Campaign.php
#	modules/Campaigns/views/view.detail.php
#	modules/Notes/vardefs.php
…gn-notes

Add ability to have Notes on a Campaign
…e-command-config-cache-dir

Allow for clean cache command to use config'd cache_dir (plus clean up)
# Conflicts:
#	composer.json
#	composer.lock
…-tree version (5.7)

Remove the included version of mpdf (in modules/AOS_PDF_Templates/PDF_Lib) and
add it to composer instead.

This also updates the version from 5.7.1 to 6.1.0 to get some fixes that were already
applied manually to the version in SuiteCRM. There are many newer versions available,
but they require more changes and this is a good first step (and this potentially
could be backported to 7.10)

The version in tree had one manual fix applied (d1279ca) which is included in
6.1.0 already, so the upstream version can be used as is.

The required changes to make things compatible with with 6.1 were
* mPDF_exception is now called MpdfException
* SetAutoFont() no longer exists, the docs suggest to use autoLangToFont instead
  to get the same results as before.

Fixes salesagility#7111
gymad
gymad previously approved these changes May 17, 2019
@codecov-io
Copy link

codecov-io commented May 17, 2019

Codecov Report

Merging #7296 into develop will increase coverage by <.01%.
The diff coverage is 0%.

@@              Coverage Diff              @@
##             develop    #7296      +/-   ##
=============================================
+ Coverage      10.84%   10.84%   +<.01%     
  Complexity     42086    42086              
=============================================
  Files           3375     3375              
  Lines         247880   247880              
=============================================
+ Hits           26888    26889       +1     
+ Misses        220992   220991       -1

@cameronblaikie
Copy link
Contributor

Assessed 👍

@cameronblaikie cameronblaikie added the Status:Assessed PRs that have been tested and confirmed to resolve an issue by a core team member label Jun 7, 2019
@Mac-Rae Mac-Rae added Area: Emails Issues & PRs related to all things regarding emails & email module Status:Requires Updates Issues & PRs which requires input or update from the author labels Jun 17, 2019
@connorshea
Copy link
Contributor

Needs a rebase :)

@Dillon-Brown Dillon-Brown removed the Status:Requires Updates Issues & PRs which requires input or update from the author label Jul 24, 2019
@connorshea
Copy link
Contributor

Looks like flaky tests, we should really merge hotfix into develop so develop PRs won't suffer from these as much anymore.

@Dillon-Brown
Copy link
Contributor Author

@connorshea Agreed. It looks like there are only 81 files conflicting so it shouldn't be too difficult. I'll look at putting up a PR.

@SuiteBot
Copy link

SuiteBot commented Aug 27, 2020

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 6 committers have signed the CLA.

✅ Dillon-Brown
✅ isleshocky77
✅ cameronblaikie
✅ samus-aran
✅ lazka
❌ code-ph0y
You have signed the CLA already but the status is still pending? Let us recheck it.

@Dillon-Brown Dillon-Brown changed the title Move Jstree to composer *WIP Move Jstree to composer Apr 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: Emails Issues & PRs related to all things regarding emails & email module Status:Assessed PRs that have been tested and confirmed to resolve an issue by a core team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet