civicrm-core.git
7 years agoCRM-20754 - Clear memory leak in CSV CLI import
Jon goldberg [Wed, 21 Jun 2017 14:07:31 +0000 (10:07 -0400)]
CRM-20754 - Clear memory leak in CSV CLI import

7 years agoMerge pull request #10500 from fuzionnz/rephrase_poormans
Eileen McNaughton [Tue, 13 Jun 2017 22:42:20 +0000 (10:42 +1200)]
Merge pull request #10500 from fuzionnz/rephrase_poormans

There's a better way to say it than "poor man's".

7 years agoMerge pull request #10481 from seanmadsen/CRM-20698
colemanw [Tue, 13 Jun 2017 15:12:28 +0000 (11:12 -0400)]
Merge pull request #10481 from seanmadsen/CRM-20698

CRM-20698 - better CSS for disabled table rows

7 years agoMerge pull request #10484 from JMAConsulting/CRM-20706
Monish Deb [Tue, 13 Jun 2017 08:14:39 +0000 (13:44 +0530)]
Merge pull request #10484 from JMAConsulting/CRM-20706

CRM-20706: Notice error on using Contribution.Getfield API

7 years agoThere's a better way to say it than "poor man's".
Chris Burgess [Tue, 13 Jun 2017 02:38:37 +0000 (14:38 +1200)]
There's a better way to say it than "poor man's".

"Makeshift", "simplistic" or "inferior" are effective ways to describe a solution you think is less than ideal.

The phrase "poor man's" suggests poor people get/deserve inferior things, which IMO is incongruous with CiviCRM's aims.

Avoiding that terminology won't just be inclusive, it will better express what you really meant!

This PR contains comment changes only.

7 years agoMerge pull request #10433 from JMAConsulting/CRM-20651
Eileen McNaughton [Mon, 12 Jun 2017 22:05:13 +0000 (10:05 +1200)]
Merge pull request #10433 from JMAConsulting/CRM-20651

CRM-20651: Change partial_amount_pay to partial_amount_to_pay for Partial Payment workflow

7 years agoMerge pull request #10473 from mickadoo/CRM-20687-remove-issue-number-variables
Eileen McNaughton [Mon, 12 Jun 2017 20:08:26 +0000 (08:08 +1200)]
Merge pull request #10473 from mickadoo/CRM-20687-remove-issue-number-variables

CRM-20687: Invert logic and rename variable to remove issue reference

7 years agoMerge pull request #10494 from seamuslee001/CRM-20243-jquery
colemanw [Mon, 12 Jun 2017 14:40:15 +0000 (10:40 -0400)]
Merge pull request #10494 from seamuslee001/CRM-20243-jquery

CRM-20243 Upgrade jquery to 1.12

7 years agoMerge pull request #10453 from PalanteJon/CRM-19610-test
Eileen McNaughton [Mon, 12 Jun 2017 08:01:04 +0000 (20:01 +1200)]
Merge pull request #10453 from PalanteJon/CRM-19610-test

Test for CRM-19610

7 years agoMerge pull request #10491 from seamuslee001/CRM-19610
Eileen McNaughton [Mon, 12 Jun 2017 07:53:52 +0000 (19:53 +1200)]
Merge pull request #10491 from seamuslee001/CRM-19610

CRM-19610 : Search preferences changes are not updated

7 years agoMerge pull request #10490 from seamuslee001/CRM-20678
Eileen McNaughton [Mon, 12 Jun 2017 05:05:17 +0000 (17:05 +1200)]
Merge pull request #10490 from seamuslee001/CRM-20678

CRM-20678 Fix issue where repeattransaction was creating transactions…

7 years agoMerge pull request #10489 from seamuslee001/CRM-20715
Eileen McNaughton [Mon, 12 Jun 2017 04:59:52 +0000 (16:59 +1200)]
Merge pull request #10489 from seamuslee001/CRM-20715

CRM-20715 Add Index on is_deceased column

