civicrm-core.git
8 years agoFix caching bug in DAO commit PR
eileen [Thu, 11 Aug 2016 05:07:00 +0000 (17:07 +1200)]
Fix caching bug in DAO commit PR

8 years agoCRM-19130 - Add test for regression in CRM_Core_BAO_Cache
Tim Otten [Thu, 11 Aug 2016 20:20:56 +0000 (13:20 -0700)]
CRM-19130 - Add test for regression in CRM_Core_BAO_Cache

The earlier patch for CRM-19130 broke support for reading individual items
from the SQL cache.  Although the test-suite hits the cache layer a lot
(e.g.  CRM_Utils_Cache_SqlGroupTest), the bug wasn't exposed by other tests
because (a) caches are replicated in-memory and in SQL (b) caches are often
read in batch mode.

This explicitly flushes the in-memory cache and reads the SQL cache.

8 years agoCRM-19130 - Regen DAOs with updated fields() and links()
Tim Otten [Fri, 29 Jul 2016 02:41:18 +0000 (19:41 -0700)]
CRM-19130 - Regen DAOs with updated fields() and links()

8 years agoCRM-19130 - xml/templates/dao.tpl - Fire events for fields() and links()
Tim Otten [Fri, 29 Jul 2016 02:37:55 +0000 (19:37 -0700)]
CRM-19130 - xml/templates/dao.tpl - Fire events for fields() and links()

8 years agoCRM-19130 - CRM_Core_BAO_Cache - Do not rely on DAO::fields()
Tim Otten [Fri, 29 Jul 2016 01:13:52 +0000 (18:13 -0700)]
CRM-19130 - CRM_Core_BAO_Cache - Do not rely on DAO::fields()

For CRM-19130, we want all calls to `fields()` to be hookable, which means
that `fields()` can only run in a bootstrapped system (where hooks are
reliably working).

This should be *mostly* OK.  However, during bootstrap, we rely on the SQL
cache which means that `CRM_Core_BAO_Cache` must be operational -- even if
`fields()` cannot be used.  Consequently, the DAO-based query-builder cannot
be used.

8 years agoRegen CRM/Core/DAO/AllCoreTables.data.php
Tim Otten [Thu, 28 Jul 2016 22:51:11 +0000 (15:51 -0700)]
Regen CRM/Core/DAO/AllCoreTables.data.php

8 years agoCRM_Core_CodeGen_Reflection::needsUpdate() - Imitate DAO's check
Tim Otten [Thu, 28 Jul 2016 22:49:36 +0000 (15:49 -0700)]
CRM_Core_CodeGen_Reflection::needsUpdate() - Imitate DAO's check

The old check was prone to false-positives if you make unrelated changes in
`CRM/Core/CodeGen/*` and false-negatives when some hacks the underlying
file.  It's now more diligent.

8 years agoRegen DAOs to remove unnecessary imports
Tim Otten [Thu, 28 Jul 2016 22:13:47 +0000 (15:13 -0700)]
Regen DAOs to remove unnecessary imports

8 years agoxml/templates/dao.tpl - Remove unused imports
Tim Otten [Thu, 28 Jul 2016 22:13:23 +0000 (15:13 -0700)]
xml/templates/dao.tpl - Remove unused imports

8 years agoRegen DAOs with new fieldKeys()
Tim Otten [Thu, 28 Jul 2016 22:10:30 +0000 (15:10 -0700)]
Regen DAOs with new fieldKeys()

8 years agoxml/templates/dao.tpl - Simplify fieldKeys()
Tim Otten [Thu, 28 Jul 2016 21:41:58 +0000 (14:41 -0700)]
xml/templates/dao.tpl - Simplify fieldKeys()

The information here is redundant with the information in `fields()`. We
can make `fields()` more hookable (and reduce SLOC) by generating this.

QA note: To test that these patches had no functional impact, I used some
helper scripts: https://gist.github.com/totten/4473975264fc2a788391d3c5ef5bf18b

Fun fact: This is net-reduction of ~2,500 SLOC.

