Fix JSON config upload #7256

robertalv · 2019-05-05T21:19:05Z

Description

Fixed application upload to json

Motivation and Context

Allows Upload Google API Credentials File to be selected.

How To Test This

Test with text/plain and then test with application/json,.json

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.

Apathetic cosmos develop fixing tests

# Conflicts: # .travis.yml # composer.lock # include/LangText.php # include/Sugarpdf/Sugarpdf.php # include/dir_inc.php # include/nusoap/class.soap_server.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Storage/File/Filesystem.php # modules/Campaigns/WebToPersonCapture.php # modules/Emails/Dashlets/MyEmailsDashlet/MyEmailsDashlet.data.php # modules/Emails/Email.php # modules/Emails/EmailUI.php # modules/Emails/EmailsController.php # modules/Emails/Save.php # modules/Emails/Status.php # modules/Emails/field_arrays.php # modules/Emails/include/ListView/ListViewDataEmails.php # modules/Emails/include/ListView/ListViewDataEmailsSearchOnCrm.php # modules/Emails/include/ListView/ListViewDataEmailsSearchOnIMap.php # modules/InboundEmail/InboundEmail.php # modules/UpgradeWizard/uw_utils.php # tests/unit/phpunit/modules/Emails/EmailTest.php # themes/SuiteP/css/Dawn/style.css # themes/SuiteP/css/Day/style.css # themes/SuiteP/css/Dusk/style.css # themes/SuiteP/css/Night/style.css

Develop merge

In #6329 mozaik was set to a dummy object to make it work when not using the mozaik editor. But the added variable declaration shadows the global variable breaking the case where mozaik is actually used, setting it to undefined. This breaks inserting images into emails, the file gets uploaded but the URL field stays empty. Fix this by explicitly checking if we are using mozaik instead of using a dummy object.

# Conflicts: # README.md # suitecrm_version.php

Fixed #6484 - Fix image insertion with mozaik

unit tests: force enable E_ALL in bootstrap

Fixed #6758 - [language]Duplicated language strings - develop branch

This reverts commit 9196edd

@michelhcote

This solution worked for us and others users. Originally posted by @michelhcote in 729e22a#commitcomment-31947648

Fix Travis

Update composer.json

Fixed 6761 - Api/V8 - Unable to Delete (unlink) relationships

Fixed #6862 - API - Custom Routes file is stored separately from other custom files

Fix custom fields in sort/filter in the API

Change default view on template to avoid date created/modified issues

Fixed #5724 - Map Area - Import Option Fails : An Error has occurred

Fixed #7162 - Popup select All records btn hidden in SuiteCRM 7.11.x

#6126 fix(Workflow AnyChange condition) - decode prev value before compare

…ge_10 # Conflicts: # .travis.yml # README.md # composer.json # composer.lock # include/Smarty/plugins/function.sugar_button.php # modules/Users/reassignUserRecords.php # service/v4_1/SugarWebServiceUtilv4_1.php # suitecrm_version.php # tests/unit/phpunit/data/SugarBeanTest.php

…lasticsearch Fixed #6540 - Hard coded text to language files

Fixed #6829 - Cache composer packages on Travis CI

…ge_10 # Conflicts: # composer.json # composer.lock # include/InlineEditing/InlineEditing.php # include/SugarObjects/templates/basic/metadata/detailviewdefs.php # modules/AOW_WorkFlow/AOW_WorkFlow.php # modules/InboundEmail/InboundEmail.php # service/core/SugarWebServiceImpl.php # service/v2_1/SugarWebServiceImplv2_1.php # service/v3_1/SugarWebServiceImplv3_1.php # service/v4/SugarWebServiceImplv4.php

Hotfix merge

fixed bug that removes Email_Address_Removed_In_Email_Body if email i…

fixing a recursion issue on reminders

robertalv · 2019-05-05T21:25:19Z

Signed CLAHub.

Dillon-Brown · 2019-05-06T13:58:14Z

Hi @robertalv, would you be able to remake this for the hotfix-7.10.x branch? thanks.

Fixed - #7133 - Fix Changes in Studio do not make an override file

*WIP Fixed #6869 - Saving user resets preferences

Manage delegate mssql

SuiteBot · 2020-08-27T13:23:41Z

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 9 committers have signed the CLA.

✅ Dillon-Brown
✅ JimMackin
✅ samus-aran
✅ urdhvatech
✅ cameronblaikie
❌ gymad
❌ janderson
❌ code-ph0y
❌ robertalv

janderson seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

gymad and others added 30 commits January 10, 2019 15:22

elasticsearch unit test

055e8bc

adding unit test for elastic pagination

d60df76

safe db table

1f08dfa

elastic tests state safe and removing some incomplete and skipped tests

495fd1f

some incomplete and skipped tests removed

268670e

Merge pull request #6751 from gymad/ApatheticCosmos_develop_fixing_tests

76eeea5

Apathetic cosmos develop fixing tests

Style.css

0af5588

Merge branch 'hotfix' into develop

50cb75b

Merge pull request #6728 from Dillon-Brown/develop

1dfb998

Develop merge

Remove PHPMailer

5147684

Increment suitecrm_version