7 years agoCRM-20243 Upgrade jquery to 1.12
Seamus Lee [Mon, 12 Jun 2017 03:01:42 +0000 (13:01 +1000)]
CRM-20243 Upgrade jquery to 1.12

7 years agoAllow for value to be a string '0'
Seamus Lee [Sun, 11 Jun 2017 22:08:21 +0000 (08:08 +1000)]
Allow for value to be a string '0'

7 years agoOnly ensure that we check if the value passed is 0 and the db value is 0 or NULL
Seamus Lee [Sun, 11 Jun 2017 04:23:49 +0000 (14:23 +1000)]
Only ensure that we check if the value passed is 0 and the db value is 0 or NULL

7 years agoCRM-19610 : Search preferences changes are not updated
Jitendra Purohit [Tue, 30 May 2017 11:36:55 +0000 (17:06 +0530)]
CRM-19610 : Search preferences changes are not updated

7 years agoMerge pull request #9779 from WeMoveEU/CRM-19963
Tim Otten [Sun, 11 Jun 2017 14:34:58 +0000 (16:34 +0200)]
Merge pull request #9779 from WeMoveEU/CRM-19963

CRM-19963 - Use translated processor name for Paypal in all comparisons

7 years agoMerge pull request #10227 from WeMoveEU/CRM-20309
Tim Otten [Sun, 11 Jun 2017 14:15:12 +0000 (16:15 +0200)]
Merge pull request #10227 from WeMoveEU/CRM-20309

CRM-20309 Schedule mailing jobs at increasing times

7 years agoCRM-20678 Fix issue where repeattransaction was creating transactions in incorrect...
Seamus Lee [Sun, 11 Jun 2017 04:12:09 +0000 (14:12 +1000)]
CRM-20678 Fix issue where repeattransaction was creating transactions in incorrect currency

7 years agoMerge pull request #10488 from civicrm/4.7.20-rc
Eileen McNaughton [Sun, 11 Jun 2017 02:38:16 +0000 (14:38 +1200)]
Merge pull request #10488 from civicrm/4.7.20-rc

4.7.20 rc

7 years agoAdd Index on id_deceased column
Seamus Lee [Sun, 11 Jun 2017 01:38:00 +0000 (11:38 +1000)]
Add Index on id_deceased column

7 years agoMerge pull request #10398 from agh1/4.7.20-releasenotes
Tim Otten [Fri, 9 Jun 2017 20:31:31 +0000 (22:31 +0200)]
Merge pull request #10398 from agh1/4.7.20-releasenotes

4.7.20 release notes

7 years agoCRM-20706: Notice error on using Contribution.getfield API
deb.monish [Fri, 9 Jun 2017 08:57:43 +0000 (14:27 +0530)]
CRM-20706: Notice error on using Contribution.getfield API

7 years agoMerge pull request #10482 from colemanw/CRM-20091
colemanw [Thu, 8 Jun 2017 14:25:59 +0000 (10:25 -0400)]
Merge pull request #10482 from colemanw/CRM-20091

CRM-20091 - api.CustomValue.gettree - Supply defaults and remove unknown array keys

7 years agoMerge pull request #10360 from yashodha/CRM-20552
Yashodha Chaku [Thu, 8 Jun 2017 07:05:18 +0000 (12:35 +0530)]
Merge pull request #10360 from yashodha/CRM-20552

CRM- 20552

7 years agoCRM-20091 - api.CustomValue.gettree - Supply defaults and remove unknown array keys
Coleman Watts [Thu, 8 Jun 2017 02:51:43 +0000 (22:51 -0400)]
CRM-20091 - api.CustomValue.gettree - Supply defaults and remove unknown array keys

7 years agoCRM-20698 - better CSS for disabled table rows
Sean Madsen [Wed, 7 Jun 2017 23:36:29 +0000 (17:36 -0600)]
CRM-20698 - better CSS for disabled table rows

7 years agorelease notes 4.7.20 all done
Andrew Hunt [Wed, 7 Jun 2017 07:00:45 +0000 (03:00 -0400)]
release notes 4.7.20 all done

