CRM-13331 re-apply email send once fix but in a way more true to origina... #2

eileenmcnaughton · 2013-10-15T02:29:19Z

...l

…to ckeditor.

This is fixed in 4.3 although the fix used differs from this one

This causes Authorize.net to respect the clients configured preferences for whether a receipt should be sent out.

R3322 Recurring Contributions without contributions are not cancellable on the relevant contact summary tab (due to SQL join)

This is not a fix for the incompatibility - it reverses a CiviCRM fix (CRM-11304) to stop our sites from being broken by it. This patch is not appropriate for Joomla! sites but a real fix needs to be found

NB I use this on all our sites to avoid customising Summary.tpl

http://forum.civicrm.org/index.php/topic,19728.0.html

NB I think I closed the ticket because it seemed like a lot of work & this was easy to maintain in our repo

This increases the batch field limit on profile updates.

This has been discussed in forum but AFAIK no action taken on it. This makes PDF images work with full URLS

from early version Update upgraded reports per http://forum.civicrm.org/index.php?topic=20598.0

This is something we allow for our customers as they wish to pay some or all of pledges with recurring credit card contributions

This file is part of a potential refactor - it makes it possible to debug, test & submit without POST A.net IPN requests (e.g if it has failed due to a bug & you need to re-do it)

This is useful for debugging & would make a good future basis for refactoring the IPN to make it testable

…nts improved

…elationship search in advanced search usability issues

CRM-12750 ---------------------------------------- * CRM-12750: upgrade smarty to 2.6.27 http://issues.civicrm.org/jira/browse/CRM-12750 Conflicts: CRM/Admin/Form/Setting/Component.php

Conflicts: CRM/Contact/BAO/Query.php

…be mandatory Conflicts: api/v3/ContributionRecur.php

…r have a default - am defaulting to now

…ntributionTest.testCompleteTransaction

Conflicts: tests/phpunit/api/v3/MembershipTest.php Conflicts: api/v3/Membership.php tests/phpunit/api/v3/MembershipTest.php

Conflicts: CRM/Utils/Token.php

…rformance bottleneck

Conflicts: templates/CRM/Contact/Form/Task/EmailCommon.tpl

Conflicts: api/v3/utils.php tests/phpunit/api/v3/ContactTest.php

…tection and add to contribution.main to prevent double submits where people have no confirm page ---------------------------------------- * CRM-13379: Delete mailing from Archived, next page is Find Mailings http://issues.civicrm.org/jira/browse/CRM-13379 Conflicts: js/Common.js templates/CRM/Contact/Form/Task/EmailCommon.js

…nly formatting

…can be debugged

---------------------------------------- * CRM-13402: Improve debug logging around server unavailble (ditch the loop), missing contributions, mail store problems http://issues.civicrm.org/jira/browse/CRM-13402

…by custom group

---------------------------------------- * CRM-13460: Make the numeric rule checks stricter http://issues.civicrm.org/jira/browse/CRM-13460 Conflicts: tools/scripts/git/commit-msg

…bmit protection and add to contribution.main to prevent double submits where people have no confirm page" This reverts commit 7946e27.

…uble-send" This reverts commit ae92481. Conflicts: templates/CRM/Contact/Form/Task/EmailCommon.js

…inal

---------------------------------------- * CRM-12809: Reserved CustomGroups http://issues.civicrm.org/jira/browse/CRM-12809

---------------------------------------- * CRM-14052: Tagset fixes http://issues.civicrm.org/jira/browse/CRM-14052

torrance and others added 30 commits August 19, 2013 11:38

Confirmed 4.3 CRM-11998 Add font family, font size and color buttons …

c13cf1d

…to ckeditor.

Partial 4.3 CRM-11180 change log not showing for over 50 contacts

ac886ea

This is fixed in 4.3 although the fix used differs from this one

Proposed CRM-11801 configurable Authorize'net receipts

4d18926

This causes Authorize.net to respect the clients configured preferences for whether a receipt should be sent out.

Proposed (not in core) allow cancel of duff subscriptions

7e06051

R3322 Recurring Contributions without contributions are not cancellable on the relevant contact summary tab (due to SQL join)

Proposed CRM-11966 Html_purifier module incompatibility

44061e3

This is not a fix for the incompatibility - it reverses a CiviCRM fix (CRM-11304) to stop our sites from being broken by it. This patch is not appropriate for Joomla! sites but a real fix needs to be found

Proposed 4.3 CRM-12023 basic version of regions

781d68f

NB I use this on all our sites to avoid customising Summary.tpl

Proposed Create opt-out exemption token NOT IN CORE

4d329fe

http://forum.civicrm.org/index.php/topic,19728.0.html

Proposed CRM-10571 add smarty style modifiers

2b91397

NB I think I closed the ticket because it seemed like a lot of work & this was easy to maintain in our repo

Proposed CRM-10806 increase batch field update limit from 9 to 25

e2dcc31

This increases the batch field limit on profile updates.

Proposed (no JIRA) Allow remote pdfs in receipts

217201a

This has been discussed in forum but AFAIK no action taken on it. This makes PDF images work with full URLS

Proposed (not submitted) fix for reports that are munted after upgrade

eedeba1

from early version Update upgraded reports per http://forum.civicrm.org/index.php?topic=20598.0

Proposed allow recurring installations against pledges

96695a5

This is something we allow for our customers as they wish to pay some or all of pledges with recurring credit card contributions

Experimental CRM-12108 Add Authorize.net 2 ipn file

59bf444

This file is part of a potential refactor - it makes it possible to debug, test & submit without POST A.net IPN requests (e.g if it has failed due to a bug & you need to re-do it)

Experimental CRM 12108 add Paypal2 IPN code

57fb872