8 years agoRegen DAOs with new import() / export()
Tim Otten [Thu, 28 Jul 2016 20:31:12 +0000 (13:31 -0700)]
Regen DAOs with new import() / export()

8 years agoxml/templates/dao.tpl - Centralize export() / import() logic
Tim Otten [Thu, 28 Jul 2016 19:58:46 +0000 (12:58 -0700)]
xml/templates/dao.tpl - Centralize export() / import() logic

There's repetitive bugginess in these functions. We can reduce SLOC and
gain leverage by moving the guts to a central function.

QA note: To test that these patches had no functional impact, I used some
helper scripts: https://gist.github.com/totten/4473975264fc2a788391d3c5ef5bf18b

Fun fact: This is net-reduction of ~6,000 SLOC.

8 years agofixup CRM-14885 - Import DAOs
Tim Otten [Thu, 28 Jul 2016 00:21:26 +0000 (17:21 -0700)]
fixup CRM-14885 - Import DAOs

8 years agoCRM_Core_CodeGen_DAO::needsUpdate - Compare full code (modulo whitespace)
Tim Otten [Thu, 28 Jul 2016 00:18:18 +0000 (17:18 -0700)]
CRM_Core_CodeGen_DAO::needsUpdate - Compare full code (modulo whitespace)

8 years agoCRM_Core_CodeGen_Util_Smarty - Allow generating templates without a special bootstrap
Tim Otten [Thu, 28 Jul 2016 00:15:50 +0000 (17:15 -0700)]
CRM_Core_CodeGen_Util_Smarty - Allow generating templates without a special bootstrap

8 years agoCRM_Core_DAO_AllCoreTables - Cleanup. Docblocks.
Tim Otten [Wed, 27 Jul 2016 21:40:47 +0000 (14:40 -0700)]
CRM_Core_DAO_AllCoreTables - Cleanup. Docblocks.

8 years agoCRM_Core_DAO_AllCoreTables - Make persistent. Split data and logic.
Tim Otten [Wed, 27 Jul 2016 21:26:49 +0000 (14:26 -0700)]
CRM_Core_DAO_AllCoreTables - Make persistent. Split data and logic.

Changes:
 * Before, CRM_Core_DAO_AllCoreTables was generated with a mix of logic and data.
   Now, the class is a static file, and only the data is generated. This makes it
   easier to develop.
 * Before, the file was not commited. As with the DAOs, it is now committed.

8 years agoCRM_Core_CodeGen_BaseTask::extractRegex() - Pull up helper from subclass
Tim Otten [Wed, 27 Jul 2016 21:22:29 +0000 (14:22 -0700)]
CRM_Core_CodeGen_BaseTask::extractRegex() - Pull up helper from subclass

8 years agoCRM-14885 - Import DAO's
Tim Otten [Wed, 27 Jul 2016 08:26:52 +0000 (01:26 -0700)]
CRM-14885 - Import DAO's

8 years agoCRM-14885 - CRM_Core_CodeGen_FreshnessTest - Add unit-test to ensure DAO's are current
Tim Otten [Wed, 27 Jul 2016 08:18:16 +0000 (01:18 -0700)]
CRM-14885 - CRM_Core_CodeGen_FreshnessTest - Add unit-test to ensure DAO's are current

8 years agoCRM-14885 - CRM_Core_CodeGen_Main - Remove unused functions
Tim Otten [Wed, 27 Jul 2016 07:35:53 +0000 (00:35 -0700)]
CRM-14885 - CRM_Core_CodeGen_Main - Remove unused functions

8 years agoCRM-14885 - CRM_Core_CodeGen_DAO - Use checksum to avoid recomputation
Tim Otten [Wed, 27 Jul 2016 07:26:59 +0000 (00:26 -0700)]
CRM-14885 - CRM_Core_CodeGen_DAO - Use checksum to avoid recomputation

8 years agoCRM-14885 - CRM_Core_CodeGen - Allow tasks to define `needsUpdate()`
Tim Otten [Wed, 27 Jul 2016 07:26:00 +0000 (00:26 -0700)]
CRM-14885 - CRM_Core_CodeGen - Allow tasks to define `needsUpdate()`

