Kurund Jalmi [Sun, 6 Sep 2015 01:07:09 +0000 (18:07 -0700)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-05-17-42-45
Conflicts:
CRM/Case/BAO/Query.php
CRM/Member/Form/MembershipRenewal.php
CRM/Utils/Check/Security.php
sql/civicrm_generated.mysql
xml/templates/civicrm_country.tpl
Dave Greenberg [Sat, 5 Sep 2015 15:42:34 +0000 (08:42 -0700)]
Merge pull request #6675 from nganivet/CRM-17149
CRM-17149: full fix
Kurund Jalmi [Fri, 4 Sep 2015 21:46:07 +0000 (14:46 -0700)]
Merge pull request #6446 from colemanw/CRM-13160
CRM-13160 - Fix deleting relationshipType from MembershipType
Kurund Jalmi [Fri, 4 Sep 2015 06:00:16 +0000 (23:00 -0700)]
Merge pull request #6683 from kurund/CRM-16719
CRM-16719: test fixes
Kurund Jalmi [Fri, 4 Sep 2015 05:53:47 +0000 (22:53 -0700)]
test fixes
colemanw [Fri, 4 Sep 2015 05:18:05 +0000 (22:18 -0700)]
Merge pull request #6680 from colemanw/cleanup
cleanup explodePadded
Coleman Watts [Fri, 4 Sep 2015 05:17:49 +0000 (22:17 -0700)]
cleanup explodePadded
Kurund Jalmi [Fri, 4 Sep 2015 04:53:42 +0000 (21:53 -0700)]
Merge pull request #6649 from jitendrapurohit/CRM-16514
CRM-16514 -- Scheduled reminder for event sends email repeatedly
Dave Greenberg [Fri, 4 Sep 2015 04:18:31 +0000 (21:18 -0700)]
Merge pull request #6560 from kurund/CRM-16719-fix
CRM-16719 fixes
Eileen McNaughton [Fri, 4 Sep 2015 02:17:33 +0000 (14:17 +1200)]
Merge pull request #6677 from eileenmcnaughton/CRM-17152
CRM-17152 fix non-static method called statically
Kurund Jalmi [Fri, 4 Sep 2015 01:45:30 +0000 (18:45 -0700)]
Merge pull request #6679 from kurund/test-fixes
test fixes
Kurund Jalmi [Fri, 4 Sep 2015 01:43:48 +0000 (18:43 -0700)]
test fixes
Nicolas Ganivet [Fri, 4 Sep 2015 00:41:47 +0000 (18:41 -0600)]
corrects style issue
eileenmcnaugton [Thu, 3 Sep 2015 22:48:32 +0000 (10:48 +1200)]
CRM-17152 fix non-static method called statically
Dave Greenberg [Thu, 3 Sep 2015 22:40:11 +0000 (15:40 -0700)]
Merge pull request #6668 from monishdeb/testFailures
CRM-17130 fix and refactor soft-credit post processing
Dave Greenberg [Thu, 3 Sep 2015 22:11:02 +0000 (15:11 -0700)]
Merge pull request #6662 from mallezie/crm-17134
CRM-17134 Add softcontributions to contribution message template
Eileen McNaughton [Thu, 3 Sep 2015 21:12:04 +0000 (09:12 +1200)]
Merge pull request #6670 from eileenmcnaughton/comments-3
Comments fixes
Dave Greenberg [Thu, 3 Sep 2015 20:45:22 +0000 (13:45 -0700)]
Merge pull request #6671 from pradpnayak/CRM-17145
--CRM-17145, fixed data type for civicrm_activity.details
colemanw [Thu, 3 Sep 2015 19:19:56 +0000 (12:19 -0700)]
Merge pull request #6674 from lcdservices/CRM-17148
CRM-17148 set crm-initial-value for billingcheckbox
Nicolas Ganivet [Thu, 3 Sep 2015 17:57:13 +0000 (11:57 -0600)]
CRM-17149: full fix
Brian Shaughnessy [Thu, 3 Sep 2015 17:12:10 +0000 (13:12 -0400)]
CRM-17148 set crm-initial-value for billingcheckbox
Pradeep Nayak [Thu, 3 Sep 2015 08:54:02 +0000 (14:24 +0530)]
--CRM-17145, fixed data type for civicrm_activity.details
eileenmcnaugton [Thu, 3 Sep 2015 08:38:35 +0000 (20:38 +1200)]
comment fixes
eileenmcnaugton [Thu, 3 Sep 2015 08:33:47 +0000 (20:33 +1200)]
comment fixes
Eileen McNaughton [Thu, 3 Sep 2015 08:20:33 +0000 (20:20 +1200)]
Merge pull request #6658 from eileenmcnaughton/CRM-17120
Crm 17120
Monish Deb [Thu, 3 Sep 2015 08:02:51 +0000 (13:32 +0530)]
Merge pull request #6337 from jitendrapurohit/CRM-16792master
CRM-16792 - Report: Contrib Summary when soft credit stats and filter…
Eileen McNaughton [Thu, 3 Sep 2015 07:58:51 +0000 (19:58 +1200)]
Merge pull request #6601 from colemanw/CRM-16974
CRM-16974 - Disable amounts section of contribution page when enabling member price set
monishdeb [Thu, 3 Sep 2015 07:47:33 +0000 (13:17 +0530)]
format fix
monishdeb [Thu, 3 Sep 2015 07:29:13 +0000 (12:59 +0530)]
CRM-17130 fix and refactor soft-credit post processing
----------------------------------------
* CRM-17130: Soft Credit Info Wiped When Recording Credit Card Contribution
https://issues.civicrm.org/jira/browse/CRM-17130
Yashodha Chaku [Thu, 3 Sep 2015 05:23:00 +0000 (10:53 +0530)]
Merge pull request #6661 from yashodha/CRM-17132
CRM-17132: Cannot Find Contributions or Advanced Search by Personal C…
Tim Otten [Thu, 3 Sep 2015 01:44:57 +0000 (18:44 -0700)]
Merge pull request #6644 from totten/4.6-sql-where
CRM-16544, CRM-17127 - Select::where() - Less aggressive dedupe
Eileen McNaughton [Wed, 2 Sep 2015 23:14:21 +0000 (11:14 +1200)]
Merge pull request #6604 from eileenmcnaughton/4.6
CRM-17092 backport (do not merge) of fix to storing contribution_recu…
Eileen McNaughton [Wed, 2 Sep 2015 21:48:28 +0000 (09:48 +1200)]
Merge pull request #6620 from colemanw/CRM-17080
CRM-17080 - Smarty api cleanup
eileenmcnaugton [Wed, 2 Sep 2015 20:10:57 +0000 (08:10 +1200)]
mark function as deprecated
eileenmcnaugton [Wed, 2 Sep 2015 04:10:37 +0000 (16:10 +1200)]
CRM-17120 swap out calls to getLabel to a cached one
This change is tested in the contribution BAO class
Eileen McNaughton [Wed, 2 Sep 2015 19:57:34 +0000 (07:57 +1200)]
Merge pull request #6664 from eileenmcnaughton/comments-3
Comments 3
Monish Deb [Wed, 2 Sep 2015 18:23:14 +0000 (23:53 +0530)]
Merge pull request #6628 from monishdeb/CRM-17090
CRM-17090 fix - Accounting batch filters broken
colemanw [Wed, 2 Sep 2015 15:28:29 +0000 (08:28 -0700)]
Merge pull request #6659 from colemanw/CRM-17126
CRM-17126 - Add js headers for contribution widget
eileenmcnaugton [Wed, 2 Sep 2015 12:47:36 +0000 (00:47 +1200)]
comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 12:45:16 +0000 (00:45 +1200)]
comment fixes
Eileen McNaughton [Wed, 2 Sep 2015 12:42:50 +0000 (00:42 +1200)]
Merge pull request #6663 from eileenmcnaughton/comments-3
comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 12:32:37 +0000 (00:32 +1200)]
comment fixes
jenkins seems to spit the dummy at these but the issue appears to be php5.5 style code
which is fine here, rather than the change
yashodha [Wed, 2 Sep 2015 11:41:48 +0000 (17:11 +0530)]
format fix
Tim Mallezie [Wed, 2 Sep 2015 09:55:07 +0000 (11:55 +0200)]
CRM-17134 Add softcontributions to contribution message template
yashodha [Wed, 2 Sep 2015 08:30:04 +0000 (14:00 +0530)]
CRM-17132: Cannot Find Contributions or Advanced Search by Personal Contribution Page
----------------------------------------
* CRM-17132: Cannot Find Contributions or Advanced Search by Personal Contribution Page
https://issues.civicrm.org/jira/browse/CRM-17132
Eileen McNaughton [Wed, 2 Sep 2015 08:19:18 +0000 (20:19 +1200)]
Merge pull request #6655 from eileenmcnaughton/comments-3
Comments fixes
Kurund Jalmi [Wed, 2 Sep 2015 07:32:19 +0000 (00:32 -0700)]
minor fixes
Eileen McNaughton [Wed, 2 Sep 2015 05:06:52 +0000 (17:06 +1200)]
Merge pull request #6657 from colemanw/CRM-17120
CRM-17120 - Use CRM_Core_Pseudoconstant to lookup option labels
Coleman Watts [Tue, 1 Sep 2015 23:58:04 +0000 (16:58 -0700)]
CRM-17120 - Use CRM_Core_Pseudoconstant to lookup option labels
eileenmcnaugton [Wed, 2 Sep 2015 04:08:06 +0000 (16:08 +1200)]
CRM-17120 enhance test to check honor contact output
eileenmcnaugton [Wed, 2 Sep 2015 04:07:24 +0000 (16:07 +1200)]
minor comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 03:43:41 +0000 (15:43 +1200)]
CRM-17120 replace option label calls with cached function.
I added a test before swapping out the values. In the process I formed a few doubts about the
code. I couldn't find anyway to access the case_activity where parameters outside a
carefully crafted test and when I did so I got invalid sql & a minor error in the qill
I added comments about these findings & locked in the existing behaviour, keeping this
change very safe
Coleman Watts [Wed, 2 Sep 2015 03:30:53 +0000 (20:30 -0700)]
CRM-17126 - Add js headers for contribution widget
Kurund Jalmi [Wed, 2 Sep 2015 03:30:17 +0000 (20:30 -0700)]
added form rule to allow add to group action only if contact fields are selected
eileenmcnaugton [Wed, 2 Sep 2015 03:23:07 +0000 (15:23 +1200)]
remove unused parameter
eileenmcnaugton [Wed, 2 Sep 2015 03:22:52 +0000 (15:22 +1200)]
Comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 01:10:51 +0000 (13:10 +1200)]
CRM-17120 remove call to uncached getLabel function
eileenmcnaugton [Wed, 2 Sep 2015 02:33:38 +0000 (14:33 +1200)]
comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 00:43:06 +0000 (12:43 +1200)]
backport formatting from master to sync up before starting
Kurund Jalmi [Tue, 1 Sep 2015 23:53:25 +0000 (16:53 -0700)]
fixed merge conflicts
Dave Greenberg [Tue, 1 Sep 2015 23:10:19 +0000 (16:10 -0700)]
Merge pull request #6343 from pradpnayak/CRM-16506
CRM-16506, Fixed and improve mailing stats
Dave Greenberg [Tue, 1 Sep 2015 23:01:57 +0000 (16:01 -0700)]
Merge pull request #6643 from davecivicrm/CRM-17031
CRM-17031 - improve offline event receipts for new installs
Eileen McNaughton [Tue, 1 Sep 2015 20:42:39 +0000 (08:42 +1200)]
Merge pull request #6646 from eileenmcnaughton/comments-3
Comments fixes
Eileen McNaughton [Tue, 1 Sep 2015 20:40:54 +0000 (08:40 +1200)]
Merge pull request #6647 from eileenmcnaughton/test-fix
test-fix, pass through whether the form is in test mode
Monish Deb [Tue, 1 Sep 2015 12:42:13 +0000 (18:12 +0530)]
Merge pull request #6651 from monishdeb/testFailures
Qill fix participant.is_test
monishdeb [Tue, 1 Sep 2015 12:39:40 +0000 (18:09 +0530)]
CRM-17121 fix - Advanced Search on Event Type OR Address returns only Event results
https://issues.civicrm.org/jira/browse/CRM-17121
jitendrapurohit [Tue, 1 Sep 2015 10:38:58 +0000 (16:08 +0530)]
CRM-16514 -- Scheduled reminder for event sends email repeatedly
Kurund Jalmi [Tue, 1 Sep 2015 05:57:21 +0000 (22:57 -0700)]
Merge pull request #6639 from kurund/comment-cleanup
style fixes
Monish Deb [Tue, 1 Sep 2015 05:41:36 +0000 (11:11 +0530)]
Merge pull request #6634 from monishdeb/CRM-17073
CRM-17073 fix - Merge Household Members Into Their Household on Export
eileenmcnaugton [Tue, 1 Sep 2015 05:13:13 +0000 (17:13 +1200)]
comment fixes
eileenmcnaugton [Tue, 1 Sep 2015 05:01:28 +0000 (17:01 +1200)]
test-fix, pass through whether the form is in test mode
Dave Greenberg [Tue, 1 Sep 2015 03:42:02 +0000 (20:42 -0700)]
Merge pull request #6645 from lcdservices/CRM-17122
CRM-17122: fix button label text in merge interface
eileenmcnaugton [Mon, 31 Aug 2015 12:31:59 +0000 (00:31 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 12:04:52 +0000 (00:04 +1200)]
more comment fixes
Eileen McNaughton [Tue, 1 Sep 2015 02:32:30 +0000 (14:32 +1200)]
Merge pull request #6640 from eileenmcnaughton/comments-3
Unrelated fails I think
Brian Shaughnessy [Tue, 1 Sep 2015 02:14:06 +0000 (22:14 -0400)]
CRM-17122: fix button label text in merge interface
Kurund Jalmi [Tue, 1 Sep 2015 01:08:57 +0000 (18:08 -0700)]
Merge pull request #6531 from samuelsov/CRM-16561-bis
CRM-16561 - translatable tax invoice template (with upgrade)
Dave Greenberg [Tue, 1 Sep 2015 01:01:23 +0000 (18:01 -0700)]
CRM-17031 - improve offline event receipts for new installs.
----------------------------------------
* CRM-17031: Improvement to offline Event Confirmation template
https://issues.civicrm.org/jira/browse/CRM-17031
Tim Otten [Tue, 1 Sep 2015 00:59:27 +0000 (17:59 -0700)]
CRM-16544 - Select::where() - Less aggressive dedupe
The where() function attempts to dedupe WHERE clauses, but this could
misbehave when similar clauses are used with different data, and it's been
implicated in a symptom where CiviMail shows irrelevant attachments.
http://civicrm.stackexchange.com/a/5059/93
Dave Greenberg [Tue, 1 Sep 2015 00:58:23 +0000 (17:58 -0700)]
CRM-17031 - improve offline event receipts for new installs
----------------------------------------
* CRM-17031: Improvement to offline Event Confirmation template
https://issues.civicrm.org/jira/browse/CRM-17031
Kurund Jalmi [Mon, 31 Aug 2015 22:41:46 +0000 (15:41 -0700)]
Merge pull request #6437 from jitendrapurohit/CRM-16288
CRM-16288 -- Rebuild Smart Cache Group fails
Kurund Jalmi [Mon, 31 Aug 2015 22:34:01 +0000 (15:34 -0700)]
Merge pull request #6623 from PalanteJon/CRM-17108-4.6
CRM-17108 - CiviContribute - Fix updating billing details via URL fro…
eileenmcnaugton [Mon, 31 Aug 2015 21:53:43 +0000 (09:53 +1200)]
comment & formatting fixes
Pradeep Nayak [Sun, 23 Aug 2015 20:28:26 +0000 (01:58 +0530)]
--CRM-16506, added opt out column in summary report
Pradeep Nayak [Fri, 21 Aug 2015 19:44:04 +0000 (01:14 +0530)]
--CRM-16506, added link to mailing name
Pradeep Nayak [Fri, 21 Aug 2015 19:30:47 +0000 (01:00 +0530)]
--CRM-16506, code cleanup, removed cruft code
Pradeep Nayak [Fri, 21 Aug 2015 17:49:24 +0000 (23:19 +0530)]
-- CRM-16506, updated form values for default install of reports
----------------------------------------
* CRM-16506:
https://issues.civicrm.org/jira/browse/CRM-16506
Pradeep Nayak [Fri, 21 Aug 2015 06:33:55 +0000 (12:03 +0530)]
--CRM-16506, fixed strict notice error
Pradeep Nayak [Wed, 29 Jul 2015 17:57:34 +0000 (23:27 +0530)]
--CRM-16506, fixed formatting
Pradeep Nayak [Mon, 27 Jul 2015 17:40:26 +0000 (23:10 +0530)]
CRM-16506, Fixed and improve mailing stats
----------------------------------------
* CRM-16506: Fix and improve mailing stats
https://issues.civicrm.org/jira/browse/CRM-16506
eileenmcnaugton [Mon, 31 Aug 2015 12:32:39 +0000 (00:32 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 12:31:16 +0000 (00:31 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 12:30:22 +0000 (00:30 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 12:29:35 +0000 (00:29 +1200)]
comment fixes
Kurund Jalmi [Mon, 31 Aug 2015 19:42:32 +0000 (12:42 -0700)]
style fixes
Kurund Jalmi [Mon, 31 Aug 2015 19:33:37 +0000 (12:33 -0700)]
Merge pull request #6635 from eileenmcnaughton/comments
fixes to comments
Kurund Jalmi [Mon, 31 Aug 2015 19:32:23 +0000 (12:32 -0700)]
Merge pull request #6637 from eileenmcnaughton/comments-3
Comments fixes
Kurund Jalmi [Mon, 31 Aug 2015 19:29:08 +0000 (12:29 -0700)]
Merge pull request #6633 from jitendrapurohit/CRM-17112
CRM-17112 - Add Missing countries Saint Barthélemy and Saint Martin
Kurund Jalmi [Mon, 31 Aug 2015 19:23:15 +0000 (12:23 -0700)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-31-12-20-39
Conflicts:
CRM/Activity/BAO/Query.php
CRM/Campaign/BAO/Query.php
CRM/Contribute/BAO/Query.php
CRM/Event/BAO/Query.php
CRM/Member/BAO/Query.php
CRM/Pledge/BAO/Query.php
CRM/Report/Form/Contribute/Summary.php
sql/civicrm_generated.mysql
xml/version.xml
Dave Greenberg [Mon, 31 Aug 2015 18:24:02 +0000 (11:24 -0700)]
Merge pull request #6578 from jitendrapurohit/CRM-16716
CRM-16716 -- Filter with recur contribution status and modified date …
projects / civicrm-core.git / log