7 years ago4.7.20 release notes - complete
Andrew Hunt [Wed, 7 Jun 2017 05:53:13 +0000 (01:53 -0400)]
4.7.20 release notes - complete

7 years ago4.7.20 release notes: add boilerplate, dates
Andrew Hunt [Mon, 22 May 2017 23:34:34 +0000 (19:34 -0400)]
4.7.20 release notes: add boilerplate, dates

7 years ago4.7.20 release notes - late changes
Andrew Hunt [Wed, 7 Jun 2017 06:25:55 +0000 (02:25 -0400)]
4.7.20 release notes - late changes

7 years ago4.7.20 release notes: from script 5/22
Andrew Hunt [Mon, 22 May 2017 23:32:23 +0000 (19:32 -0400)]
4.7.20 release notes: from script 5/22

7 years agoMerge pull request #10471 from JMAConsulting/CRM-20684
colemanw [Tue, 6 Jun 2017 18:49:54 +0000 (14:49 -0400)]
Merge pull request #10471 from JMAConsulting/CRM-20684

CRM-20684: Standalone form for contact bulk actions

7 years agoMerge pull request #10428 from JMAConsulting/CRM-20226
colemanw [Tue, 6 Jun 2017 17:55:35 +0000 (13:55 -0400)]
Merge pull request #10428 from JMAConsulting/CRM-20226

CRM-20226: Parent Group do not inherit child group contacts

7 years agoCRM-20687: Invert logic and rename variable to remove issue reference
mickadoo [Tue, 6 Jun 2017 09:28:57 +0000 (10:28 +0100)]
CRM-20687: Invert logic and rename variable to remove issue reference

7 years agoCRM-20684: Standalone form for contact bulk actions
deb.monish [Tue, 6 Jun 2017 07:32:02 +0000 (13:02 +0530)]
CRM-20684: Standalone form for contact bulk actions

7 years agoMerge pull request #10464 from kryptothesuperdog/CRM-20679
Tim Otten [Mon, 5 Jun 2017 19:42:05 +0000 (12:42 -0700)]
Merge pull request #10464 from kryptothesuperdog/CRM-20679

CRM-20679 Spin the civi logo while quicksearch is running

7 years agoMerge pull request #10470 from seamuslee001/master
Tim Otten [Mon, 5 Jun 2017 06:51:02 +0000 (23:51 -0700)]
Merge pull request #10470 from seamuslee001/master

(NFC) Fix fileperms

7 years ago(NFC) Fix fileperms
Seamus Lee [Mon, 5 Jun 2017 05:48:56 +0000 (15:48 +1000)]
(NFC) Fix fileperms

7 years agoMerge pull request #10469 from civicrm/4.7.20-rc
Eileen McNaughton [Mon, 5 Jun 2017 00:22:07 +0000 (17:22 -0700)]
Merge pull request #10469 from civicrm/4.7.20-rc

4.7.20 rc

7 years agoMerge pull request #10468 from seamuslee001/CRM-20604
Tim Otten [Sun, 4 Jun 2017 23:09:59 +0000 (16:09 -0700)]
Merge pull request #10468 from seamuslee001/CRM-20604

CRM-20604 FIx issue where getRegistrationContactID cannot be a protec…

7 years agoMerge pull request #10181 from jmcclelland/CRM-20381
Tim Otten [Sun, 4 Jun 2017 22:44:17 +0000 (15:44 -0700)]
Merge pull request #10181 from jmcclelland/CRM-20381

CRM-20381 - ensure option to NOT geocode on imports is respected.

7 years agoCRM-20604 FIx issue where getRegistrationContactID cannot be a protected class must...
Seamus Lee [Sun, 4 Jun 2017 21:26:35 +0000 (07:26 +1000)]
CRM-20604 FIx issue where getRegistrationContactID cannot be a protected class must be public

7 years agoCRM-20381 - syntax - closing brace of class needs empty line.
Jamie McClelland [Sun, 4 Jun 2017 00:08:43 +0000 (20:08 -0400)]
CRM-20381 - syntax - closing brace of class needs empty line.

