k [Tue, 15 Mar 2016 17:13:26 +0000 (13:13 -0400)]
Solving RT ticket #
1092988
adding civicrm ID to contributin record
Lisa Marie Maginnis [Thu, 15 Oct 2015 03:10:17 +0000 (23:10 -0400)]
reverted js changes back to upstream
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:33:03 +0000 (13:33 -0400)]
ipn receiver for external api
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:53 +0000 (13:28 -0400)]
Priceset 2nd half
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:43 +0000 (13:28 -0400)]
Priceset/debugwatchdog
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:18:43 +0000 (13:18 -0400)]
Removed cache rebuild from the GroupContact
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:15:03 +0000 (13:15 -0400)]
RT#765026, patch for null values in civicrm_acl_cache
Ruben Rodriguez [Thu, 10 Sep 2015 22:24:23 +0000 (18:24 -0400)]
Added the current uncommited changes to production code, and rebased to 4.6.8
Lisa Marie Maginnis [Thu, 1 May 2014 21:29:27 +0000 (17:29 -0400)]
Additional files for PDF/Latex
Lisa Marie Maginnis [Thu, 1 May 2014 21:04:18 +0000 (17:04 -0400)]
Our changes
Tim Otten [Wed, 7 Mar 2018 23:39:57 +0000 (15:39 -0800)]
Merge pull request #11741 from agh1/4.7.31-releasenotes
4.7.31 release notes
Andrew Hunt [Wed, 7 Mar 2018 20:22:41 +0000 (15:22 -0500)]
4.7.31 release notes: last-minute credit add
Andrew Hunt [Wed, 7 Mar 2018 19:56:58 +0000 (14:56 -0500)]
4.7.31 release notes: fixed one mis-categorized thing
Andrew Hunt [Wed, 7 Mar 2018 17:03:48 +0000 (12:03 -0500)]
4.7.31 release notes: alphabetized sections and filled synopsis
Also added late change
Andrew Hunt [Wed, 7 Mar 2018 16:59:56 +0000 (11:59 -0500)]
4.7.31 release notes: finished bugs
Andrew Hunt [Wed, 7 Mar 2018 02:59:34 +0000 (21:59 -0500)]
4.7.31 release notes: added code contributors since 4.7.14 to CONTRIBUTORS.txt
Andrew Hunt [Wed, 7 Mar 2018 01:44:23 +0000 (20:44 -0500)]
4.7.31 release notes: finished contributors
Andrew Hunt [Wed, 7 Mar 2018 00:26:51 +0000 (19:26 -0500)]
4.7.31 release notes: done with features
Andrew Hunt [Wed, 28 Feb 2018 17:23:51 +0000 (12:23 -0500)]
4.7.31 release notes: first items, boilerplate
Seamus Lee [Tue, 6 Mar 2018 20:10:28 +0000 (07:10 +1100)]
Merge pull request #11749 from eileenmcnaughton/4.7.31-rc
CRM-21771: error when viewing event registration with linked contribu…
Jitendra Purohit [Thu, 22 Feb 2018 08:43:57 +0000 (14:13 +0530)]
CRM-21771: error when viewing event registration with linked contribution
Monish Deb [Sun, 18 Feb 2018 02:52:41 +0000 (08:22 +0530)]
Merge pull request #11676 from seamuslee001/CRM-21759
CRM-21759 Remove template variable as not needed and causing issues o…
colemanw [Fri, 16 Feb 2018 19:04:23 +0000 (14:04 -0500)]
Merge pull request #11665 from JMAConsulting/CRM-21760-rc
CRM-21760: Manager Name is missing in 'Find Cases' search list
colemanw [Fri, 16 Feb 2018 19:03:59 +0000 (14:03 -0500)]
Remove unused var
Seamus Lee [Thu, 15 Feb 2018 20:54:52 +0000 (07:54 +1100)]
CRM-21759 Remove template variable as not needed and causing issues on Joomla in 4.7.30
deb.monish [Sun, 11 Feb 2018 18:40:12 +0000 (00:10 +0530)]
CRM-21760: Manager Name is missing in 'Find Cases' search list
Eileen McNaughton [Tue, 13 Feb 2018 20:36:38 +0000 (09:36 +1300)]
Merge pull request #11664 from eileenmcnaughton/geo
Change geocoder message check.
Eileen McNaughton [Tue, 13 Feb 2018 20:00:29 +0000 (09:00 +1300)]
Merge pull request #11520 from JMAConsulting/CRM-21654
CRM-21654: Support custom file field on Batch Entry Profile
eileen [Mon, 12 Feb 2018 19:40:08 +0000 (08:40 +1300)]
Change geocoder message check.
We should be using a dummy geocoder - but since we are not let's at least check for the correct message
Eileen McNaughton [Mon, 12 Feb 2018 19:26:56 +0000 (08:26 +1300)]
Merge pull request #11597 from seamuslee001/CRM-20996
CRM-20996 fix db error when using the Copy function for profiles from…
Eileen McNaughton [Mon, 12 Feb 2018 19:01:58 +0000 (08:01 +1300)]
Merge pull request #11644 from omarabuhussein/CRM-21743-fix-copying-event-template
CRM-21743: Fix creating new event template from existing one
Eileen McNaughton [Mon, 12 Feb 2018 05:18:31 +0000 (18:18 +1300)]
Merge pull request #11661 from Detsieber/core-2
dev/core#2 Display Inbound Email: linefeed fixed
Eileen McNaughton [Sun, 11 Feb 2018 22:10:50 +0000 (11:10 +1300)]
Merge pull request #11539 from eileenmcnaughton/payment
CRM-17647 fix for submitting payment with thousand separator
deb.monish [Sun, 11 Feb 2018 13:37:21 +0000 (19:07 +0530)]
additional fixes
eileen [Wed, 17 Jan 2018 22:56:05 +0000 (11:56 +1300)]
CRM-17647 fix for submitting payment with thousand separator
Detlev Sieber [Fri, 9 Feb 2018 09:57:51 +0000 (10:57 +0100)]
dev/core#2 Display Inbound Email: linefeed fixed
deb.monish [Mon, 15 Jan 2018 05:45:47 +0000 (11:15 +0530)]
CRM-21654: Support custom file field on Batch Entry Profile
Eileen McNaughton [Fri, 9 Feb 2018 00:00:02 +0000 (13:00 +1300)]
Merge pull request #11655 from JMAConsulting/CRM-20676-ut
Unit test for CRM-20676 fix
Eileen McNaughton [Thu, 8 Feb 2018 23:56:10 +0000 (12:56 +1300)]
Merge pull request #11656 from JMAConsulting/CRM-21751
CRM-21751: Move SMS provider ID to 'Select Recipients' page from 'SMS content'
Eileen McNaughton [Thu, 8 Feb 2018 19:59:58 +0000 (08:59 +1300)]
Merge pull request #11659 from JMAConsulting/ut-fix
Unit test fixes
deb.monish [Thu, 8 Feb 2018 12:26:36 +0000 (17:56 +0530)]
Unit test fixes
Monish Deb [Thu, 8 Feb 2018 07:54:02 +0000 (13:24 +0530)]
Merge pull request #11654 from eileenmcnaughton/greetings_earthling
CRM-21750 support addressee_id, email_greeting_id, postal_greeting_id as api filters
Monish Deb [Thu, 8 Feb 2018 07:27:17 +0000 (12:57 +0530)]
Merge pull request #11638 from ixiam/CRM-21343
CRM-21343: Add cancel filters for Contribution search
deb.monish [Thu, 8 Feb 2018 06:49:46 +0000 (12:19 +0530)]
CRM-21751: Move SMS provider ID to 'Select Recipients' page from 'SMS content'
Monish Deb [Thu, 8 Feb 2018 05:45:14 +0000 (11:15 +0530)]
Merge pull request #11646 from eileenmcnaughton/thous
CRM-17647 fix batch form & Online Event form to do money cleaning on the form
Monish Deb [Thu, 8 Feb 2018 05:34:16 +0000 (11:04 +0530)]
Merge pull request #11461 from mattwire/tax_calcs_on_edit_contribution
CRM-20676 Add tax_amount to contribution create params so it doesn't get added …
deb.monish [Thu, 8 Feb 2018 05:30:13 +0000 (11:00 +0530)]
Unit test for CRM-20676 fix
eileen [Thu, 8 Feb 2018 01:05:33 +0000 (14:05 +1300)]
Remove code comment previously rendered obsolute by removing clean action
eileen [Wed, 7 Feb 2018 08:41:31 +0000 (21:41 +1300)]
CRM-17647 add tests & form cleaning of event thousand separators
style fix
eileen [Wed, 7 Feb 2018 08:08:28 +0000 (21:08 +1300)]
CRM-17647 fix another instance of mishandling thousand separators
eileen [Thu, 8 Feb 2018 04:50:33 +0000 (17:50 +1300)]
CRM-21750 support addressee_id, email_greeting_id, postal_greeting_id as api filters
Eileen McNaughton [Thu, 8 Feb 2018 03:47:07 +0000 (16:47 +1300)]
Merge pull request #11636 from eileenmcnaughton/view_only
CRM-21738 fix transfer of view_only custom data.
Monish Deb [Thu, 8 Feb 2018 03:24:08 +0000 (08:54 +0530)]
Merge pull request #11652 from eileenmcnaughton/hack_test
Fix unit test to not rely on hacking the DB to have ids for price set…
Eileen McNaughton [Thu, 8 Feb 2018 02:49:36 +0000 (15:49 +1300)]
Merge pull request #11653 from eileenmcnaughton/evil
CRM-21749 fix obscure regression :Mailing api no longer respecting '_skip_evil_bao_auto_schedule_'
eileen [Tue, 6 Feb 2018 05:36:02 +0000 (18:36 +1300)]
CRM-21738 fix transfer of view_only custom data.
View only custom data was not being transferred during the merge despite code in order
to achieve that. The reason was the metadata was being used from the (hateful)
getGroupTree function, but without passing $permissions = FALSE it was not
returning viewOnly fields. Note that this metadata retrieval function is a bad place for
filtering - they should be in separate functions.
eileen [Thu, 8 Feb 2018 01:07:07 +0000 (14:07 +1300)]
CRM-21749 fix obscure regression :Mailing api no longer respecting '_skip_evil_bao_auto_schedule_'
Eileen McNaughton [Thu, 8 Feb 2018 00:33:30 +0000 (13:33 +1300)]
Merge pull request #11645 from eileenmcnaughton/prox_smart_group
CRM-21744 fix proximity search to work with smart groups
eileen [Wed, 7 Feb 2018 23:03:22 +0000 (12:03 +1300)]
Fix unit test to not rely on hacking the DB to have ids for price sets & associated values
eileen [Wed, 7 Feb 2018 07:22:00 +0000 (20:22 +1300)]
CRM-21744 fix proximity search to work with smart groups
Eileen McNaughton [Wed, 7 Feb 2018 22:42:46 +0000 (11:42 +1300)]
Merge pull request #11631 from mattwire/CRM-20625_payproc_extension_dont_kill_civi
CRM-20625 Don't crash if we can't find the payment processor class.
colemanw [Wed, 7 Feb 2018 22:22:46 +0000 (17:22 -0500)]
Merge pull request #11621 from eileenmcnaughton/trait
CRM-19752 Improve performance for non-ACL users on summaryQuery
Matthew Wire [Mon, 5 Feb 2018 15:38:29 +0000 (15:38 +0000)]
Don't crash if we can't find the payment processor class. Add warning when editing a payment processor that doesn't exist.
Eileen McNaughton [Wed, 7 Feb 2018 20:03:06 +0000 (09:03 +1300)]
Merge pull request #11651 from civicrm/4.7.30-rc
4.7.30 rc merge to master
Eileen McNaughton [Wed, 7 Feb 2018 20:01:57 +0000 (09:01 +1300)]
Merge pull request #11648 from eileenmcnaughton/xml
CRM-21707 follow up fix on xml
Eileen McNaughton [Wed, 7 Feb 2018 19:56:22 +0000 (08:56 +1300)]
Merge pull request #11640 from tttp/fix-contrib-search
fix dev/core#1: allow to search contributions that are in progress
Tim Otten [Wed, 7 Feb 2018 19:05:59 +0000 (20:05 +0100)]
Merge pull request #11531 from agh1/4.7.30-releasenotes
4.7.30 release notes
Tim Otten [Wed, 7 Feb 2018 18:51:09 +0000 (19:51 +0100)]
Merge pull request #11115 from pbatroff/co_deception_test
Added trait to support Codeception tests
Andrew Hunt [Wed, 7 Feb 2018 17:19:23 +0000 (12:19 -0500)]
4.7.30 release notes: incorporated late RC changes
Andrew Hunt [Wed, 7 Feb 2018 04:26:34 +0000 (23:26 -0500)]
4.7.30 release notes: finished text
Andrew Hunt [Wed, 7 Feb 2018 01:13:07 +0000 (20:13 -0500)]
4.7.30 release notes: finished contributors
Andrew Hunt [Tue, 6 Feb 2018 22:11:40 +0000 (17:11 -0500)]
4.7.30 release notes: done with features
Andrew Hunt [Tue, 16 Jan 2018 16:13:21 +0000 (11:13 -0500)]
4.7.30 release notes: boilerplate and initial work
Andrew Hunt [Tue, 16 Jan 2018 16:10:06 +0000 (11:10 -0500)]
4.7.30 release notes - raw from script
colemanw [Wed, 7 Feb 2018 16:15:59 +0000 (11:15 -0500)]
Merge pull request #11639 from aydun/CRM-21741-crmEditable-params
Allow data-params to be specified as an item property and passed to CRM.api3 call
Philipp Batroff [Wed, 7 Feb 2018 16:04:44 +0000 (17:04 +0100)]
Fixed typo, return value in amOnRoute
colemanw [Wed, 7 Feb 2018 14:59:40 +0000 (09:59 -0500)]
Merge pull request #11643 from eileenmcnaughton/prox_search
CRM-21742 Proximity search validation improvement
Philipp Batroff [Wed, 11 Oct 2017 22:41:03 +0000 (00:41 +0200)]
Added Trait for Codeception Integration
Monish Deb [Wed, 7 Feb 2018 13:19:14 +0000 (18:49 +0530)]
Merge pull request #11542 from eileenmcnaughton/prox
CRM-21674 allow lat & long to be pre-calculated for proximity query / search
Luciano Spiegel [Wed, 7 Feb 2018 12:42:03 +0000 (13:42 +0100)]
CRM-21343: Fix Code Style Issues
eileen [Wed, 7 Feb 2018 11:12:42 +0000 (00:12 +1300)]
CRM-21707 follow up fix on xml
I altered the DAO to test the change in callback & then committed that without fixing the xml. This brings the xml into line
Aidan Saunders [Wed, 7 Feb 2018 08:51:00 +0000 (08:51 +0000)]
Updated as per Coleman's comment
eileen [Thu, 18 Jan 2018 03:28:39 +0000 (16:28 +1300)]
CRM-21674 allow lat & long to be pre-calculated for proximity query or search
eileen [Wed, 7 Feb 2018 00:45:16 +0000 (13:45 +1300)]
CRM-21742 use validation rather than error when geocoding not possible
Monish Deb [Wed, 7 Feb 2018 01:55:37 +0000 (07:25 +0530)]
Merge pull request #11540 from eileenmcnaughton/yahoo
CRM-19784 remove yahoo geocoder & clean up geocoding code
Monish Deb [Wed, 7 Feb 2018 01:44:59 +0000 (07:14 +0530)]
Merge pull request #11606 from eileenmcnaughton/pcp
CRM-21728 Prevent intermittant fail on pcp api calls.
Monish Deb [Wed, 7 Feb 2018 01:42:21 +0000 (07:12 +0530)]
Merge pull request #11633 from eileenmcnaughton/option_value
CRM-21737 loosen option value validation to support language option group
Omar abu hussein [Wed, 7 Feb 2018 01:35:32 +0000 (03:35 +0200)]
CRM-21743: Fix creating new event template from existing one
Eileen McNaughton [Tue, 6 Feb 2018 23:18:17 +0000 (12:18 +1300)]
Merge pull request #11593 from mfb/db-error-data-too-long-for-column-subject
Amount and source could exceed max length of subject column
xavier.dutoit [Tue, 6 Feb 2018 17:45:38 +0000 (18:45 +0100)]
fix dev/core#1
Aidan Saunders [Tue, 6 Feb 2018 15:00:32 +0000 (15:00 +0000)]
Allow data-params to be specified as an item property and passed to
CRM.api3 call
colemanw [Tue, 6 Feb 2018 15:33:57 +0000 (10:33 -0500)]
Merge pull request #11607 from eileenmcnaughton/serialize
CRM-21707 increase api testing / use of serialization metadata. Add depre…
Monish Deb [Tue, 6 Feb 2018 13:52:02 +0000 (19:22 +0530)]
Merge pull request #11476 from eileenmcnaughton/report
CRM-21616 ensure sql metadata is available from api
Luciano Spiegel [Tue, 6 Feb 2018 10:48:57 +0000 (11:48 +0100)]
add canceled fields to contribution search
Eileen McNaughton [Tue, 6 Feb 2018 10:04:05 +0000 (23:04 +1300)]
Merge pull request #11623 from mattwire/CRM-21721_unit_test
CRM-21721 Add unit test for createProportionalEntry with zero amount
Eileen McNaughton [Tue, 6 Feb 2018 10:01:10 +0000 (23:01 +1300)]
Merge pull request #11558 from JMAConsulting/CRM-21260
CRM-21316: Add missing code to handle smart group on sms mode
Monish Deb [Tue, 6 Feb 2018 09:38:51 +0000 (15:08 +0530)]
Merge pull request #11575 from eileenmcnaughton/currency_contribution_update
CRM-17647 fix ContributionForm to use skipCleanMoney on update & upda…
deb.monish [Fri, 2 Feb 2018 15:55:31 +0000 (21:25 +0530)]
additional fixes and optimisation
Eileen McNaughton [Tue, 6 Feb 2018 04:38:27 +0000 (17:38 +1300)]
Merge pull request #11635 from civicrm/4.7.30-rc
4.7.30 rc merge to master
Eileen McNaughton [Tue, 6 Feb 2018 04:11:26 +0000 (17:11 +1300)]
Merge pull request #11634 from agh1/CRM-21735
CRM-21735: Revert CRM-21575 changes pending fix
Andrew Hunt [Tue, 6 Feb 2018 02:00:08 +0000 (21:00 -0500)]
Revert "CRM-21575 - Websites of same type are over-written"
This reverts commit
dddcec4545602395fc865273175eb7227947cf74.