civicrm-core.git
7 years agoCivi\API\ExternalBatch - Improve test for variables_order/$_ENV
Tim Otten [Mon, 13 Mar 2017 04:45:00 +0000 (21:45 -0700)]
Civi\API\ExternalBatch - Improve test for variables_order/$_ENV

The recent revision #9595 updated `ExternalBatch` to produce a more
informative error message.  However, in the test environment used by
`flexmailer`, there was exactly 1 value in `$_ENV` (even if
`variables_order` was misconfigured).

This should make the test a bit harder to trip-up by affirmatively checking
for the most common environment variable.

Review note: In the known universe, the only direct references to
`ExternalBatch` are in `CiviUnitTestCase`, so this shouldn't impact any
runtime logic.

7 years agoMerge pull request #9836 from jmcclelland/CRM-20020
Eileen McNaughton [Sun, 12 Mar 2017 02:37:09 +0000 (15:37 +1300)]
Merge pull request #9836 from jmcclelland/CRM-20020

CRM-20020 - fix search with parent groups + other criteria

7 years agoMerge pull request #9936 from eileenmcnaughton/sig
colemanw [Fri, 10 Mar 2017 22:14:03 +0000 (17:14 -0500)]
Merge pull request #9936 from eileenmcnaughton/sig

CRM-20220 fix signature fields to be longtext

7 years agoUpdate PaymentProcessor.php
colemanw [Fri, 10 Mar 2017 21:01:35 +0000 (16:01 -0500)]
Update PaymentProcessor.php

7 years agoMerge pull request #9963 from kainukempowerment/CRM-20239
colemanw [Fri, 10 Mar 2017 15:12:58 +0000 (10:12 -0500)]
Merge pull request #9963 from kainukempowerment/CRM-20239

CRM-20239 Extra tests for the Individual::format function

7 years agoCRM-20239 Extra tests for the CRM_Contact_BAO_Individual::format function
Klaas Eikelboom [Fri, 10 Mar 2017 13:15:53 +0000 (14:15 +0100)]
CRM-20239 Extra tests for the CRM_Contact_BAO_Individual::format function

7 years agoMerge pull request #9815 from WeMoveEU/CRM-19962
Eileen McNaughton [Fri, 10 Mar 2017 07:46:50 +0000 (20:46 +1300)]
Merge pull request #9815 from WeMoveEU/CRM-19962

CRM-19962 - Wider name field for A/B mailings

7 years agoMerge pull request #9662 from JMAConsulting/CRM-19792
Eileen McNaughton [Fri, 10 Mar 2017 07:12:03 +0000 (20:12 +1300)]
Merge pull request #9662 from JMAConsulting/CRM-19792

CRM-19792, fixed payment processor params to include email

7 years agoMerge pull request #9948 from KarinG/CRM-19966
Tim Otten [Fri, 10 Mar 2017 06:12:19 +0000 (22:12 -0800)]
Merge pull request #9948 from KarinG/CRM-19966

Fixes for CRM-19966 Unfair Double Taxation and net_amounts.

7 years agoAdded Test to Create Contribution -> then Edit it via BackOffice form - using default...
KarinG [Fri, 10 Mar 2017 03:43:58 +0000 (20:43 -0700)]
Added Test to Create Contribution -> then Edit it via BackOffice form - using default price_set.

7 years agoCRM-20220 fix signature fields to be longtext
eileen [Fri, 10 Mar 2017 03:23:17 +0000 (16:23 +1300)]
CRM-20220 fix signature fields to be longtext

7 years agoMerge pull request #9961 from colemanw/Tweak
colemanw [Fri, 10 Mar 2017 03:04:44 +0000 (22:04 -0500)]
Merge pull request #9961 from colemanw/Tweak

Tweak icon when expanding popup to fullscreen

7 years agoTweak icon when expanding popup to fullscreen
Coleman Watts [Fri, 10 Mar 2017 02:47:57 +0000 (21:47 -0500)]
Tweak icon when expanding popup to fullscreen

7 years agoMerge pull request #9860 from JMAConsulting/CRM-20058
Eileen McNaughton [Fri, 10 Mar 2017 00:40:26 +0000 (13:40 +1300)]
Merge pull request #9860 from JMAConsulting/CRM-20058

CRM-20058, added submit credit card payment link