7 years agoCRM-20679 Spin the civi logo while quicksearch is running
kryptothesuperdog [Sat, 3 Jun 2017 21:18:35 +0000 (22:18 +0100)]
CRM-20679 Spin the civi logo while quicksearch is running

7 years agoMerge pull request #10460 from colemanw/CRM-20091
colemanw [Sat, 3 Jun 2017 13:06:10 +0000 (08:06 -0500)]
Merge pull request #10460 from colemanw/CRM-20091

CRM-20091 - Add customValue.gettree api

7 years agoCRM-20381 - sytax fixes.
Jamie McClelland [Sat, 3 Jun 2017 01:58:28 +0000 (21:58 -0400)]
CRM-20381 - sytax fixes.

7 years agoCRM-20381 - use '' to indicate no geocode method
Jamie McClelland [Sat, 3 Jun 2017 01:50:11 +0000 (21:50 -0400)]
CRM-20381 - use '' to indicate no geocode method

'' means empty, NULL means not set, which confuses MagicMerge.

7 years agoCRM-20091 - Specify return params from getTree
Coleman Watts [Fri, 2 Jun 2017 22:08:34 +0000 (18:08 -0400)]
CRM-20091 - Specify return params from getTree

7 years agoMerge pull request #10462 from civicrm/4.7.20-rc
Eileen McNaughton [Fri, 2 Jun 2017 23:03:10 +0000 (16:03 -0700)]
Merge pull request #10462 from civicrm/4.7.20-rc

4.7.20 rc

7 years agoMerge pull request #10425 from totten/master-ang-15
Tim Otten [Fri, 2 Jun 2017 21:44:18 +0000 (14:44 -0700)]
Merge pull request #10425 from totten/master-ang-15

CRM-20243 - bower.json - Upgrade to Angular 1.5.x

7 years agoMerge pull request #10459 from mlutfy/4.7.20-rc-crm20581
Tim Otten [Fri, 2 Jun 2017 19:22:02 +0000 (12:22 -0700)]
Merge pull request #10459 from mlutfy/4.7.20-rc-crm20581

CRM-20581 - Allow access to 'get' on StateProvince API with 'Access CiviEvent' - 4.20-rc

7 years agoCRM-20091 - Add customValue.gettree api
Coleman Watts [Fri, 2 Jun 2017 17:43:54 +0000 (13:43 -0400)]
CRM-20091 - Add customValue.gettree api

7 years agostyle fix
Jon goldberg [Tue, 16 May 2017 17:59:38 +0000 (13:59 -0400)]
style fix

7 years agoCRM-20581 - Allow access to 'get' on StateProvince API with 'Access CiviCRM', not...
Jon goldberg [Tue, 16 May 2017 16:59:05 +0000 (12:59 -0400)]
CRM-20581 - Allow access to 'get' on StateProvince API with 'Access CiviCRM', not 'Administer CiviCRM'

7 years agoMerge pull request #10451 from totten/master-null-caseid
colemanw [Fri, 2 Jun 2017 01:21:41 +0000 (20:21 -0500)]
Merge pull request #10451 from totten/master-null-caseid

CRM-20642 - Activity.get - Fix "IS NULL" filtering for case_id, tag_id, file_id

7 years agoTest for CRM-19610
Jon goldberg [Thu, 1 Jun 2017 09:46:58 +0000 (05:46 -0400)]
Test for CRM-19610

7 years agoMerge pull request #10436 from JMAConsulting/CRM-20655
Eileen McNaughton [Thu, 1 Jun 2017 02:31:46 +0000 (14:31 +1200)]
Merge pull request #10436 from JMAConsulting/CRM-20655

CRM-20655, fixed notice error

7 years agoCRM-20642 - Activity.get - Fix "IS NULL" filtering for case_id, tag_id, file_id
Tim Otten [Wed, 31 May 2017 22:45:27 +0000 (15:45 -0700)]
CRM-20642 - Activity.get - Fix "IS NULL" filtering for case_id, tag_id, file_id

