-
-
Notifications
You must be signed in to change notification settings - Fork 2k
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
base: develop
Are you sure you want to change the base?
Conversation
fix last page when modulus is zero
Fixed salesagility#6720 - Remove old recaptcha files
* 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
Fixed salesagility#3057 - FullCalendar update to version 3.1
Fixed salesagility#3100 - Upgrade for HTML Purifier [Request]
Codecov Report
@@ 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 |
Fixed salesagility#4511 - Upgrade of TinyMCE to latest 4.9.x version
Fixes salesagility#7111 - composer: include mpdf/mpdf 6.1 and drop in-tree version (5.7)
Fixed salesagility#7027 - Use a maintained library to minify JS
# Conflicts: # composer.json # composer.lock
# Conflicts: # composer.lock
Assessed 👍 |
Needs a rebase :) |
Looks like flaky tests, we should really merge hotfix into develop so develop PRs won't suffer from these as much anymore. |
@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. |
|
1998a13
to
7e9bf41
Compare
Description
Removes jstree from include and moves it to composer.
How To Test This
Types of changes
Final checklist