7 years agoMerge pull request #9952 from JMAConsulting/CRM-20025
Eileen McNaughton [Fri, 10 Mar 2017 00:38:20 +0000 (13:38 +1300)]
Merge pull request #9952 from JMAConsulting/CRM-20025

CRM-20025 [ready for review] Prevented query from fetching contacts without contributions

7 years agoMerge pull request #9958 from seamuslee001/CRM-20023
Tim Otten [Thu, 9 Mar 2017 23:36:35 +0000 (15:36 -0800)]
Merge pull request #9958 from seamuslee001/CRM-20023

CRM-20023 Add test showing passing in just state_province_id and coun…

7 years agoUse assertApproxEquals as per Tim's suggestion
Seamus Lee [Thu, 9 Mar 2017 22:40:37 +0000 (09:40 +1100)]
Use assertApproxEquals as per Tim's suggestion

7 years agoFix tear down function
Seamus Lee [Thu, 9 Mar 2017 21:17:36 +0000 (08:17 +1100)]
Fix tear down function

7 years agoCRM-20023 Add test showing passing in just state_province_id and country only geoloat...
Seamus Lee [Thu, 9 Mar 2017 20:44:08 +0000 (07:44 +1100)]
CRM-20023 Add test showing passing in just state_province_id and country only geoloates based on country not state as well

7 years agoMerge pull request #9959 from seamuslee001/logged_in_user_api_call
Tim Otten [Thu, 9 Mar 2017 22:28:45 +0000 (14:28 -0800)]
Merge pull request #9959 from seamuslee001/logged_in_user_api_call

(NFC) Update API examples and add example of using user_contact_id as id fo…

7 years agoUpdate API examples and add example of using user_contact_id as id for current logged...
Seamus Lee [Thu, 9 Mar 2017 21:40:56 +0000 (08:40 +1100)]
Update API examples and add example of using user_contact_id as id for current logged in user

7 years agoMerge pull request #9839 from fuzionnz/CRM-20023-geocode_state_province_id
Eileen McNaughton [Thu, 9 Mar 2017 21:09:13 +0000 (10:09 +1300)]
Merge pull request #9839 from fuzionnz/CRM-20023-geocode_state_province_id

CRM-20023: Do not require state_province value to use state_province_id value.

7 years agoMerge pull request #9957 from civicrm/4.7.17-rc
Eileen McNaughton [Thu, 9 Mar 2017 21:08:00 +0000 (10:08 +1300)]
Merge pull request #9957 from civicrm/4.7.17-rc

4.7.17 rc

7 years agoMerge pull request #9956 from seamuslee001/master
Tim Otten [Thu, 9 Mar 2017 20:13:09 +0000 (12:13 -0800)]
Merge pull request #9956 from seamuslee001/master

Update to 4.7.18

7 years agoMerge pull request #3 from eileenmcnaughton/karing
Karin Gerritsen [Thu, 9 Mar 2017 16:41:46 +0000 (09:41 -0700)]
Merge pull request #3 from eileenmcnaughton/karing