This is useful for debugging & would make a good future basis for refactoring the IPN to make it testable

Custom language for ABA. May not be required in 4.3 if word replaceme…

4299964

…nts improved

Confirmed CRM-10573 relationship date search + Proposed CRM-12619 - R…

12bfbcf

…elationship search in advanced search usability issues

4.4 CRM-12659 - Add Phone as a potential field to pledge detail report

f3d16fa

CRM-11331 action links on page 2 not working

5f5f689

CRM-12715 fix merge on multi-record entities

2820077

CRM-12715 backport multiple fields query fix on JOIN

58e7f5f

CRM-12750 upgrade smarty to 2.6.27

19a282f

CRM-12750 ---------------------------------------- * CRM-12750: upgrade smarty to 2.6.27 http://issues.civicrm.org/jira/browse/CRM-12750 Conflicts: CRM/Admin/Form/Setting/Component.php

fix on relationship search for inactive

fff705b

CRM-12715 remove extraneous line from backport

3a93c59

enotice fix

24c32b8

CRM-13059 fix relationship killing query

1b8e7db

Conflicts: CRM/Contact/BAO/Query.php

CRM-13074 - Failure on CMS user deletes contribution

f3fd813

CRM-12108 noticed type on 'skipDefault' was wrong

7719f25

CRM-12108 noticed api.contribution_recur.frequency_interval needs to …

79a31b6

…be mandatory Conflicts: api/v3/ContributionRecur.php

CRM-12108 noticed api.contribution_recur.start_date needs to be set o…

587355b

…r have a default - am defaulting to now

4.3 backport of payment processor api

fd574cf

eileenmcnaughton and others added 27 commits August 28, 2013 19:25

test fix on api_v3_ContributionTest.testCompleteTransaction api_v3_Co…

c031a84

…ntributionTest.testCompleteTransaction

CRM-13294 fix membership to support IN format on contact_id

9de0821

Conflicts: tests/phpunit/api/v3/MembershipTest.php Conflicts: api/v3/Membership.php tests/phpunit/api/v3/MembershipTest.php

Add Options to Membership search to print labels & send letters

ea7fdd7

Conflicts: CRM/Utils/Token.php

CRM-13296 alter backport for 4.2

642b022

CRM-13296 alter backport for 4.2 (another)

10b411e

backport of 4.4 return property handling

0b25718

Changes to group contact cache behaviour that worked on AUG to fix pe…

3464172

…rformance bottleneck

CRM-13296 fix token hook

527cd87

CRM-13331 - limited approach to preventing double click to double-send

ae92481

Conflicts: templates/CRM/Contact/Form/Task/EmailCommon.tpl

CRM-13332 print to error log if eWay hits an error

812c923

CRM-13331 turns out crmaccordian has been renamed in 4.4

4f62ab3

CRM-9493 only adjust main group contact cache rebuild fn

fa5419c

remove extra setting from backport of optional token

d147358

update contact api return handling from 4.4

820f43d

Conflicts: api/v3/utils.php tests/phpunit/api/v3/ContactTest.php

CRM-13372 truncate description string before passing to paypal

11e62d6

CRM-13397 js.common also backport js ts function, other changes are o…

8603e0a

…nly formatting

emailProcessor add details about the account that failed

c2cad2a

Profile_form add error logging on rollback so transactions rollbacks …

dd4ae37

…can be debugged

CRM-13402 error handling, prevent loop if mysql server has 'gone away'

199f9e7

---------------------------------------- * CRM-13402: Improve debug logging around server unavailble (ditch the loop), missing contributions, mail store problems http://issues.civicrm.org/jira/browse/CRM-13402

character tweak in log msg

2ddee1a

CRM-13426 Fatal error on search that includes a smart group created …

adabd96

…by custom group

CRM-13460 - Add is_numeric checks and test coverage

6b959cd

---------------------------------------- * CRM-13460: Make the numeric rule checks stricter http://issues.civicrm.org/jira/browse/CRM-13460 Conflicts: tools/scripts/git/commit-msg

Revert "CRM-13379 js, contribution form - generalise button double su…

823bbc3

…bmit protection and add to contribution.main to prevent double submits where people have no confirm page" This reverts commit 7946e27.

Revert "CRM-13331 - limited approach to preventing double click to do…

37ceb34

…uble-send" This reverts commit ae92481. Conflicts: templates/CRM/Contact/Form/Task/EmailCommon.js

CRM-13331 re-apply email send once fix but in a way more true to orig…

896fa45

…inal

CRM-13397 dont allow contribution pages to submit more than once

92385dd

eileenmcnaughton pushed a commit that referenced this pull request Feb 6, 2014

-- CRM-12809 #1, #2 and #3

d06700a

---------------------------------------- * CRM-12809: Reserved CustomGroups http://issues.civicrm.org/jira/browse/CRM-12809

eileenmcnaughton pushed a commit that referenced this pull request Feb 6, 2014

fixes #1 and #2 for CRM-14052

0cc0faa

---------------------------------------- * CRM-14052: Tagset fixes http://issues.civicrm.org/jira/browse/CRM-14052

eileenmcnaughton pushed a commit that referenced this pull request Feb 6, 2014

worked on #2 fixes, CRM-14052

b3caa3a

---------------------------------------- * CRM-14052: Tagset fixes http://issues.civicrm.org/jira/browse/CRM-14052

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CRM-13331 re-apply email send once fix but in a way more true to origina... #2

CRM-13331 re-apply email send once fix but in a way more true to origina... #2

eileenmcnaughton commented Oct 15, 2013

CRM-13331 re-apply email send once fix but in a way more true to origina... #2

Are you sure you want to change the base?

CRM-13331 re-apply email send once fix but in a way more true to origina... #2

Conversation

eileenmcnaughton commented Oct 15, 2013