7 years agoCRM-20642 - Activity.get - Add test for `case_id IS NULL`
Tim Otten [Wed, 31 May 2017 22:42:47 +0000 (15:42 -0700)]
CRM-20642 - Activity.get - Add test for `case_id IS NULL`

CRM-20642 requires an option for displaying "activities which are *not*
case-related" (i.e.  `case_id IS NULL`) .  This adds a unit-test for
ensuring that the filter works as expected.

7 years agoMerge pull request #10445 from civicrm/4.7.20-rc
Eileen McNaughton [Wed, 31 May 2017 05:40:18 +0000 (17:40 +1200)]
Merge pull request #10445 from civicrm/4.7.20-rc

4.7.20 rc

7 years agoMerge pull request #10444 from seamuslee001/CRM-20662
Eileen McNaughton [Tue, 30 May 2017 23:11:46 +0000 (11:11 +1200)]
Merge pull request #10444 from seamuslee001/CRM-20662

CRM-20662 Ensure that the system only tries populating the domain_id …

7 years agoCRM-20662 Ensure that the system only tries populating the domain_id field if there...
Seamus Lee [Tue, 30 May 2017 22:15:10 +0000 (08:15 +1000)]
CRM-20662 Ensure that the system only tries populating the domain_id field if there is only 1 domain in the system

7 years agoMerge pull request #10438 from colemanw/CRM-20475
colemanw [Tue, 30 May 2017 21:56:40 +0000 (16:56 -0500)]
Merge pull request #10438 from colemanw/CRM-20475

CRM-20475 - Add missing phone info to case api

7 years agoMerge pull request #10437 from highfalutin/config-help-text
Monish Deb [Tue, 30 May 2017 05:15:59 +0000 (10:45 +0530)]
Merge pull request #10437 from highfalutin/config-help-text

Add help text to civicrm.settings.php re: DSNs containing quotes/backslashes

7 years agoCRM-20475 - Add missing phone info to case api
Coleman Watts [Tue, 30 May 2017 01:08:24 +0000 (21:08 -0400)]
CRM-20475 - Add missing phone info to case api

7 years agoAdd help text to civicrm.settings.php regarding DSNs containing quotes/backslashes
Noah Miller [Mon, 29 May 2017 22:33:58 +0000 (15:33 -0700)]
Add help text to civicrm.settings.php regarding DSNs containing quotes/backslashes

7 years agoMerge pull request #10404 from chrisfromredfin/crm-20604
Tim Otten [Mon, 29 May 2017 21:53:30 +0000 (14:53 -0700)]
Merge pull request #10404 from chrisfromredfin/crm-20604

method cannot be a protected static

7 years agoCRM-20655, fixed notice error
Pradeep Nayak [Mon, 29 May 2017 20:43:02 +0000 (02:13 +0530)]
CRM-20655, fixed notice error

----------------------------------------
* CRM-20655: Notice error on batch listing
  https://issues.civicrm.org/jira/browse/CRM-20655

7 years agoCRM-20651: Change partial_amount_pay to partial_amount_to_pay for Partial Payment...
deb.monish [Mon, 29 May 2017 15:29:13 +0000 (20:59 +0530)]
CRM-20651: Change partial_amount_pay to partial_amount_to_pay for Partial Payment workflow

7 years agoCRM-20226: Parent Group do not inherit child group contacts
deb.monish [Sat, 27 May 2017 20:31:07 +0000 (02:01 +0530)]
CRM-20226: Parent Group do not inherit child group contacts

7 years agoMerge pull request #10366 from JMAConsulting/CRM-20590
colemanw [Sat, 27 May 2017 14:52:31 +0000 (09:52 -0500)]
Merge pull request #10366 from JMAConsulting/CRM-20590

CRM-20590, add pre and post hook invocation for delete and create/edi…

7 years agoMerge pull request #10421 from davejenx/access-mailing-reports
Tim Otten [Sat, 27 May 2017 01:53:36 +0000 (18:53 -0700)]
Merge pull request #10421 from davejenx/access-mailing-reports

