JKingsnorth [Fri, 19 Jan 2018 10:43:05 +0000 (10:43 +0000)]
CRM-21683 Standardise filter in mailing summary report
Eileen McNaughton [Fri, 19 Jan 2018 02:48:42 +0000 (15:48 +1300)]
Merge pull request #11554 from eileenmcnaughton/test_fin
CRM-17647 test fixes to avoid calling Contribution::create without sk…
eileen [Fri, 19 Jan 2018 00:15:34 +0000 (13:15 +1300)]
CRM-17647 test fixes to avoid calling Contribution::create without skipCleanMoney
Eileen McNaughton [Fri, 19 Jan 2018 00:13:58 +0000 (13:13 +1300)]
Merge pull request #11553 from civicrm/4.7.30-rc
4.7.30 rc merge to master
colemanw [Fri, 19 Jan 2018 00:05:26 +0000 (19:05 -0500)]
Merge pull request #11549 from eileenmcnaughton/batch_currency
CRM-17647 fix for currency on batch entry
colemanw [Thu, 18 Jan 2018 23:27:48 +0000 (18:27 -0500)]
Merge pull request #11365 from mattwire/CRM-21511_recur_on_membership_detail
CRM-21511 Add recurring contribution link to membership and contribution detail
colemanw [Thu, 18 Jan 2018 22:33:23 +0000 (17:33 -0500)]
Merge pull request #11526 from eileenmcnaughton/export_fix_activity
CRM-14834 - fix activity export when relationship in export fields
Eileen McNaughton [Thu, 18 Jan 2018 21:51:02 +0000 (10:51 +1300)]
Merge pull request #11552 from seamuslee001/activity_unit_test_failures_4_7_30
Fix Activity Unit Test failure
deb.monish [Thu, 4 Jan 2018 18:54:20 +0000 (00:24 +0530)]
additional fixes
Mathieu Lu [Thu, 18 Jan 2018 15:08:17 +0000 (10:08 -0500)]
Merge pull request #11142 from JMAConsulting/CRM-21260
CRM-21260: CiviMail compose UI very slow to initialize, CRM-21316: Refactor getRecipients fn
colemanw [Thu, 18 Jan 2018 14:56:19 +0000 (09:56 -0500)]
Merge pull request #11543 from eileenmcnaughton/api_std
Minor api tidy up.
Eileen McNaughton [Thu, 18 Jan 2018 09:33:57 +0000 (22:33 +1300)]
Merge pull request #11547 from eileenmcnaughton/safe_money
CRM-17647 test fixes towards ensuring we never rely on the BAO to cle…
eileen [Thu, 18 Jan 2018 09:30:55 +0000 (22:30 +1300)]
CRM-17647 fix for currency on batch entry
eileen [Thu, 18 Jan 2018 05:23:02 +0000 (18:23 +1300)]
Minor api tidy up.
It is recommended practice to pass the entity to the api. This minor fix up supports that
Eileen McNaughton [Thu, 18 Jan 2018 08:06:44 +0000 (21:06 +1300)]
Merge pull request #11545 from eileenmcnaughton/test_fix
Fix mock test data for PaymentProcessor object.
eileen [Thu, 18 Jan 2018 06:58:05 +0000 (19:58 +1300)]
CRM-17647 test fixes towards ensuring we never rely on the BAO to clean money.
We need to deprecate out BAO cleaning of money. Test fixes ensure we use the (safe) api rather than BAO::create - no functional change
eileen [Thu, 18 Jan 2018 05:54:21 +0000 (18:54 +1300)]
Fix mock test data for PaymentProcessor object.
This only affects unit tests. When dummy data is generated for a PaymentProcessor it will be more
usable
Eileen McNaughton [Thu, 18 Jan 2018 05:03:39 +0000 (18:03 +1300)]
Merge pull request #11541 from eileenmcnaughton/safe_money
CRM-17647 improve testing on the thousand separator.
eileen [Thu, 18 Jan 2018 02:30:28 +0000 (15:30 +1300)]
CRM-17647 improve testing on the thousand separator.
As part of fixing thousand separator issues we can use the deprecated flag to identify when the
BAO_Contribution::create is called without skip_clean_money as we want to move all cleaning to
close to submit. First, however, we need to stop calling that function directly in the test suite
(or only call with skip_clean_money if we are specifically testing it).
Am checking how jenkins likes this format (which was no good on 5.3) & will change others if cheerful
Eileen McNaughton [Thu, 18 Jan 2018 01:22:13 +0000 (14:22 +1300)]
Merge pull request #11521 from JMAConsulting/CRM-21656
CRM-21656: Backend Membership with Priceset applies taxes twice to line_item
Eileen McNaughton [Thu, 18 Jan 2018 00:19:00 +0000 (13:19 +1300)]
Merge pull request #11538 from eileenmcnaughton/regress
CRM-21672 fix intra-rc regression, fatal when deleting participants
Mark Hanna [Thu, 18 Jan 2018 00:12:27 +0000 (18:12 -0600)]
Merge pull request #11534 from GinkgoFJG/CRM-21667-timezone
CRM-21667: Fixed timezone handoff from Drupal6.
colemanw [Wed, 17 Jan 2018 22:56:07 +0000 (17:56 -0500)]
Merge pull request #11524 from eileenmcnaughton/search_test
Add test for DB error on search add to group CRM-21159
colemanw [Wed, 17 Jan 2018 22:53:27 +0000 (17:53 -0500)]
Merge pull request #11506 from tschuettler/CRM-21651
CRM-21651 - Activity_Email/SMS_Add - Fix loading failed when no conta…
Eileen McNaughton [Wed, 17 Jan 2018 22:25:32 +0000 (11:25 +1300)]
Merge pull request #11537 from francescbassas/patch-13
CRM-21670 - Search of active relationships does not appear on Relatio…
eileen [Wed, 17 Jan 2018 22:17:56 +0000 (11:17 +1300)]
CRM-21672 fix intra-rc regression, fatal when deleting participants
Change-Id: Iccbd17d53f07a93c74ce46e9539d1768019a2532
Eileen McNaughton [Wed, 17 Jan 2018 21:04:23 +0000 (10:04 +1300)]
Merge pull request #11535 from mattwire/CRM-21669_emailsendnow_wording
CRM-21669 Consistent wording of Email - Send Now task
Eileen McNaughton [Wed, 17 Jan 2018 20:49:01 +0000 (09:49 +1300)]
Merge pull request #10951 from ErikHommel/master
CRM-21155 - Hook batchItems does not change the csv export
Eileen McNaughton [Wed, 17 Jan 2018 20:44:24 +0000 (09:44 +1300)]
Merge pull request #11530 from jitendrapurohit/CRM-21323
CRM-21323 : Fix backend credit card payment processor selection
deb.monish [Mon, 15 Jan 2018 12:41:57 +0000 (18:11 +0530)]
CRM-21656: Backend Membership with Priceset applies taxes twice to line_item
francescbassas [Wed, 17 Jan 2018 12:44:57 +0000 (13:44 +0100)]
CRM-21670 - Search of active relationships does not appear on Relationship Report
https://issues.civicrm.org/jira/browse/CRM-21670
Matthew Wire [Wed, 17 Jan 2018 12:23:02 +0000 (19:23 +0700)]
Consistent wording of Email - Send Now task
Matthew Wire [Mon, 4 Dec 2017 11:32:25 +0000 (11:32 +0000)]
Add recurring contribution link to membership and contribution detail
Frank J. Gómez [Wed, 17 Jan 2018 00:34:54 +0000 (19:34 -0500)]
CRM-21667: Fixed timezone handoff from Drupal6.
Eileen McNaughton [Tue, 16 Jan 2018 23:37:07 +0000 (12:37 +1300)]
Merge pull request #11492 from eileenmcnaughton/search
CRM-21634 Standardise search fields as they relate to contacts
eileen [Tue, 16 Jan 2018 06:39:15 +0000 (19:39 +1300)]
CRM-21423 test that emails are exported for multiple types
I was thinking this might fail but it is passing so let's lock it in
caller
Eileen McNaughton [Tue, 16 Jan 2018 23:23:51 +0000 (12:23 +1300)]
Merge pull request #11533 from sunnycs121/CRM-21664
CRM-21664 Modified--getting currencies from civicrm_currency table instead bein…
colemanw [Tue, 16 Jan 2018 21:30:18 +0000 (16:30 -0500)]
Merge pull request #11510 from JMAConsulting/CRM-21613
CRM-21613: 'Manage Tag' page Improvements
Hassan Farooq [Tue, 16 Jan 2018 21:16:58 +0000 (16:16 -0500)]
Modified--getting currencies from civicrm_currency table instead being hard-coded. CRM-21664
colemanw [Tue, 16 Jan 2018 21:07:20 +0000 (16:07 -0500)]
Merge pull request #11528 from mukeshcompucorp/fix-page-structure
CRM-21663: Fix Campaign Search and result structure
Jitendra Purohit [Tue, 16 Jan 2018 13:48:59 +0000 (19:18 +0530)]
CRM-21323 : Fix backend credit card payment processor selection
Mukesh Ram [Tue, 16 Jan 2018 12:38:26 +0000 (18:08 +0530)]
CRM-21663: Fix Campaign Search and result structure
Monish Deb [Tue, 16 Jan 2018 11:49:50 +0000 (17:19 +0530)]
Merge pull request #11523 from systopia/CRM-21444-take2
fix CRM-21444: use contact_type name instead of label
systopia [Thu, 4 Jan 2018 13:39:43 +0000 (14:39 +0100)]
fix CRM-21444: use contact_type name instead of label
Eileen McNaughton [Tue, 16 Jan 2018 06:29:20 +0000 (19:29 +1300)]
Merge pull request #11508 from seamuslee001/CRM-21225-core
CRM-21225 Changes to UI to implement the frontend_title field to allo…
deb.monish [Tue, 16 Jan 2018 05:28:13 +0000 (10:58 +0530)]
additional fixes
deb.monish [Fri, 12 Jan 2018 10:50:05 +0000 (16:20 +0530)]
CRM-21613: Search issues on 'Manage Tag' page
eileen [Tue, 16 Jan 2018 00:47:17 +0000 (13:47 +1300)]
CRM-14834 - fix activity export when relationship in export fields
Eileen McNaughton [Tue, 16 Jan 2018 02:14:09 +0000 (15:14 +1300)]
Merge pull request #10692 from jitendrapurohit/CRM-20904
CRM-20904 : joomla cron run - load all daos defined in extensions
Pradeep Nayak [Tue, 16 Jan 2018 02:09:09 +0000 (02:09 +0000)]
CRM-21587, Notice error for Grant date fields (#11497)
* CRM-21587, fixed code to add formattype for date field
----------------------------------------
* CRM-21587: Notice error for grant date fields
https://issues.civicrm.org/jira/browse/CRM-21587
* CRM-21587, removed cruft code
----------------------------------------
* CRM-21587: Notice error for grant date fields
https://issues.civicrm.org/jira/browse/CRM-21587
* CRM-21587, generated DAO file
----------------------------------------
* CRM-21587: Notice error for grant date fields
https://issues.civicrm.org/jira/browse/CRM-21587
* CRM-21587, removed cruft code
----------------------------------------
* CRM-21587: Notice error for grant date fields
https://issues.civicrm.org/jira/browse/CRM-21587
* Standalone code contributor from now.
ahmedg1986 [Tue, 16 Jan 2018 01:47:34 +0000 (07:17 +0530)]
CRM-15049: Fixed include/exclude search for parent groups (#10546)
* CRM-15049: Fixed include/exclude search for parent groups
* Fixed the style errors
* CRM-15049: update comment
Eileen McNaughton [Tue, 16 Jan 2018 01:24:25 +0000 (14:24 +1300)]
Merge pull request #11509 from mydropwizard/crm-21652
CRM-21652: Without using 'finally' clause
eileen [Wed, 3 Jan 2018 21:01:46 +0000 (10:01 +1300)]
CRM-21634 Stdise search fields as they relate to contacts
eileen [Mon, 15 Jan 2018 22:27:26 +0000 (11:27 +1300)]
Add test for DB error on search add to group CRM-21159
I've also removed an unused parameter & a couple of require_once calls
Eileen McNaughton [Mon, 15 Jan 2018 22:25:32 +0000 (11:25 +1300)]
Merge pull request #11422 from ajesamson/master
CRM-21159: Address fields cause DB errors when adding contacts to group from Search Builder
colemanw [Mon, 15 Jan 2018 16:27:10 +0000 (11:27 -0500)]
Merge pull request #11390 from ejegg/bounceProcessing
CRM-21521: fix nested multipart handling in bounce processing
Monish Deb [Mon, 15 Jan 2018 13:40:05 +0000 (19:10 +0530)]
Merge pull request #11183 from jmcclelland/CRM-18048
CRM-18048: keep civicrm_value table names to a minimum length to avoid report errors
Eileen McNaughton [Mon, 15 Jan 2018 05:30:03 +0000 (18:30 +1300)]
Merge pull request #11459 from karthik-awebon/master
Fix for CRM-21485 - Tax not added when renewing membership in backend
Eileen McNaughton [Mon, 15 Jan 2018 03:27:04 +0000 (16:27 +1300)]
Merge pull request #11393 from jitendrapurohit/CRM-21533
CRM-21533 : Outbound setting reverts in non-production sites on execu…
Eileen McNaughton [Mon, 15 Jan 2018 03:21:18 +0000 (16:21 +1300)]
Merge pull request #11366 from mattwire/CRM-21512_remove_restriction_update_subscription_membership
CRM-21512 Remove restriction on 'Update Subscription' when a recurring contribu…
colemanw [Mon, 15 Jan 2018 02:50:23 +0000 (21:50 -0500)]
Merge pull request #11504 from colemanw/CRM-17352
CRM-17352 - Use Backbone.noConflict
Eileen McNaughton [Mon, 15 Jan 2018 01:52:23 +0000 (14:52 +1300)]
Merge pull request #11512 from pradpnayak/moveName
Edit to contributor listing: Standalone code contributor from now.
Eileen McNaughton [Mon, 15 Jan 2018 01:33:08 +0000 (14:33 +1300)]
Merge pull request #11474 from cividesk/CRM-19107
CRM-19107 Fixed PayPal Express redirection issue.
Pradeep Nayak [Fri, 12 Jan 2018 14:06:52 +0000 (19:36 +0530)]
Standalone code contributor from now.
Yashodha Chaku [Fri, 12 Jan 2018 11:01:02 +0000 (16:31 +0530)]
Merge pull request #11047 from mattwire/CRM-21244_setting_to_disable_sending_from_contact_email
CRM-21244 Enhancements to "FROM email addresses"
David Snopek [Fri, 12 Jan 2018 05:45:37 +0000 (23:45 -0600)]
CRM-21652: Without using 'finally' clause
Seamus Lee [Fri, 12 Jan 2018 02:23:56 +0000 (13:23 +1100)]
CRM-21225 Changes to UI to implement the frontend_title field to allow for overriding of the Profile title
Eileen McNaughton [Fri, 12 Jan 2018 02:23:17 +0000 (15:23 +1300)]
Merge pull request #11503 from seamuslee001/CRM-21225-schema
CRM-21225 Allow for display profile alternate - schema changes only
Seamus Lee [Fri, 12 Jan 2018 00:07:05 +0000 (11:07 +1100)]
CRM-17352 fix display of modal on drupal8 (#5)
Seamus Lee [Wed, 10 Jan 2018 21:29:05 +0000 (08:29 +1100)]
CRM-21225 Allow for display profile alternate - schema changes only
Rename column to be frontend_title
colemanw [Thu, 11 Jan 2018 18:48:19 +0000 (13:48 -0500)]
Merge pull request #11482 from eileenmcnaughton/top
CRM-21528 fix add2Group
colemanw [Thu, 11 Jan 2018 18:09:34 +0000 (13:09 -0500)]
Merge pull request #11507 from mydropwizard/crm-21652
CRM-21652: Fix numerous problems with anonymous users registering themselves
colemanw [Thu, 11 Jan 2018 16:19:25 +0000 (11:19 -0500)]
Merge pull request #11480 from yashodha/CRM-21621
CRM-21621 - Provide ability to delete first website field
Coleman Watts [Thu, 11 Jan 2018 15:53:52 +0000 (10:53 -0500)]
CRM-17352 - Use CiviCRM to load scripts for consistency
Mathieu Lu [Thu, 11 Jan 2018 15:52:38 +0000 (10:52 -0500)]
Merge pull request #11488 from tommybobo/user_agent
CRM-21629 System Check: Set User Agent to security filters accept check
David Snopek [Thu, 11 Jan 2018 14:54:57 +0000 (08:54 -0600)]
CRM-21652: Fix numerous problems with anonymous users registering themselves
Thomas Schüttler [Thu, 11 Jan 2018 12:56:59 +0000 (13:56 +0100)]
CRM-21651 - Activity_Email/SMS_Add - Fix loading failed when no contact is found
Monish Deb [Thu, 11 Jan 2018 11:24:28 +0000 (16:54 +0530)]
Merge pull request #11494 from yashodha/CRM-21635
CRM-21635 - Expose contact custom data on contribution summary report
Yashodha Chaku [Thu, 11 Jan 2018 07:32:15 +0000 (13:02 +0530)]
Merge pull request #11500 from jitendrapurohit/CRM-21647
CRM-21647 - Fatal error on deleting any contribution record
Eileen McNaughton [Thu, 11 Jan 2018 00:32:11 +0000 (13:32 +1300)]
Merge pull request #11505 from seamuslee001/Jazz-Man-patch-2
CRM-21591 Fix PHP Notice A non well formed numeric value encountered …
Jazz [Mon, 18 Dec 2017 10:37:14 +0000 (12:37 +0200)]
CRM-21591 Fix PHP Notice A non well formed numeric value encountered on Misc settings page
PHP Notice: A non well formed numeric value encountered
Coleman Watts [Wed, 10 Jan 2018 21:57:58 +0000 (16:57 -0500)]
CRM-17352 - Use Backbone.noConflict
Eileen McNaughton [Wed, 10 Jan 2018 20:23:25 +0000 (09:23 +1300)]
Merge pull request #11447 from seamuslee001/CRM-21591
CRM-21591 Add Test of formatUnitSize Function
Jitendra Purohit [Wed, 10 Jan 2018 10:07:28 +0000 (15:37 +0530)]
CRM-21647 - Fatal error on deleting any contribution record
Eileen McNaughton [Wed, 10 Jan 2018 03:56:24 +0000 (16:56 +1300)]
Merge pull request #11499 from pradpnayak/CRM-21644
CRM-21644, Fixed set default for Preferred Communication Method
Monish Deb [Wed, 10 Jan 2018 03:54:16 +0000 (09:24 +0530)]
Merge pull request #11491 from mlutfy/crm21627
CRM-21627: makeMultilingual: update dbLocale to avoid fatal if lcMessages was not set
Eileen McNaughton [Wed, 10 Jan 2018 01:24:11 +0000 (14:24 +1300)]
Merge pull request #11463 from MegaphoneJon/CRM-21609
CRM-21609 - Correctly handle PayPalPro recurring payments whose amoun…
Pradeep Nayak [Tue, 9 Jan 2018 21:22:08 +0000 (02:52 +0530)]
CRM-21644, Fixed set default for Preferred Communication Method
----------------------------------------
* CRM-21644: Preferred Communication Method is not set to default for contact
https://issues.civicrm.org/jira/browse/CRM-21644
Mathieu Lutfy [Tue, 9 Jan 2018 20:53:58 +0000 (15:53 -0500)]
CRM-21627: makeMultilingual: update dbLocale to avoid fatal if lcMessages was not set (adds unit-test fix by Monish Deb)
yashodha [Tue, 9 Jan 2018 08:57:19 +0000 (14:27 +0530)]
CRM-21635 - Expose contact custom data on contribution summary report
Elliott Eggleston [Tue, 5 Dec 2017 16:17:34 +0000 (11:17 -0500)]
CRM-21521: fix nested multipart handling
When for example a multipart-report email body's first part is
multipart-related, extract the text correctly instead of crashing.
This logic should handle all kinds of weird multipart nesting, up
to MIME_MAX_RECURSION levels deep.
colemanw [Mon, 8 Jan 2018 16:44:14 +0000 (11:44 -0500)]
Merge pull request #11350 from MiyaNoctem/CRM-21498-change-status-of-linked-cases
CRM-21498: Implement Option to Change Status of Linked Cases
Mathieu Lutfy [Sun, 7 Jan 2018 22:30:36 +0000 (17:30 -0500)]
CRM-21627: makeMultilingual: update dbLocale to avoid fatal if lcMessages was not set.
Eileen McNaughton [Sat, 6 Jan 2018 05:23:18 +0000 (18:23 +1300)]
Merge pull request #11408 from cividesk/CRM-21554
CRM-21554 Offline Credit Card Membership Renewal not showing any error message on failure
Eileen McNaughton [Sat, 6 Jan 2018 05:21:56 +0000 (18:21 +1300)]
Merge pull request #11479 from JMAConsulting/ut-fix
Fix unit test failure
Eileen McNaughton [Sat, 6 Jan 2018 05:20:10 +0000 (18:20 +1300)]
Merge pull request #10841 from JMAConsulting/CRM-21050
CRM-21050: Use datepicker for all date fields used in contribution backoffice form
Tommy Bobo [Fri, 5 Jan 2018 16:14:00 +0000 (11:14 -0500)]
CRM-21629 System Check: Set User Agent to security filters accept check
Sunil Pawar [Fri, 5 Jan 2018 06:05:32 +0000 (11:35 +0530)]
use setstatus directly to error message
deb.monish [Thu, 4 Jan 2018 18:54:20 +0000 (00:24 +0530)]
additional fixes
Karthikeyan [Thu, 4 Jan 2018 12:36:32 +0000 (18:06 +0530)]
Blank line removed
projects / civicrm-core.git / log