8 years agoCRM-14885 - CRM_Core_CodeGen - Split `Config` and `Version` tasks
Tim Otten [Wed, 27 Jul 2016 05:50:50 +0000 (22:50 -0700)]
CRM-14885 - CRM_Core_CodeGen - Split `Config` and `Version` tasks

8 years agoCRM-14885 - CRM_Core_CodeGen_Util_Template - Use fresh instances of Smarty
Tim Otten [Wed, 27 Jul 2016 05:39:15 +0000 (22:39 -0700)]
CRM-14885 - CRM_Core_CodeGen_Util_Template - Use fresh instances of Smarty

8 years agoCRM-14885 - CRM_Core_CodeGen_DAO - Separate instances for each DAO file
Tim Otten [Wed, 27 Jul 2016 05:29:41 +0000 (22:29 -0700)]
CRM-14885 - CRM_Core_CodeGen_DAO - Separate instances for each DAO file

8 years agoCRM-14885 - CRM_Core_CodeGen_Main::getTasks - Return instances instead of class names
Tim Otten [Wed, 27 Jul 2016 05:28:22 +0000 (22:28 -0700)]
CRM-14885 - CRM_Core_CodeGen_Main::getTasks - Return instances instead of class names

8 years agoMerge pull request #8762 from eileenmcnaughton/xml
Eileen McNaughton [Wed, 27 Jul 2016 23:31:30 +0000 (11:31 +1200)]
Merge pull request #8762 from eileenmcnaughton/xml

[NFC] CRM-19132 add html type to contribution_recur fields

8 years agoMerge pull request #8594 from JMAConsulting/CRM-18977
Joe Murray [Wed, 27 Jul 2016 14:30:22 +0000 (10:30 -0400)]
Merge pull request #8594 from JMAConsulting/CRM-18977

CRM-18977, fixed code to invoke method in parent class

8 years agoMerge pull request #8765 from PalanteJon/CRM-19115
Monish Deb [Wed, 27 Jul 2016 10:47:23 +0000 (16:17 +0530)]
Merge pull request #8765 from PalanteJon/CRM-19115

CRM-19115 - Always set the MySQL timezone offset before checking for …

8 years agoMerge pull request #8744 from jitendrapurohit/CRM-19054
Monish Deb [Wed, 27 Jul 2016 04:35:36 +0000 (10:05 +0530)]
Merge pull request #8744 from jitendrapurohit/CRM-19054

CRM-19054: Update Related Components when status updated from Profile…

8 years agoMerge pull request #8763 from colemanw/communityMessagesUrl
colemanw [Wed, 27 Jul 2016 03:36:05 +0000 (23:36 -0400)]
Merge pull request #8763 from colemanw/communityMessagesUrl

Add default communityMessagesUrl setting

8 years agoAdd default communityMessagesUrl setting
Coleman Watts [Tue, 26 Jul 2016 19:49:41 +0000 (15:49 -0400)]
Add default communityMessagesUrl setting

8 years agoMerge pull request #8759 from seamuslee001/CRM-16923
Eileen McNaughton [Wed, 27 Jul 2016 01:03:12 +0000 (13:03 +1200)]
Merge pull request #8759 from seamuslee001/CRM-16923

CRM-16923 Fix Enotice error by setting payment Processor id

8 years agoCRM-19115 - Always set the MySQL timezone offset before checking for PHP/MySQL time...
Jon goldberg [Tue, 26 Jul 2016 21:03:42 +0000 (17:03 -0400)]
CRM-19115 - Always set the MySQL timezone offset before checking for PHP/MySQL time mismatch

8 years agoCRM-19132 add html type to contribution_recur fields
eileenmcnaugton [Tue, 26 Jul 2016 12:19:00 +0000 (00:19 +1200)]
CRM-19132 add html type to contribution_recur fields

8 years agomove updateRelatedComponent to BAO
jitendrapurohit [Tue, 26 Jul 2016 11:58:47 +0000 (17:28 +0530)]
move updateRelatedComponent to BAO

8 years agoFix up settting of input value
Seamus Lee [Tue, 26 Jul 2016 05:50:40 +0000 (15:50 +1000)]
Fix up settting of input value