CRM-20442 - Improve user checking for mailing reports

7 years agoCRM-20243 - bower.json - Upgrade to Angular 1.5.x
Tim Otten [Fri, 26 May 2017 01:00:47 +0000 (18:00 -0700)]
CRM-20243 - bower.json - Upgrade to Angular 1.5.x

Two reasons:
 * Angular 1.3.x is no longer maintained.
 * This is one step toward bringing the CiviCRM and CiviHR codebases into alignment.

7 years agoImprove user checking for mailing reports
Dave Jenkins [Fri, 26 May 2017 17:15:46 +0000 (18:15 +0100)]
Improve user checking for mailing reports

7 years agoMerge pull request #10089 from lcdservices/CRM-20370
Monish Deb [Fri, 26 May 2017 10:59:44 +0000 (16:29 +0530)]
Merge pull request #10089 from lcdservices/CRM-20370

CRM-20370 click and open reports - add date fields

7 years agoadditional fix
deb.monish [Thu, 25 May 2017 18:15:04 +0000 (23:45 +0530)]
additional fix

7 years agoCRM-20370 click and open reports - add date fields
Brian Shaughnessy [Sun, 2 Apr 2017 02:50:58 +0000 (22:50 -0400)]
CRM-20370 click and open reports - add date fields

7 years agoMerge pull request #10416 from totten/master-kernel-docblock
Tim Otten [Thu, 25 May 2017 18:14:14 +0000 (11:14 -0700)]
Merge pull request #10416 from totten/master-kernel-docblock

(NFC) Civi\API\Kernel - Add more docblocks

7 years ago(NFC) Civi\API\Kernel - Add more docblocks
Tim Otten [Thu, 25 May 2017 16:47:47 +0000 (09:47 -0700)]
(NFC) Civi\API\Kernel - Add more docblocks

7 years agoMerge pull request #10344 from GinkgoFJG/CRM-12059
Eileen McNaughton [Wed, 24 May 2017 21:29:22 +0000 (09:29 +1200)]
Merge pull request #10344 from GinkgoFJG/CRM-12059

CRM-12059: Added support for hook_civicrm_permissions() on Joomla.

7 years agoupdate getRegistrationContactID to include public visibility so it's usable as a...
Christopher J. Wells [Wed, 24 May 2017 16:24:21 +0000 (12:24 -0400)]
update getRegistrationContactID to include public visibility so it's usable as a static

7 years agoCRM-12059: Replaced bad conditional (always true) with an accurate, more readable...
Frank J. Gómez [Wed, 24 May 2017 14:11:38 +0000 (10:11 -0400)]
CRM-12059: Replaced bad conditional (always true) with an accurate, more readable, and more efficient one.

Added some code documentation and replaced comments about specific Joomla methods with references to external resources.

7 years agoMerge pull request #10385 from seamuslee001/CRM-20561-auth
Tim Otten [Tue, 23 May 2017 21:50:04 +0000 (14:50 -0700)]
Merge pull request #10385 from seamuslee001/CRM-20561-auth

CRM-20561 Use Composer to install Auth_SASL

7 years agoMerge pull request #10406 from civicrm/4.7.20-rc
Eileen McNaughton [Tue, 23 May 2017 19:50:51 +0000 (07:50 +1200)]
Merge pull request #10406 from civicrm/4.7.20-rc

4.7.20 rc

7 years agoMerge pull request #10402 from jitendrapurohit/CRM-20591-rc
Eileen McNaughton [Tue, 23 May 2017 19:50:02 +0000 (07:50 +1200)]
Merge pull request #10402 from jitendrapurohit/CRM-20591-rc

RC fix for CRM-20591: Fix class_name on update of payment processor

7 years agoMerge pull request #10381 from totten/master-purify
Tim Otten [Tue, 23 May 2017 17:34:57 +0000 (10:34 -0700)]
Merge pull request #10381 from totten/master-purify

