colemanw [Mon, 29 Jan 2018 19:14:40 +0000 (14:14 -0500)]
Merge pull request #11567 from eileenmcnaughton/api_custom
Towards CRM-21140, support at api level for custom data on any entity.
Eileen McNaughton [Sun, 28 Jan 2018 21:55:58 +0000 (10:55 +1300)]
Merge pull request #11594 from mfb/ellipsify-mb_strlen
Use mb_strlen() in ellipsify() to avoid excessive multibyte truncation
colemanw [Sun, 28 Jan 2018 21:52:22 +0000 (16:52 -0500)]
Merge pull request #11595 from seamuslee001/multiple_relationship_type
CRM-21717 Allow for selecting multiple relationship types in Advanced Search
Eileen McNaughton [Sun, 28 Jan 2018 21:31:21 +0000 (10:31 +1300)]
Merge pull request #11598 from seamuslee001/CRM-20769-js
CRM-20769 Add in cancel_button_text and submit_button_text fields to the civicr…
Eileen McNaughton [Sun, 28 Jan 2018 21:06:51 +0000 (10:06 +1300)]
Merge pull request #11584 from mlutfy/report-act-nfc
CRM-21715 Activity Report: move SQL creation in a buildQuery function.
Seamus Lee [Sun, 28 Jan 2018 04:14:24 +0000 (15:14 +1100)]
Add in cancel_button_text and submit_button_text fields to the civicrm_uf schema in crm.uf.js
Seamus Lee [Sat, 27 Jan 2018 23:54:13 +0000 (10:54 +1100)]
Minor fixes and add unit tests
Mathieu Lutfy [Thu, 25 Jan 2018 03:53:42 +0000 (22:53 -0500)]
CRM-21715: Activity Report: move SQL creation in a buildQuery function.
mark burdett [Fri, 26 Jan 2018 20:48:25 +0000 (12:48 -0800)]
Use mb_strlen() in ellipsify() to avoid excessive multibyte truncation
Seamus Lee [Fri, 26 Jan 2018 06:48:58 +0000 (17:48 +1100)]
Allow for selecting multiple relationship types in Advanced Search
Eileen McNaughton [Thu, 25 Jan 2018 20:46:09 +0000 (09:46 +1300)]
Merge pull request #11527 from lemacarl/CRM-21524
CRM-21524 - Fix merge contacts when one is deceased
Lema Carl Andrew [Thu, 25 Jan 2018 06:01:02 +0000 (09:01 +0300)]
CRM-21524 - CRM\Export - Fix merge contacts when deceased
Eileen McNaughton [Thu, 25 Jan 2018 04:51:43 +0000 (17:51 +1300)]
Merge pull request #11563 from eileenmcnaughton/static
CRM-21256 Improve performance of payment processor load
colemanw [Thu, 25 Jan 2018 02:48:44 +0000 (21:48 -0500)]
Merge pull request #11569 from eileenmcnaughton/api_clean
Minor api clean up.
Tim Otten [Wed, 24 Jan 2018 22:19:08 +0000 (14:19 -0800)]
Merge pull request #11576 from totten/master-wporg2
CRM-16421 - Add civicrm-setup. Build civicrm-*-wporg.zip
Eileen McNaughton [Wed, 24 Jan 2018 20:15:56 +0000 (09:15 +1300)]
Merge pull request #11580 from seamuslee001/CRM-21687
CRM-21687 fix issue with MariaDB 10.2 logging query writing due to cu…
colemanw [Wed, 24 Jan 2018 16:28:34 +0000 (11:28 -0500)]
Merge pull request #11582 from colemanw/Api4
Api4 - Update entity directory
Coleman Watts [Wed, 24 Jan 2018 16:13:02 +0000 (11:13 -0500)]
Api4 - Update entity directory
Seamus Lee [Tue, 23 Jan 2018 23:29:44 +0000 (10:29 +1100)]
CRM-21687 fix issue with MariaDB 10.2 logging query writing due to current_timestamp and timestamp getting () added on the end in Maria10.2
Eileen McNaughton [Tue, 23 Jan 2018 22:06:42 +0000 (11:06 +1300)]
Merge pull request #11163 from mickadoo/CRM-21334-fire-hooks-on-contact-image-deletion
CRM-21334: Fire hooks on Contact Image Deletion
Eileen McNaughton [Tue, 23 Jan 2018 21:52:55 +0000 (10:52 +1300)]
Merge pull request #11579 from jmcclelland/CRM-21701
CRM-21701 - ensure street addresses are parsed
Eileen McNaughton [Tue, 23 Jan 2018 20:31:14 +0000 (09:31 +1300)]
Merge pull request #11574 from eileenmcnaughton/test_fixes
Test fixes, towards CRM-17647
Jamie McClelland [Tue, 23 Jan 2018 15:03:17 +0000 (10:03 -0500)]
CRM-21701 - ensure street addresses are parsed
Even if USPS street parsing is disabled.
colemanw [Tue, 23 Jan 2018 14:54:30 +0000 (09:54 -0500)]
Merge pull request #11577 from eileenmcnaughton/format_amount
CRM-21698 Format amount
eileen [Tue, 23 Jan 2018 08:54:43 +0000 (21:54 +1300)]
CRM-21698 move formatting to processor class.
This moves the fix for CRM-16460 to the processor class, providing a helper function.
The fix put number formatting deep into the BAO - when they don't work right
(depending on presence of money_format function I think) negative amounts
become 0
Tim Otten [Tue, 23 Jan 2018 07:41:15 +0000 (23:41 -0800)]
CRM-16421 - distmaker - Generate civicrm-*-wporg.zip
Tim Otten [Tue, 23 Jan 2018 06:38:05 +0000 (22:38 -0800)]
CRM-16421 - gitignore - Ignore the flag-file for civicrm-setup
----------------------------------------
* CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository
https://issues.civicrm.org/jira/browse/CRM-16421
Tim Otten [Tue, 23 Jan 2018 06:37:49 +0000 (22:37 -0800)]
CRM-16421 - composer.json - Include civicrm-setup library
----------------------------------------
* CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository
https://issues.civicrm.org/jira/browse/CRM-16421
eileen [Tue, 23 Jan 2018 05:21:51 +0000 (18:21 +1300)]
Test fixes, towards CRM-17647
Test fixes towards never calling Contribution::Create without skipCleanMoney
Eileen McNaughton [Mon, 22 Jan 2018 22:49:17 +0000 (11:49 +1300)]
Merge pull request #11572 from civicrm/4.7.30-rc
4.7.30 rc to master
Eileen McNaughton [Mon, 22 Jan 2018 22:48:35 +0000 (11:48 +1300)]
Merge pull request #11548 from eileenmcnaughton/money_rc
CRM-17647 fix for submitting payment with thousand separator
colemanw [Mon, 22 Jan 2018 22:08:17 +0000 (17:08 -0500)]
Merge pull request #11568 from eileenmcnaughton/CRM-21071
CRM-21071 - Fix event location saving
eileen [Mon, 22 Jan 2018 03:02:08 +0000 (16:02 +1300)]
Minor api clean up.
Increase places where entity passed to 'basic_create'
Monish Deb [Mon, 22 Jan 2018 06:34:36 +0000 (12:04 +0530)]
Merge pull request #11525 from eileenmcnaughton/deprecated
CRM-21660 Remove use of deprecated function on mapping_type
eileen [Mon, 22 Jan 2018 04:30:31 +0000 (17:30 +1300)]
CRM-21071 fix form to hold id before callling (nasty) block:create
Coleman Watts [Wed, 27 Sep 2017 23:11:08 +0000 (19:11 -0400)]
CRM-21071 - Simplify event location form to not use ajax
This form does not do anything dynamic so ajax was unnecessarily complex.
eileen [Mon, 22 Jan 2018 03:19:21 +0000 (16:19 +1300)]
Towards CRM-21140, support at api level for custom data on any entity.
This extends the ability to support additional entities for custom data by
adding them to the OptionGroup 'cg_extends'. At this stage there
are 2 additional tested (supported) entities - UFGroup, PriceSet, PaymentToken.
Will add more next iteration
Eileen McNaughton [Mon, 22 Jan 2018 03:21:25 +0000 (16:21 +1300)]
Merge pull request #11566 from eileenmcnaughton/typo
Fix typo (very recent)
eileen [Mon, 22 Jan 2018 03:10:52 +0000 (16:10 +1300)]
Fix typo (very recent)
eileen [Sun, 21 Jan 2018 22:48:23 +0000 (11:48 +1300)]
CRM-21256 Improve performance of payment processor load
colemanw [Sun, 21 Jan 2018 22:39:05 +0000 (17:39 -0500)]
Merge pull request #11561 from mattwire/CRM-21688_fontawesome_membership_autorenew
CRM-21688 Use fontawesome check for membership auto-renew status
Eileen McNaughton [Sun, 21 Jan 2018 22:38:39 +0000 (11:38 +1300)]
Merge pull request #11424 from mattwire/CRM-21573_disable_contact_email_receiptfrom
CRM-21573 Allow to disable sending of email from activity source contact email for receipt
Eileen McNaughton [Sun, 21 Jan 2018 22:30:04 +0000 (11:30 +1300)]
Merge pull request #11398 from yashodha/CRM-21540
CRM-21540 - Add support for auto-complete fields in the batch entry f…
Eileen McNaughton [Sun, 21 Jan 2018 22:18:53 +0000 (11:18 +1300)]
Merge pull request #11486 from jitendrapurohit/CRM-21622fix
CRM-21623 - Smart Group Relative Date not saving for some fields in A…
Eileen McNaughton [Sun, 21 Jan 2018 21:57:38 +0000 (10:57 +1300)]
Merge pull request #11557 from JKingsnorth/CRM-21683
CRM-21683 Standardise filter in mailing summary report
Eileen McNaughton [Sun, 21 Jan 2018 21:31:43 +0000 (10:31 +1300)]
Merge pull request #11536 from mattwire/CRM-21671_abstract_core_task
CRM-21671 abstract core task
Matthew Wire [Sat, 20 Jan 2018 03:56:33 +0000 (10:56 +0700)]
Use fontawesome check for membership auto-renew status and add exclamation for auto-renew but error (eg. subscription cancelled).
Tim Otten [Sat, 20 Jan 2018 23:49:00 +0000 (15:49 -0800)]
Merge pull request #11052 from totten/master-dm-iats
EXT-56 - Add com.iatspayments.civicrm to tarballs
colemanw [Fri, 19 Jan 2018 21:28:01 +0000 (16:28 -0500)]
Merge pull request #11372 from ejegg/apiFixAddress
Add API parameter for fix_address
colemanw [Fri, 19 Jan 2018 21:24:54 +0000 (16:24 -0500)]
Merge pull request #11559 from mountev/4.7-contact-subtype-prevents-inclusion-in-profile
CRM-21684 contact subtype fields prevent inclusion in profile/receipt…
Eileen McNaughton [Fri, 19 Jan 2018 20:38:01 +0000 (09:38 +1300)]
Merge pull request #10485 from lcdservices/CRM-20707
CRM-20707 include start/end dates when updating membership
Mountev [Fri, 19 Jan 2018 18:37:41 +0000 (18:37 +0000)]
CRM-21684 contact subtype fields prevent inclusion in profile/receipt email
colemanw [Fri, 19 Jan 2018 14:08:32 +0000 (09:08 -0500)]
Merge pull request #11555 from mattwire/CRM-21511_recur_on_membership_detail_fix
CRM-21511 Fix template variable for contribution_recur_id
JKingsnorth [Fri, 19 Jan 2018 10:43:05 +0000 (10:43 +0000)]
CRM-21683 Standardise filter in mailing summary report
Matthew Wire [Fri, 19 Jan 2018 05:36:58 +0000 (12:36 +0700)]
Fix template variable for contribution_recur_id
Brian Shaughnessy [Fri, 19 Jan 2018 03:49:28 +0000 (22:49 -0500)]
CRM-20707 include start/end dates when updating membership
Matthew Wire [Fri, 19 Jan 2018 03:21:14 +0000 (10:21 +0700)]
Fix docblock type definitions
Matthew Wire [Tue, 2 Jan 2018 09:04:15 +0000 (16:04 +0700)]
Convert Event to use core Task class
Matthew Wire [Tue, 2 Jan 2018 09:00:40 +0000 (16:00 +0700)]
Add abstract core Task class
eileen [Thu, 18 Jan 2018 22:09:10 +0000 (11:09 +1300)]
CRM-17647 membership form fix for thousand processing error.
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 [Wed, 17 Jan 2018 22:56:05 +0000 (11:56 +1300)]
CRM-17647 fix for submitting payment with thousand separator
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
projects / civicrm-core.git / log