8 years agoShift to Single Value Query as suggested by Eileen
Seamus Lee [Tue, 26 Jul 2016 05:21:46 +0000 (15:21 +1000)]
Shift to Single Value Query as suggested by Eileen

8 years agoCRM-16923 Fix Enotice error by setting payment Processor id
Seamus Lee [Tue, 26 Jul 2016 05:06:55 +0000 (15:06 +1000)]
CRM-16923 Fix Enotice error by setting payment Processor id

8 years agoMerge pull request #8219 from colemanw/CRM-18004
Eileen McNaughton [Mon, 25 Jul 2016 23:52:33 +0000 (11:52 +1200)]
Merge pull request #8219 from colemanw/CRM-18004

CRM-18004 - IDS: Fix undefined index & code cleanup

8 years agoMerge pull request #8745 from twomice/CRM-19120
colemanw [Mon, 25 Jul 2016 19:54:14 +0000 (15:54 -0400)]
Merge pull request #8745 from twomice/CRM-19120

CRM-19120: Fix display of chain-select fields in event cart.

8 years agoMerge pull request #8749 from seamuslee001/CRM-18267
Eileen McNaughton [Mon, 25 Jul 2016 06:26:30 +0000 (18:26 +1200)]
Merge pull request #8749 from seamuslee001/CRM-18267

CRM-18267 Upgrade dom pdf to update php-font-lib

8 years agoMerge pull request #8729 from jitendrapurohit/CRM-18528-tests
Monish Deb [Sun, 24 Jul 2016 17:50:51 +0000 (23:20 +0530)]
Merge pull request #8729 from jitendrapurohit/CRM-18528-tests

CRM-18528 - unit test to check group filter

8 years agoFix setting of is remote enabled to work with DomPDF 0.7.0
Seamus Lee [Sun, 24 Jul 2016 02:14:21 +0000 (12:14 +1000)]
Fix setting of is remote enabled to work with DomPDF 0.7.0

8 years agoUpdate dompdf code in PDF/Utils to match upgraded dompdf code
Seamus Lee [Sat, 23 Jul 2016 05:20:54 +0000 (15:20 +1000)]
Update dompdf code in PDF/Utils to match upgraded dompdf code

8 years agoUpgrade dom pdf to update php-font-lib
Seamus Lee [Sat, 23 Jul 2016 05:02:50 +0000 (15:02 +1000)]
Upgrade dom pdf to update php-font-lib

8 years agoMerge pull request #8739 from totten/master-no-pear-2
Tim Otten [Sat, 23 Jul 2016 00:34:56 +0000 (17:34 -0700)]
Merge pull request #8739 from totten/master-no-pear-2

(NFC) CRM_Core_CodeGen_Util_Template - Remove PEAR formatting filter

8 years agoMerge pull request #8746 from seamuslee001/CRM-19118
Tim Otten [Sat, 23 Jul 2016 00:21:31 +0000 (17:21 -0700)]
Merge pull request #8746 from seamuslee001/CRM-19118

CRM-19118 Fix Syntax Confromance test by specifiy data for children a…

8 years agoRemove silly character
Seamus Lee [Fri, 22 Jul 2016 22:51:45 +0000 (08:51 +1000)]
Remove silly character

8 years agoCRM-19118 Fix Syntax Confromance test by specifiy data for children and parent fields...
Seamus Lee [Fri, 22 Jul 2016 22:23:11 +0000 (08:23 +1000)]
CRM-19118 Fix Syntax Confromance test by specifiy data for children and parent fields when generating test data

8 years agoCRM-19120: Fix display of chain-select fields in event cart.
Allen Shaw [Fri, 22 Jul 2016 20:50:28 +0000 (15:50 -0500)]
CRM-19120: Fix display of chain-select fields in event cart.

8 years agoMerge pull request #8740 from jitendrapurohit/CRM-19110
Monish Deb [Fri, 22 Jul 2016 18:32:53 +0000 (00:02 +0530)]
Merge pull request #8740 from jitendrapurohit/CRM-19110

CRM-19110: Fix delete pledge payments