CRM-20600 - Purify Angular HTML

7 years agomethod cannot be a protected static when called from CRM/Event/Form/Registration...
Christopher J. Wells [Tue, 23 May 2017 17:15:55 +0000 (13:15 -0400)]
method cannot be a protected static when called from CRM/Event/Form/Registration/AdditionalParticipant.php

7 years agoCRM-20590, fixed params for api call
Pradeep Nayak [Tue, 23 May 2017 12:57:47 +0000 (18:27 +0530)]
CRM-20590, fixed params for api call

----------------------------------------
* CRM-20590: Add pre and post hook for EntityBatch
  https://issues.civicrm.org/jira/browse/CRM-20590

7 years agoCRM-20590. moved entity batch function to entityBatch file
Pradeep Nayak [Tue, 23 May 2017 11:03:55 +0000 (16:33 +0530)]
CRM-20590. moved entity batch function to entityBatch file

----------------------------------------
* CRM-20590: Add pre and post hook for EntityBatch
  https://issues.civicrm.org/jira/browse/CRM-20590

7 years agoCRM-20590, add pre and post hook invocation for delete and create/edit option
Pradeep Nayak [Tue, 16 May 2017 23:04:38 +0000 (04:34 +0530)]
CRM-20590, add pre and post hook invocation for delete and create/edit option

----------------------------------------
* CRM-20590: Add pre and post hook for EntityBatch
  https://issues.civicrm.org/jira/browse/CRM-20590

7 years agoCRM-20591: Fix class_name on update of payment processor
Jitendra Purohit [Tue, 23 May 2017 07:07:39 +0000 (12:37 +0530)]
CRM-20591: Fix class_name on update of payment processor

7 years agoMerge pull request #10288 from colemanw/CRM-20097
Tim Otten [Tue, 23 May 2017 02:44:24 +0000 (19:44 -0700)]
Merge pull request #10288 from colemanw/CRM-20097

CRM-20097 - Tweaks and fixes

7 years agoMerge pull request #10400 from civicrm/4.7.20-rc
Eileen McNaughton [Tue, 23 May 2017 02:17:19 +0000 (14:17 +1200)]
Merge pull request #10400 from civicrm/4.7.20-rc

4.7.20 rc

7 years agoMerge pull request #10399 from seamuslee001/multilingual_fix
Eileen McNaughton [Tue, 23 May 2017 02:11:55 +0000 (14:11 +1200)]
Merge pull request #10399 from seamuslee001/multilingual_fix

CRM-20623 Ensure that after using the Add Column method that Multilin…

7 years agoCRM-20263 Ensure that after using the Add Column method that Multilingual schema...
Seamus Lee [Tue, 23 May 2017 00:00:56 +0000 (10:00 +1000)]
CRM-20263 Ensure that after using the Add Column method that Multilingual schema is rebuilt properly

7 years agoMerge pull request #10396 from JMAConsulting/CRM-20618
Eileen McNaughton [Mon, 22 May 2017 19:58:10 +0000 (07:58 +1200)]
Merge pull request #10396 from JMAConsulting/CRM-20618

CRM-20618, build image and url if contact id is present

7 years agoMerge pull request #10364 from JMAConsulting/CRM-20588
colemanw [Mon, 22 May 2017 14:52:11 +0000 (09:52 -0500)]
Merge pull request #10364 from JMAConsulting/CRM-20588

CRM-20588, Add Pre and Post hook for Batch

7 years agoMerge pull request #10391 from systopia/CRM-20606
colemanw [Mon, 22 May 2017 13:18:15 +0000 (08:18 -0500)]
Merge pull request #10391 from systopia/CRM-20606

corrected Austrian province names (CRM-20606)

7 years agoMerge pull request #10367 from JMAConsulting/CRM-20585
colemanw [Mon, 22 May 2017 12:59:09 +0000 (07:59 -0500)]
Merge pull request #10367 from JMAConsulting/CRM-20585

CRM-20585 -Correct the from and to accounts for deferred revenue transactions