d515705

Merge remote-tracking branch 'upstream/develop'

80e9e48

# Conflicts: # README.md # suitecrm_version.php

Fixed 6761 - Api/V8 - Unable to Delete (unlink) relationships

953a339

Update minimum PHP version

9196edd

Merge pull request #6757 from lazka/fix-mozaik-image-insert

014437b

Fixed #6484 - Fix image insertion with mozaik

Merge pull request #6725 from lazka/unittest-boostrap-force-e-all

5044940

unit tests: force enable E_ALL in bootstrap

Fix Travis

ccb3e0c

Fixed #6766 - SMTP Port Issue

c1bdba5

Fixed #6758 - [language]Duplicated language strings - develop branch

95cfb09

Merge pull request #6769 from jack7anderson7/fix-6758

f4db8b8

Fixed #6758 - [language]Duplicated language strings - develop branch

Fixed #5414 - Password is not saving

cf3adcb

Fix Travis

1c14e70

Fix user save

a9b6e0d

Fix user save

c9e3173

Revert "Update minimum PHP version"

d385603

This reverts commit 9196edd

Email view not working after upgrade from v.7.10.11 to 7.10.12

7f67ddc

This solution worked for us and others users. Originally posted by @michelhcote in 729e22a#commitcomment-31947648

Update vardefs.php

43e7b27

Merge pull request #6764 from Dillon-Brown/php_version

ad0f598

Fix Travis

code-ph0y and others added 20 commits April 5, 2019 17:07

Merge pull request #7130 from Dillon-Brown/update_composer_1

9c92728

Update composer.json

Manage delegate mssql #6852

3c95749

Fixed #7162 - Popup select All records btn hidden in SuiteCRM 7.11.x

af3581a

Merge pull request #6762 from tsummerer/bugfix_6761

43f0515

Fixed 6761 - Api/V8 - Unable to Delete (unlink) relationships

Merge pull request #6863 from tsummerer/bugfix_6862

d89416f

Fixed #6862 - API - Custom Routes file is stored separately from other custom files

Merge pull request #7142 from JimMackin/fix/6455

4a55704

Fix custom fields in sort/filter in the API

Merge pull request #6680 from sgaved/bug/dateIssuesCustomModule

89ab572

Change default view on template to avoid date created/modified issues

Merge pull request #7105 from ChangezKhan/bugfix_5724

9c2421a

Fixed #5724 - Map Area - Import Option Fails : An Error has occurred

Merge pull request #7170 from Dillon-Brown/issue-7162

d56f800

Fixed #7162 - Popup select All records btn hidden in SuiteCRM 7.11.x

Merge pull request #6128 from re8260/v7.10.5_singlequote_workflow

a781c2c

#6126 fix(Workflow AnyChange condition) - decode prev value before compare

Fix testSaveQuick

69c056e

Merge pull request #6843 from code-ph0y/fix/6540_hard_code_messages_e…

b4b930d

…lasticsearch Fixed #6540 - Hard coded text to language files

Merge pull request #6834 from Dillon-Brown/issue-6829-1

12923b9

Fixed #6829 - Cache composer packages on Travis CI

Merge pull request #7153 from Dillon-Brown/hotfix_merge_10

2e755fd

Hotfix merge

Merge branch 'hotfix-7.10.x' into hotfix

73fcfda

version 7.11.4

f083cf0

Merge pull request #6883 from g-fantini/bugfix/#6882

c1988a0

fixed bug that removes Email_Address_Removed_In_Email_Body if email i…

Merge pull request #4198 from gymad/hotfix_reminder_on_calls

a5df938

fixing a recursion issue on reminders

Dillon-Brown added PR:Community Contribution These are contribution made by the community PR:Wrong Branch Pull requests that point towards a restricted branch such as master labels May 6, 2019

code-ph0y and others added 4 commits May 23, 2019 14:19

Merge pull request #7134 from jack7anderson7/fix/7133

54dc8ad

Fixed - #7133 - Fix Changes in Studio do not make an override file

Merge pull request #6987 from Dillon-Brown/issue-6869

19eddf0

*WIP Fixed #6869 - Saving user resets preferences

Merge pull request #6852 from urdhvatech/manage-delegate-mssql

a8685f5

Manage delegate mssql

Update GoogleCalendarSettings.tpl

ae66abd

Dillon-Brown changed the base branch from master to hotfix-7.10.x May 30, 2019 09:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix JSON config upload #7256

Fix JSON config upload #7256

robertalv commented May 5, 2019 •

edited

Loading

robertalv commented May 5, 2019

Dillon-Brown commented May 6, 2019

SuiteBot commented Aug 27, 2020 •

edited

Loading

Fix JSON config upload #7256

Are you sure you want to change the base?

Fix JSON config upload #7256

Conversation

robertalv commented May 5, 2019 • edited Loading

Description

Motivation and Context

How To Test This

Types of changes

Final checklist

robertalv commented May 5, 2019

Dillon-Brown commented May 6, 2019

SuiteBot commented Aug 27, 2020 • edited Loading

robertalv commented May 5, 2019 •

edited

Loading

SuiteBot commented Aug 27, 2020 •

edited

Loading