8 years agoCRM-18977, modified code to set alias for civicrm_line_item table
Pradeep Nayak [Wed, 22 Jun 2016 00:36:21 +0000 (06:06 +0530)]
CRM-18977, modified code to set alias for civicrm_line_item table

----------------------------------------
* CRM-18977: Contribution reports fails when Financial ACL is enabled
  https://issues.civicrm.org/jira/browse/CRM-18977

8 years agoCRM-18977, fixed code to invoke method in parent class
Pradeep Nayak [Fri, 17 Jun 2016 22:03:56 +0000 (03:33 +0530)]
CRM-18977, fixed code to invoke method in parent class

----------------------------------------
* CRM-18977: Contribution reports fails when Financial ACL is enabled
  https://issues.civicrm.org/jira/browse/CRM-18977

8 years agoCRM-19054: Update Related Components when status updated from Profile Task
jitendrapurohit [Fri, 22 Jul 2016 13:18:38 +0000 (18:48 +0530)]
CRM-19054: Update Related Components when status updated from Profile Task

8 years agoset permission to pass group filter test
jitendrapurohit [Fri, 22 Jul 2016 11:33:40 +0000 (17:03 +0530)]
set permission to pass group filter test

8 years agoMerge pull request #8728 from yashodha/CRM-18591
Monish Deb [Fri, 22 Jul 2016 10:22:58 +0000 (15:52 +0530)]
Merge pull request #8728 from yashodha/CRM-18591

CRM-18591: group_type parameter ignored when using API to create group

8 years agoCRM-18591: add test
yashodha [Fri, 22 Jul 2016 07:24:11 +0000 (12:54 +0530)]
CRM-18591: add test

----------------------------------------
* CRM-18591: group_type parameter ignored when using API to create group
  https://issues.civicrm.org/jira/browse/CRM-18591

8 years agoCRM-18591: support for single value passed through api
yashodha [Wed, 20 Jul 2016 12:16:50 +0000 (17:46 +0530)]
CRM-18591: support for single value passed through api

----------------------------------------
* CRM-18591: group_type parameter ignored when using API to create group
  https://issues.civicrm.org/jira/browse/CRM-18591

8 years agoCRM-18591: group_type parameter ignored when using API to create group
yashodha [Wed, 20 Jul 2016 09:04:47 +0000 (14:34 +0530)]
CRM-18591: group_type parameter ignored when using API to create group

----------------------------------------
* CRM-18591: group_type parameter ignored when using API to create group
  https://issues.civicrm.org/jira/browse/CRM-18591

8 years agoCRM-19110: Fix delete pledge payments
jitendrapurohit [Fri, 22 Jul 2016 07:03:02 +0000 (12:33 +0530)]
CRM-19110: Fix delete pledge payments

8 years agoMerge pull request #8736 from yashodha/fix-version
Yashodha Chaku [Fri, 22 Jul 2016 04:19:18 +0000 (09:49 +0530)]
Merge pull request #8736 from yashodha/fix-version

Set version to 4.7.11

8 years ago(NFC) CRM_Core_CodeGen_Util_Template - Remove PEAR formatting filter
Tim Otten [Thu, 21 Jul 2016 18:51:27 +0000 (11:51 -0700)]
(NFC) CRM_Core_CodeGen_Util_Template - Remove PEAR formatting filter

This filter has several issues:
 * Fundamentally, we don't use PEAR style guide - we're closer to Drupal style guide.
 * Its only practical effect is to move squiggly braces... to the wrong place.
 * It tangentially pulls in PEAR dependencies.
 * It adds a ~4 seconds to GenCode (as measured on my laptop).

8 years agoMerge pull request #8737 from JMAConsulting/CRM-16189-43
Joe Murray [Thu, 21 Jul 2016 18:49:36 +0000 (14:49 -0400)]
Merge pull request #8737 from JMAConsulting/CRM-16189-43

[ready-for-core-team-review]CRM-16189, changed url for Deferred Revenue report