Resolve immediate issues with test & add checks for mail content (sin…

7 years agoMerge pull request #9655 from eileenmcnaughton/activities
colemanw [Thu, 9 Mar 2017 15:19:13 +0000 (10:19 -0500)]
Merge pull request #9655 from eileenmcnaughton/activities

CRM-19836 Enable activity create from replies to CiviMail.

7 years agoCRM-20025 Added check to restrict test contributions from appearing
Edsel [Thu, 9 Mar 2017 13:59:36 +0000 (19:29 +0530)]
CRM-20025 Added check to restrict test contributions from appearing

----------------------------------------
* CRM-20025: DB Error on email task for advanced search for contributions
  https://issues.civicrm.org/jira/browse/CRM-20025

7 years agoCRM-20058 Added check for backoffice credit card payment enabled
Edsel [Thu, 9 Mar 2017 13:30:47 +0000 (19:00 +0530)]
CRM-20058 Added check for backoffice credit card payment enabled

----------------------------------------
* CRM-20058: Add Credit Card Payment link for partially paid contribution
  https://issues.civicrm.org/jira/browse/CRM-20058

7 years agoUpdate to 4.7.18
Seamus Lee [Thu, 9 Mar 2017 08:08:03 +0000 (19:08 +1100)]
Update to 4.7.18

7 years agoResolve immediate issues with test & add checks for mail content (since that function...
eileen [Thu, 9 Mar 2017 06:10:01 +0000 (19:10 +1300)]
Resolve immediate issues with test & add checks for mail content (since that function is edited

7 years agoMerge pull request #9955 from eileenmcnaughton/joe
Eileen McNaughton [Thu, 9 Mar 2017 04:37:51 +0000 (17:37 +1300)]
Merge pull request #9955 from eileenmcnaughton/joe

Towards CRM-19715, Remove Close Accounting Period code

7 years agoFirst pass at PHP Unit test for reSubmit (without priceset).
KarinG [Thu, 9 Mar 2017 04:22:40 +0000 (21:22 -0700)]
First pass at PHP Unit test for reSubmit (without priceset).

7 years agoCRM-19836 Enable activity create from replies to CiviMail.
eileenmcnaugton [Sat, 6 Aug 2016 08:32:34 +0000 (20:32 +1200)]
CRM-19836 Enable activity create from replies to CiviMail.

This relies on a parameter being added to the api call:

civicrm_api3('Job', 'fetch_bounces', array('is_create_activities' => TRUE));

7 years agoPHP Unit test fix: net_amount must equal total_amount minus fee_amount.
KarinG [Thu, 9 Mar 2017 03:10:17 +0000 (20:10 -0700)]
PHP Unit test fix: net_amount must equal total_amount minus fee_amount.

7 years agoMerge pull request #9954 from colemanw/CRM-20235
colemanw [Thu, 9 Mar 2017 03:05:50 +0000 (22:05 -0500)]
Merge pull request #9954 from colemanw/CRM-20235

CRM-20235 - Suppress annoying extension download error messages

7 years agoTowards CRM-19715, Remove Close Accounting Period code
eileen [Thu, 9 Mar 2017 02:54:30 +0000 (15:54 +1300)]
Towards CRM-19715, Remove Close Accounting Period code

Remove the Close Accounting Period form. This is a part of #9498 which is stand alone & reduces the of that PR.

There are some things in the PR that need more work, but this part can be done in isolation

7 years agoMerge pull request #9769 from scardinius/crm-19958
colemanw [Thu, 9 Mar 2017 02:55:35 +0000 (21:55 -0500)]
Merge pull request #9769 from scardinius/crm-19958

CRM-19958 Fix invalid name of variable subtype

7 years agoCRM-20235 - Don't set status messages from the BAO
Coleman Watts [Thu, 9 Mar 2017 02:25:28 +0000 (21:25 -0500)]
CRM-20235 - Don't set status messages from the BAO

This function is already returning error codes. Calling functions ought to take responsibility for reporting the errors.

7 years agoMerge pull request #8807 from JMAConsulting/CRM-16189-4
Eileen McNaughton [Wed, 8 Mar 2017 22:00:50 +0000 (11:00 +1300)]
Merge pull request #8807 from JMAConsulting/CRM-16189-4

[ready-for-review]CRM-16189 (IIDA-16) - Changes to Deferred Revenue report

7 years agoCRM-20020 - ensure search works when both smart and regular groups are used.
Jamie McClelland [Wed, 8 Mar 2017 21:29:26 +0000 (16:29 -0500)]
CRM-20020 - ensure search works when both smart and regular groups are used.

7 years agoMerge pull request #9947 from davidjosephhayes/master
Eileen McNaughton [Wed, 8 Mar 2017 21:17:55 +0000 (10:17 +1300)]
Merge pull request #9947 from davidjosephhayes/master

CRM-20232 Fix Relationship (Type) filter on Relationship report template. Any r…

7 years agoMerge pull request #9946 from lcdservices/CRM-18747
Eileen McNaughton [Wed, 8 Mar 2017 21:15:35 +0000 (10:15 +1300)]
Merge pull request #9946 from lcdservices/CRM-18747

CRM-18747

7 years agoRemove php unit test for function that no longer exists.
KarinG [Wed, 8 Mar 2017 20:36:25 +0000 (13:36 -0700)]
Remove php unit test for function that no longer exists.

7 years agoMerge pull request #9772 from jitendrapurohit/CRM-4287fix
colemanw [Wed, 8 Mar 2017 16:13:27 +0000 (11:13 -0500)]
Merge pull request #9772 from jitendrapurohit/CRM-4287fix

CRM:4287 - add searchPrimaryDetailsOnly setting

7 years agoMerge pull request #9912 from fuzionnz/CRM-20200-editorconfig
colemanw [Wed, 8 Mar 2017 15:54:07 +0000 (10:54 -0500)]
Merge pull request #9912 from fuzionnz/CRM-20200-editorconfig

[WIP] CRM-20200. Add .editorconfig

7 years agoMerge pull request #9951 from JKingsnorth/CRM-19993-4.7.18
colemanw [Wed, 8 Mar 2017 15:52:51 +0000 (10:52 -0500)]
Merge pull request #9951 from JKingsnorth/CRM-19993-4.7.18

CRM-19993 Fixes for ISO compliance with countries and counties

7 years agoMerge pull request #9953 from agh1/release-notes-4.7.17-lastminute
colemanw [Wed, 8 Mar 2017 15:52:32 +0000 (10:52 -0500)]
Merge pull request #9953 from agh1/release-notes-4.7.17-lastminute

Last-minute release note fixes

7 years ago4.7.17 release notes: improve description per @xurizaemon's confusion
Andrew Hunt [Wed, 8 Mar 2017 14:58:38 +0000 (09:58 -0500)]
4.7.17 release notes: improve description per @xurizaemon's confusion

7 years ago4.7.17 release notes: Aidan works for Squiffle
Andrew Hunt [Wed, 8 Mar 2017 14:35:51 +0000 (09:35 -0500)]
4.7.17 release notes: Aidan works for Squiffle

7 years agoMerge pull request #9670 from johanv/CRM-19869-pdf_table_header_issue
Eileen McNaughton [Wed, 8 Mar 2017 11:31:50 +0000 (00:31 +1300)]
Merge pull request #9670 from johanv/CRM-19869-pdf_table_header_issue

Closes CRM-19869 - table layout problem multiple page PDF.

7 years agoCRM-19993 Fixes for ISO compliance with countries and counties
JKingsnorth [Wed, 8 Mar 2017 11:19:39 +0000 (11:19 +0000)]
CRM-19993 Fixes for ISO compliance with countries and counties

7 years agoMerge pull request #9865 from lcdservices/CRM-20146
Yashodha Chaku [Wed, 8 Mar 2017 10:55:25 +0000 (16:25 +0530)]
Merge pull request #9865 from lcdservices/CRM-20146

CRM-20146 dont hardcode check_number toggle in .tpl

7 years agoMerge pull request #9907 from eileenmcnaughton/dedupe_code
Eileen McNaughton [Wed, 8 Mar 2017 10:33:30 +0000 (23:33 +1300)]
Merge pull request #9907 from eileenmcnaughton/dedupe_code

CRM-20157, CRM-20195 Dedupe code cleanup

7 years agoMerge pull request #9937 from eileenmcnaughton/kenya
Eileen McNaughton [Wed, 8 Mar 2017 10:32:36 +0000 (23:32 +1300)]
Merge pull request #9937 from eileenmcnaughton/kenya

CRM-20062 update Kenyan provinces

7 years agoMerge pull request #9850 from aydun/CRM-20039
Yashodha Chaku [Wed, 8 Mar 2017 09:07:56 +0000 (14:37 +0530)]
Merge pull request #9850 from aydun/CRM-20039

CRM-20039 Add Supplemental Address lines to Advanced Search

7 years agoMerge pull request #9824 from sunilpawar/CRM-20001
Eileen McNaughton [Wed, 8 Mar 2017 08:18:29 +0000 (21:18 +1300)]
Merge pull request #9824 from sunilpawar/CRM-20001

CRM-20001 Tokens in Subject Not replaced

7 years agoMerge pull request #9072 from jeromelebleu/patch-19386
Eileen McNaughton [Wed, 8 Mar 2017 08:15:34 +0000 (21:15 +1300)]
Merge pull request #9072 from jeromelebleu/patch-19386

CRM-19386: Retrieve Activities custom fields in import parser

7 years agoMerge pull request #9920 from agh1/release-notes-4.7.17
Eileen McNaughton [Wed, 8 Mar 2017 07:05:10 +0000 (20:05 +1300)]
Merge pull request #9920 from agh1/release-notes-4.7.17

[ready to merge] 4.7.17 release notes

7 years ago4.7.17 release notes: finished descriptions
Andrew Hunt [Wed, 8 Mar 2017 06:51:46 +0000 (01:51 -0500)]
4.7.17 release notes: finished descriptions

7 years agoCRM-20062 upgrade component of Kenyan provinces
eileen [Mon, 6 Mar 2017 04:23:10 +0000 (17:23 +1300)]
CRM-20062 upgrade component of Kenyan provinces

7 years agoCRM-20062 update Kenyan provinces for new installs
eileen [Mon, 6 Mar 2017 04:03:27 +0000 (17:03 +1300)]
CRM-20062 update Kenyan provinces for new installs

7 years agoFixes for CRM-19966 and net_amounts.
KarinG [Wed, 8 Mar 2017 04:37:09 +0000 (21:37 -0700)]
Fixes for CRM-19966 and net_amounts.

7 years agoFix Relationship (Type) filter on Relationship report template. Any relationship...
David Hayes [Wed, 8 Mar 2017 01:55:21 +0000 (19:55 -0600)]
Fix Relationship (Type) filter on Relationship report template. Any relationship types that were the same bidirectional (eg Sibling of) were completely fitlered out of the list of possibilities on the select box on the filter.

7 years ago4.7.17 release notes: updated raw run
Andrew Hunt [Tue, 7 Mar 2017 23:14:19 +0000 (18:14 -0500)]
4.7.17 release notes: updated raw run

7 years ago4.7.17 release notes: update of remaining contributors
Andrew Hunt [Tue, 7 Mar 2017 23:11:27 +0000 (18:11 -0500)]
4.7.17 release notes: update of remaining contributors

7 years ago4.7.17 release notes: update of some contributors
Andrew Hunt [Tue, 7 Mar 2017 22:47:55 +0000 (17:47 -0500)]
4.7.17 release notes: update of some contributors

7 years agoNFC: spacing on contributor key
Andrew Hunt [Tue, 7 Mar 2017 22:23:46 +0000 (17:23 -0500)]
NFC: spacing on contributor key

7 years ago4.7.17 release notes: raw first run
Andrew Hunt [Thu, 2 Mar 2017 20:09:08 +0000 (15:09 -0500)]
4.7.17 release notes: raw first run

7 years ago4.7.16 release notes: added to contributor key
Andrew Hunt [Fri, 3 Feb 2017 17:37:49 +0000 (12:37 -0500)]
4.7.16 release notes: added to contributor key

7 years agoMerge pull request #9930 from JMAConsulting/CRM-20193
Eileen McNaughton [Tue, 7 Mar 2017 21:53:54 +0000 (10:53 +1300)]
Merge pull request #9930 from JMAConsulting/CRM-20193

[ready-for-review]CRM-20193, Draw currency from better table on Batch Transaction form

7 years agoMerge pull request #9935 from eileenmcnaughton/activity_cust_date
Eileen McNaughton [Tue, 7 Mar 2017 21:29:44 +0000 (10:29 +1300)]
Merge pull request #9935 from eileenmcnaughton/activity_cust_date

CRM-20219 Update activity fields in profiles to use date picker

7 years agoMerge pull request #9631 from eileenmcnaughton/contribution_search
Eileen McNaughton [Tue, 7 Mar 2017 21:28:58 +0000 (10:28 +1300)]
Merge pull request #9631 from eileenmcnaughton/contribution_search

CRM-20199 Contribution search performance

7 years agoLCD-3559 revert original change and handle in tpl file
Brian Shaughnessy [Tue, 7 Mar 2017 15:00:28 +0000 (10:00 -0500)]
LCD-3559 revert original change and handle in tpl file

7 years agoCRM-20146 dont hardcode check payment instrument
Brian Shaughnessy [Tue, 7 Mar 2017 14:40:15 +0000 (09:40 -0500)]
CRM-20146 dont hardcode check payment instrument

7 years agoMerge pull request #9943 from totten/master-20224
Eileen McNaughton [Tue, 7 Mar 2017 11:16:08 +0000 (00:16 +1300)]
Merge pull request #9943 from totten/master-20224

CRM-20224 - Cleanup internal event names

7 years agoCRM-20224 - Civi\ActionSchedule\Events - Rename internal events (`actionSchedule...
Tim Otten [Tue, 7 Mar 2017 08:17:32 +0000 (00:17 -0800)]
CRM-20224 - Civi\ActionSchedule\Events - Rename internal events (`actionSchedule.fooBar` vs `civi.actionSchedule.fooBar`)

If you look at the list of events emitted through the EventDispatcher, you'll
find several different formats for the names:

```
   actionSchedule.getMappings
   actionSchedule.prepareMailingQuery
   api.authorize
   api.exception
   api.prepare
   api.resolve
   api.respond
   civi.core.install
   civi.token.eval
   civi.token.list
   civi.token.render
   DAO::post-delete
   DAO::post-insert
   DAO::post-update
   hook_civicrm_caseChange
   hook_civicrm_post::Activity
   hook_civicrm_post::Case
   hook_civicrm_unhandled_exception
```

This patch renames events using the `actionSchedule.fooBar` convention.  Based on
grepping universe, I don't believe any extensions rely on the `DAO::*`
events.

7 years agoCRM-20224 - Civi\API\Events - Rename internal events (`api.foo` vs `civi.api.foo`)
Tim Otten [Tue, 7 Mar 2017 08:14:55 +0000 (00:14 -0800)]
CRM-20224 - Civi\API\Events - Rename internal events (`api.foo` vs `civi.api.foo`)

If you look at the list of events emitted through the EventDispatcher, you'll
find several different formats for the names:

```
   actionSchedule.getMappings
   actionSchedule.prepareMailingQuery
   api.authorize
   api.exception
   api.prepare
   api.resolve
   api.respond
   civi.core.install
   civi.token.eval
   civi.token.list
   civi.token.render
   DAO::post-delete
   DAO::post-insert
   DAO::post-update
   hook_civicrm_caseChange
   hook_civicrm_post::Activity
   hook_civicrm_post::Case
   hook_civicrm_unhandled_exception
```

This patch renames events using the `api.foo` convention.  Based on
grepping universe, I don't believe any extensions rely on the `DAO::*`
events.

7 years agoCRM-20224 - CRM_Core_DAO - Rename internal events (`DAO::foo-bar` vs `civi.dao.fooBar`)
Tim Otten [Fri, 3 Mar 2017 22:43:27 +0000 (14:43 -0800)]
CRM-20224 - CRM_Core_DAO - Rename internal events (`DAO::foo-bar` vs `civi.dao.fooBar`)

If you look at the list of events emitted through the EventDispatcher, you'll
find several different formats for the names:

```
   actionSchedule.getMappings
   actionSchedule.prepareMailingQuery
   api.authorize
   api.exception
   api.prepare
   api.resolve
   api.respond
   civi.core.install
   civi.token.eval
   civi.token.list
   civi.token.render
   DAO::post-delete
   DAO::post-insert
   DAO::post-update
   hook_civicrm_caseChange
   hook_civicrm_post::Activity
   hook_civicrm_post::Case
   hook_civicrm_unhandled_exception
```

This patch renames events using the `DAO::foo-bar` convention.  Based on
grepping universe, I don't believe any extensions rely on the `DAO::*`
events.

7 years agoMerge pull request #9941 from eileenmcnaughton/comment
Eileen McNaughton [Tue, 7 Mar 2017 06:42:37 +0000 (19:42 +1300)]
Merge pull request #9941 from eileenmcnaughton/comment

Add docblock comment to help with CRM-20058

7 years agoAdd docblock comment to help with CRM-20058
eileen [Tue, 7 Mar 2017 05:28:25 +0000 (18:28 +1300)]
Add docblock comment to help with CRM-20058

7 years agoMerge pull request #9938 from JKingsnorth/CRM-20206
Eileen McNaughton [Mon, 6 Mar 2017 20:29:46 +0000 (09:29 +1300)]
Merge pull request #9938 from JKingsnorth/CRM-20206

[NFC] CRM-20206 - Clarify comments on html param

7 years ago[NFC] Clarify comments
JKingsnorth [Mon, 6 Mar 2017 10:13:43 +0000 (10:13 +0000)]
[NFC] Clarify comments

7 years agoMerge pull request #9931 from ErichBSchulz/commentfixes
Eileen McNaughton [Sun, 5 Mar 2017 21:49:30 +0000 (10:49 +1300)]
Merge pull request #9931 from ErichBSchulz/commentfixes

comment changes only

7 years agoMerge pull request #9934 from civicrm/4.7.17-rc
Eileen McNaughton [Sun, 5 Mar 2017 21:49:03 +0000 (10:49 +1300)]
Merge pull request #9934 from civicrm/4.7.17-rc

4.7.17 rc

7 years agoCRM-20219 Update activity fields in profiles to use date picker
eileen [Sun, 5 Mar 2017 21:02:14 +0000 (10:02 +1300)]
CRM-20219 Update activity fields in profiles to use date picker

7 years agoMerge pull request #9922 from eileenmcnaughton/cust_date_part
Eileen McNaughton [Sun, 5 Mar 2017 20:49:42 +0000 (09:49 +1300)]
Merge pull request #9922 from eileenmcnaughton/cust_date_part

CRM-20213 Change participant_register_date to use datepicker widget

7 years agoMerge pull request #9933 from spalmstr/new
Eileen McNaughton [Sun, 5 Mar 2017 20:46:29 +0000 (09:46 +1300)]
Merge pull request #9933 from spalmstr/new

CRM-20004 Fix regression Event payment receipt sent twice

7 years agoCRM-20004 Fix regression Event payment receipt sent twice
spalmstr [Sat, 4 Mar 2017 12:23:12 +0000 (12:23 +0000)]
CRM-20004 Fix regression Event payment receipt sent twice

7 years agocomment changes only
Erich Schulz [Sun, 5 Mar 2017 07:10:12 +0000 (17:10 +1000)]
comment changes only

The magic __call method provides the ability to snoop on all hooks

7 years agoCRM-20193, moved set of code into if condition for better readability
Pradeep Nayak [Sun, 5 Mar 2017 07:07:52 +0000 (12:37 +0530)]
CRM-20193, moved set of code into if condition for better readability

----------------------------------------
* CRM-20193: Draw currency from better table on Batch Transaction form
  https://issues.civicrm.org/jira/browse/CRM-20193

7 years agoCRM-20193, optimized sql to use INNER JOIN with contribution table rathe LEFT JOIN
Pradeep Nayak [Sun, 5 Mar 2017 07:02:21 +0000 (12:32 +0530)]
CRM-20193, optimized sql to use INNER JOIN with contribution table rathe LEFT JOIN

----------------------------------------
* CRM-20193: Draw currency from better table on Batch Transaction form
  https://issues.civicrm.org/jira/browse/CRM-20193

7 years agoCRM-20193, changed the table alias for Currency field to use civicrm_financial_trxn...
Pradeep Nayak [Sun, 5 Mar 2017 07:01:05 +0000 (12:31 +0530)]
CRM-20193, changed the table alias for Currency field to use civicrm_financial_trxn table and have name field table alias

----------------------------------------
* CRM-20193: Draw currency from better table on Batch Transaction form
  https://issues.civicrm.org/jira/browse/CRM-20193

7 years agoMerge pull request #9899 from colemanw/CRM-20179
Eileen McNaughton [Sat, 4 Mar 2017 03:01:33 +0000 (16:01 +1300)]
Merge pull request #9899 from colemanw/CRM-20179

CRM-20179 - jstree upgrade and other js performance improvements

7 years agoMerge pull request #9917 from JKingsnorth/CRM-20206
Eileen McNaughton [Fri, 3 Mar 2017 21:06:19 +0000 (10:06 +1300)]
Merge pull request #9917 from JKingsnorth/CRM-20206

CRM-20206 Fix encoding in plain text checksum links

7 years agoMerge pull request #9923 from eileenmcnaughton/acl
Eileen McNaughton [Fri, 3 Mar 2017 20:16:43 +0000 (09:16 +1300)]
Merge pull request #9923 from eileenmcnaughton/acl

CRM-19773 unit test to verify acls apply

7 years agotags and group file is modified for the group description
Vikas [Fri, 3 Mar 2017 11:24:19 +0000 (16:54 +0530)]
tags and group file is modified for the group description

7 years agoCRM-19773 unit test to verify acls apply
eileen [Fri, 3 Mar 2017 07:38:07 +0000 (20:38 +1300)]
CRM-19773 unit test to verify acls apply

7 years agoMerge pull request #9570 from colemanw/CRM-19773-report
Eileen McNaughton [Fri, 3 Mar 2017 07:36:15 +0000 (20:36 +1300)]
Merge pull request #9570 from colemanw/CRM-19773-report

CRM-19773 - Check permisions for all entities in reports

7 years agoCRM-20213 Change participant_register_date to use datepicker widget
eileen [Fri, 3 Mar 2017 06:14:55 +0000 (19:14 +1300)]
CRM-20213 Change participant_register_date to use datepicker widget

7 years agoMerge pull request #9921 from civicrm/4.7.17-rc
Eileen McNaughton [Fri, 3 Mar 2017 06:11:38 +0000 (19:11 +1300)]
Merge pull request #9921 from civicrm/4.7.17-rc

4.7.17 rc