8 years agoCRM-16189, changed url for Deferred Revenue report
Pradeep Nayak [Thu, 21 Jul 2016 10:37:09 +0000 (16:07 +0530)]
CRM-16189, changed url for Deferred Revenue report

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoSet version to 4.7.11
yashodha [Thu, 21 Jul 2016 10:29:27 +0000 (15:59 +0530)]
Set version to 4.7.11

8 years agoMerge pull request #8717 from monishdeb/CRM-19094
Monish Deb [Wed, 20 Jul 2016 20:47:54 +0000 (02:17 +0530)]
Merge pull request #8717 from monishdeb/CRM-19094

CRM-19094: cid=0 membership contribution form can overwrite data of an existing membership

8 years agoMerge pull request #8731 from JKingsnorth/CRM-19108
Eileen McNaughton [Wed, 20 Jul 2016 20:36:18 +0000 (08:36 +1200)]
Merge pull request #8731 from JKingsnorth/CRM-19108

[NFC] CRM-19108: Fix incorrect case on CRM_Utils_array

8 years agoMerge pull request #8727 from jitendrapurohit/CRM-19100
Joe Murray [Wed, 20 Jul 2016 20:29:39 +0000 (16:29 -0400)]
Merge pull request #8727 from jitendrapurohit/CRM-19100

CRM-19100: 4.7.8 SQL Incremental Update May Fail for UTF8

8 years agoCRM-19108: Fix incorrect case on CRM_Utils_array
JKingsnorth [Wed, 20 Jul 2016 12:33:37 +0000 (13:33 +0100)]
CRM-19108: Fix incorrect case on CRM_Utils_array

8 years agoMerge pull request #8711 from JMAConsulting/CRM-16189-37
Yashodha Chaku [Wed, 20 Jul 2016 12:01:47 +0000 (17:31 +0530)]
Merge pull request #8711 from JMAConsulting/CRM-16189-37

[ready-for-core-team-review] CRM-16189, fixed code to add entries in civicrm_entity_financial_tr…

8 years agoMerge pull request #8695 from eileenmcnaughton/address_tests
Eileen McNaughton [Wed, 20 Jul 2016 11:40:21 +0000 (23:40 +1200)]
Merge pull request #8695 from eileenmcnaughton/address_tests

CRM-19076 Multiple Merge tests + fix for lost address

8 years agoMerge pull request #8706 from jitendrapurohit/CRM-19053
Monish Deb [Wed, 20 Jul 2016 11:09:52 +0000 (16:39 +0530)]
Merge pull request #8706 from jitendrapurohit/CRM-19053

CRM-19053 - Fix Source Message for Pending Contribution

8 years agoCRM-19076 add tests for emails on merge
eileen [Wed, 20 Jul 2016 03:10:25 +0000 (15:10 +1200)]
CRM-19076 add tests for emails on merge

8 years agouse defined functions
jitendrapurohit [Wed, 20 Jul 2016 10:12:12 +0000 (15:42 +0530)]
use defined functions

8 years agoCRM-16189 Renamed param
Edsel [Wed, 20 Jul 2016 07:56:10 +0000 (13:26 +0530)]
CRM-16189 Renamed param

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoCRM-19100: 4.7.8 SQL Incremental Update May Fail for UTF8
jitendrapurohit [Wed, 20 Jul 2016 07:33:09 +0000 (13:03 +0530)]
CRM-19100: 4.7.8 SQL Incremental Update May Fail for UTF8

8 years agoMerge pull request #8726 from colemanw/CRM-17606
Eileen McNaughton [Wed, 20 Jul 2016 03:12:44 +0000 (15:12 +1200)]
Merge pull request #8726 from colemanw/CRM-17606

CRM-17606 - Create documents from Find Cases search result

8 years agoCRM-17606 - Fix js bug due to nonstandard form class name
Coleman Watts [Wed, 20 Jul 2016 00:22:10 +0000 (20:22 -0400)]
CRM-17606 - Fix js bug due to nonstandard form class name

8 years agolabel fix
jitendrapurohit [Fri, 24 Jun 2016 06:07:41 +0000 (11:37 +0530)]
label fix

8 years agoindent and title fix
jitendrapurohit [Wed, 25 May 2016 04:44:45 +0000 (10:14 +0530)]
indent and title fix

8 years agoCRM-17606 - Create multiple documents from Find Cases search result
jitendrapurohit [Mon, 23 May 2016 11:22:54 +0000 (16:52 +0530)]
CRM-17606 - Create multiple documents from Find Cases search result

8 years agoMerge pull request #8725 from colemanw/CRM-17608
colemanw [Tue, 19 Jul 2016 23:30:49 +0000 (19:30 -0400)]
Merge pull request #8725 from colemanw/CRM-17608

CRM-17608 - Merge document form tweaks

8 years agoCRM-17608 - Merge document form tweaks
Coleman Watts [Tue, 19 Jul 2016 22:04:06 +0000 (18:04 -0400)]
CRM-17608 - Merge document form tweaks

8 years agoMerge pull request #8474 from monishdeb/CRM-17608
colemanw [Tue, 19 Jul 2016 18:49:01 +0000 (14:49 -0400)]
Merge pull request #8474 from monishdeb/CRM-17608

CRM-17608: Merge to DOCx or ODT template

8 years agoFix capitalization
Coleman Watts [Tue, 19 Jul 2016 17:00:30 +0000 (13:00 -0400)]
Fix capitalization

8 years agoMerge pull request #8720 from yashodha/CRM-18472
Monish Deb [Tue, 19 Jul 2016 10:41:42 +0000 (16:11 +0530)]
Merge pull request #8720 from yashodha/CRM-18472

CRM-18472: fix notice

8 years agoCRM-19076 Add tests for phones on merge
eileen [Tue, 19 Jul 2016 00:27:01 +0000 (12:27 +1200)]
CRM-19076 Add tests for phones on merge

It turned out these were losing data too.....

8 years agoCRM-18472: fix notice
yashodha [Tue, 19 Jul 2016 05:49:58 +0000 (11:19 +0530)]
CRM-18472: fix notice

----------------------------------------
* CRM-18472: Notice fixes
  https://issues.civicrm.org/jira/browse/CRM-18472

8 years agominor fix
deb.monish [Tue, 19 Jul 2016 05:48:09 +0000 (11:18 +0530)]
minor fix

8 years agoMerge pull request #8715 from seamuslee001/CRM-19098
Yashodha Chaku [Tue, 19 Jul 2016 05:35:22 +0000 (11:05 +0530)]
Merge pull request #8715 from seamuslee001/CRM-19098

CRM-19098 Add in Group Settings to add new group on Import

8 years agoMerge pull request #8716 from monishdeb/CRM-19096
Yashodha Chaku [Tue, 19 Jul 2016 05:26:41 +0000 (10:56 +0530)]
Merge pull request #8716 from monishdeb/CRM-19096

CRM-19096: Parent group arrow mis-aligned

8 years agoMerge pull request #8703 from yashodha/CRM-19078
Yashodha Chaku [Tue, 19 Jul 2016 03:24:19 +0000 (08:54 +0530)]
Merge pull request #8703 from yashodha/CRM-19078

CRM-19078: Cannot search memberships by auto-renew OR not-auto-renew

8 years agoCRM-19094: cid=0 membership contribution form can overwrite data of an existing membe...
deb.monish [Mon, 18 Jul 2016 13:19:10 +0000 (18:49 +0530)]
CRM-19094: cid=0 membership contribution form can overwrite data of an existing membership

8 years agoCRM-19096: Parent group arrow mis-aligned
deb.monish [Mon, 18 Jul 2016 09:53:19 +0000 (15:23 +0530)]
CRM-19096: Parent group arrow mis-aligned

8 years agoAdd in checking on if groupType is set
Seamus Lee [Mon, 18 Jul 2016 09:30:44 +0000 (09:30 +0000)]
Add in checking on if groupType is set

8 years agoUpdate template
Seamus Lee [Mon, 18 Jul 2016 09:29:42 +0000 (09:29 +0000)]
Update template

8 years agoCRM-19098 Add in Group Settings to add new group on import
Seamus Lee [Mon, 18 Jul 2016 09:27:05 +0000 (09:27 +0000)]
CRM-19098 Add in Group Settings to add new group on import