jitendrapurohit [Mon, 15 Jun 2015 10:43:58 +0000 (16:13 +0530)]
CRM-16666 - Custom participant statuses do not print in email confirmation
Yashodha Chaku [Mon, 15 Jun 2015 09:41:39 +0000 (15:11 +0530)]
Merge pull request #6012 from jake-mw/12675
CRM-12675 - Hide Contribution activities from users without CiviContribute
Eileen McNaughton [Mon, 15 Jun 2015 08:04:26 +0000 (20:04 +1200)]
Merge pull request #6016 from eileenmcnaughton/CRM-16679
CRM-16679 fix duplicate membership regression
Yashodha Chaku [Mon, 15 Jun 2015 06:23:44 +0000 (11:53 +0530)]
Merge pull request #6013 from galgeek/email_null_is_deceased
Update Mailing.php is_deceased queries
Eileen McNaughton [Mon, 15 Jun 2015 04:15:25 +0000 (16:15 +1200)]
CRM-16679 fix duplicate membership regression. Test edited to avoid failing on enotice
Eileen McNaughton [Mon, 15 Jun 2015 02:26:10 +0000 (14:26 +1200)]
whitespace tidy up on invoice code
Barbara Miller [Mon, 15 Jun 2015 03:14:13 +0000 (20:14 -0700)]
Update Mailing.php is_deceased queries
Include contacts where is_deceased is set to null or False (not True) in bulk e-mail lists
jake-mw [Mon, 15 Jun 2015 01:04:33 +0000 (21:04 -0400)]
CRM-12675 - Hide Contribution activities from users without Access CiviContribute permission, in order to preserve confidentiality of donor information
----------------------------------------
* CRM-12675: Contribution activities shown to users without permission
https://issues.civicrm.org/jira/browse/CRM-12675
Eileen McNaughton [Sun, 14 Jun 2015 01:14:16 +0000 (13:14 +1200)]
Merge pull request #6008 from eileenmcnaughton/tests
Extra Tests
eileenmcnaughton [Sat, 13 Jun 2015 23:14:19 +0000 (23:14 +0000)]
Add titles to FinancialTrxn schema
eileenmcnaughton [Sat, 13 Jun 2015 20:52:25 +0000 (20:52 +0000)]
remove extra line
eileenmcnaughton [Sat, 13 Jun 2015 20:35:25 +0000 (20:35 +0000)]
phpcs fixes
eileenmcnaughton [Sat, 13 Jun 2015 20:13:55 +0000 (20:13 +0000)]
add extra tests to submit functions
colemanw [Sat, 13 Jun 2015 13:55:36 +0000 (09:55 -0400)]
Merge pull request #6005 from aputtu/patch-3
Minor typo: Memberhip -> Membership
colemanw [Sat, 13 Jun 2015 13:54:56 +0000 (09:54 -0400)]
Merge pull request #6006 from aputtu/patch-4
Minor typo (twice): Memberhip -> Membership
colemanw [Sat, 13 Jun 2015 13:54:14 +0000 (09:54 -0400)]
Merge pull request #5953 from eileenmcnaughton/CRM-16555-4
Crm 16555 4
Aputsiaĸ Niels Janussen [Sat, 13 Jun 2015 06:58:30 +0000 (08:58 +0200)]
Minor typo (twice): Memberhip -> Membership
Aputsiaĸ Niels Janussen [Sat, 13 Jun 2015 06:53:42 +0000 (08:53 +0200)]
Minor typo: Memberhip -> Membership
eileenmcnaughton [Fri, 12 Jun 2015 02:42:18 +0000 (02:42 +0000)]
phpcs
eileenmcnaughton [Fri, 12 Jun 2015 00:51:00 +0000 (00:51 +0000)]
enotice fix
eileenmcnaughton [Fri, 12 Jun 2015 00:49:17 +0000 (00:49 +0000)]
CRM-16555 fix for pay later processor not having an object
eileenmcnaughton [Fri, 12 Jun 2015 00:43:04 +0000 (00:43 +0000)]
Enotice fix
Eileen McNaughton [Fri, 12 Jun 2015 00:17:26 +0000 (12:17 +1200)]
CRM-16555-4 phpcs fix
Eileen McNaughton [Thu, 11 Jun 2015 22:32:19 +0000 (10:32 +1200)]
CRM-16555 add additional IPN generation functions to payment base class
Eileen McNaughton [Thu, 11 Jun 2015 22:15:49 +0000 (10:15 +1200)]
phpcs fix
Dave Greenberg [Thu, 11 Jun 2015 21:42:25 +0000 (14:42 -0700)]
Merge pull request #5996 from davecivicrm/CRM-11130
CRM-11130 - Add help and link to CiviMail automated messages from Message Templates page
Dave Greenberg [Thu, 11 Jun 2015 17:59:38 +0000 (10:59 -0700)]
CRM-11130 - add link to CiviMail automated msg config from Message Templates listing. Spacing fix.
----------------------------------------
* CRM-11130: Add link to CiviMail Header/Footer messages from Message Templates admin page
https://issues.civicrm.org/jira/browse/CRM-11130
Dave Greenberg [Thu, 11 Jun 2015 17:56:18 +0000 (10:56 -0700)]
CRM-11130 - add link to CiviMail automated msg config from Message Templates listing.
----------------------------------------
* CRM-11130: Add link to CiviMail Header/Footer messages from Message Templates admin page
https://issues.civicrm.org/jira/browse/CRM-11130
Monish Deb [Thu, 11 Jun 2015 07:26:59 +0000 (12:56 +0530)]
Merge pull request #5986 from jitendrapurohit/CRM-16646
CRM-16646 - Protection against multiple submits on contributions page
Yashodha Chaku [Thu, 11 Jun 2015 03:39:07 +0000 (09:09 +0530)]
Merge pull request #5988 from yashodha/CRM-14293
CRM-14293: Event Cart checkout shows unlabeled checkbox for Pay Later…
colemanw [Thu, 11 Jun 2015 01:03:21 +0000 (21:03 -0400)]
Merge pull request #5987 from colemanw/CRM-16650
CRM-16650 - Rewrite shortcode form
colemanw [Wed, 10 Jun 2015 20:19:03 +0000 (16:19 -0400)]
Merge pull request #5977 from josephlacey/datatables-update
CRM-16353 - Fixing Case Activity count and pager bugs. Added Case Ac…
Coleman Watts [Wed, 10 Jun 2015 14:53:41 +0000 (10:53 -0400)]
CRM-16650 - Improve entityRef fields for shortcodes
----------------------------------------
* CRM-16650: Allow hooks to modify available shortcodes
https://issues.civicrm.org/jira/browse/CRM-16650
Coleman Watts [Wed, 10 Jun 2015 11:54:07 +0000 (07:54 -0400)]
CRM-16650 - Rewrite shortcode form
----------------------------------------
* CRM-16650: Allow hooks to modify available shortcodes
https://issues.civicrm.org/jira/browse/CRM-16650
yashodha [Wed, 10 Jun 2015 12:35:14 +0000 (18:05 +0530)]
CRM-14293: Event Cart checkout shows unlabeled checkbox for Pay Later although option is disabled
----------------------------------------
* CRM-14293: Event Cart checkout shows unlabeled checkbox for Pay Later although option is disabled
https://issues.civicrm.org/jira/browse/CRM-14293
jitendrapurohit [Wed, 10 Jun 2015 11:37:21 +0000 (17:07 +0530)]
CRM-16646 - Protection against multiple submits on contributions page
Monish Deb [Wed, 10 Jun 2015 10:23:08 +0000 (15:53 +0530)]
Merge pull request #5985 from jitendrapurohit/CRM-16648_4.7
CRM-16648 - Notice: Undefined index: label/description in CRM_Core_Op…
jitendrapurohit [Wed, 10 Jun 2015 06:45:55 +0000 (12:15 +0530)]
warning fix
jitendrapurohit [Wed, 10 Jun 2015 06:38:13 +0000 (12:08 +0530)]
CRM-16648 - Notice: Undefined index: label/description in CRM_Core_OptionGroup
Yashodha Chaku [Wed, 10 Jun 2015 05:53:32 +0000 (11:23 +0530)]
Merge pull request #5934 from GinkgoFJG/CRM-16592
CRM-16592: For the fee label filter on the participant listing report, show the price field label in addition to the event title and the price field value label.
Eileen McNaughton [Wed, 10 Jun 2015 00:10:13 +0000 (12:10 +1200)]
CRM-16555 move paypal code into payment subsystem as part of getting
js working
Yashodha Chaku [Tue, 9 Jun 2015 12:15:33 +0000 (17:45 +0530)]
Merge pull request #5948 from KarinG/patch-6
Update Recur.php - add AND email is_primary = 1
Joseph Lacey [Tue, 9 Jun 2015 00:48:32 +0000 (20:48 -0400)]
CRM-16353 - Fixing Case Activity count and pager bugs. Added Case Activity View link
----------------------------------------
* CRM-16353: Upgrade datatables integration to use v2 api
https://issues.civicrm.org/jira/browse/CRM-16353
colemanw [Mon, 8 Jun 2015 20:12:38 +0000 (16:12 -0400)]
Merge pull request #5969 from colemanw/unusedFiles
Delete unused campaign/survey files
kurund [Mon, 8 Jun 2015 16:16:08 +0000 (21:46 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-08-21-41-06
Conflicts:
templates/CRM/Case/Form/CaseView.tpl
Monish Deb [Mon, 8 Jun 2015 13:29:37 +0000 (18:59 +0530)]
Merge pull request #5975 from rohankatkar/CRM-16425
CRM-16425 Added CiviCRM Licensing Exception in header
Web Access [Wed, 10 Jun 2015 11:34:49 +0000 (17:04 +0530)]
Warning fixes
Web Access [Wed, 10 Jun 2015 10:58:55 +0000 (16:28 +0530)]
CRM-16425 Added CiviCRM Licensing Exception in header
colemanw [Mon, 8 Jun 2015 01:38:16 +0000 (21:38 -0400)]
Merge pull request #5974 from colemanw/Add
Add clearfix class to caseSummary hook content
Coleman Watts [Mon, 8 Jun 2015 01:37:07 +0000 (21:37 -0400)]
Add clearfix class to caseSummary hook content
colemanw [Sun, 7 Jun 2015 18:54:06 +0000 (14:54 -0400)]
Merge pull request #5970 from colemanw/explorer
Fix basePath in APIExplorer examples
colemanw [Sat, 6 Jun 2015 15:36:25 +0000 (11:36 -0400)]
Merge pull request #5968 from colemanw/Static
Static function fixes
Coleman Watts [Sat, 6 Jun 2015 15:35:57 +0000 (11:35 -0400)]
Fix basePath in APIExplorer examples
colemanw [Sat, 6 Jun 2015 02:38:13 +0000 (22:38 -0400)]
Merge pull request #5954 from JKingsnorth/CRM-16624
CRM-16624: Mark 'Number of participants' as required; remove unused reqMark
Coleman Watts [Sat, 6 Jun 2015 02:35:08 +0000 (22:35 -0400)]
Delete unused campaign/survey files
Coleman Watts [Sat, 6 Jun 2015 02:19:36 +0000 (22:19 -0400)]
Static function fixes
colemanw [Fri, 5 Jun 2015 15:03:50 +0000 (11:03 -0400)]
Merge pull request #5966 from colemanw/CRM-16631
CRM-16631 - Show unlimited case types
Coleman Watts [Fri, 5 Jun 2015 15:02:14 +0000 (11:02 -0400)]
CRM-16631 - Show unlimited case types
Monish Deb [Fri, 5 Jun 2015 13:14:29 +0000 (18:44 +0530)]
Merge pull request #5956 from rohankatkar/CRM-16451
Layout issues when recording back-office priceset contributions
Monish Deb [Fri, 5 Jun 2015 13:09:17 +0000 (18:39 +0530)]
Merge pull request #5959 from futurefirst/crm-16625-4.6
CRM-16625 fix formatting of dates to be passed to contact creation during import
Monish Deb [Fri, 5 Jun 2015 11:26:03 +0000 (16:56 +0530)]
Merge pull request #5964 from monishdeb/CRM-16574_Contribution_Summary_Report_grouping
Crm 16574 contribution summary report grouping
monishdeb [Fri, 5 Jun 2015 11:23:54 +0000 (16:53 +0530)]
notice fix
monishdeb [Fri, 5 Jun 2015 08:11:57 +0000 (13:41 +0530)]
Formatting fixes
Monish Deb [Thu, 4 Jun 2015 21:41:45 +0000 (03:11 +0530)]
Merge pull request #5955 from pratikshad/16534
CRM-16534 Fix-Contribution Export Places Campaign IDs in Campaign Tit…
colemanw [Thu, 4 Jun 2015 18:33:01 +0000 (14:33 -0400)]
Merge pull request #5963 from colemanw/CRM-16130
CRM-16130 - Add action to contact inline edit forms
Coleman Watts [Thu, 4 Jun 2015 16:56:34 +0000 (12:56 -0400)]
CRM-16130 - Add action to contact inline edit forms
Coleman Watts [Thu, 4 Jun 2015 14:34:21 +0000 (10:34 -0400)]
Merge branch '4.6' into 'master'
Conflicts:
tools/CRM/Auction/BAO/Auction.php
tools/CRM/Auction/BAO/Item.php
tools/CRM/Auction/Form/Auction.php
tools/CRM/Auction/Form/Item.php
Web Access [Thu, 4 Jun 2015 12:52:01 +0000 (18:22 +0530)]
Warning fix
David Knoll [Thu, 4 Jun 2015 12:37:12 +0000 (13:37 +0100)]
CRM-16625 fix formatting of dates to be passed to contact creation during import
Monish Deb [Thu, 4 Jun 2015 12:32:33 +0000 (18:02 +0530)]
Merge pull request #5944 from colemanw/CRM-16310
CRM-16310 - Fix inline link handling with dynamic content
Web Access [Thu, 4 Jun 2015 10:46:59 +0000 (16:16 +0530)]
Fix for CRM-16451
pratikshad [Thu, 4 Jun 2015 10:30:58 +0000 (16:00 +0530)]
CRM-16534 Fix-Contribution Export Places Campaign IDs in Campaign Title Column, Nothing in Campaign ID Column
----------------------------------------
* CRM-16534: Contribution Export Places Campaign IDs in Campaign Title Column, Nothing in Campaign ID Column
https://issues.civicrm.org/jira/browse/CRM-16534
JKingsnorth [Thu, 4 Jun 2015 10:09:12 +0000 (11:09 +0100)]
CRM-16624: Remove unused and outdated reqMark variable from templates
JKingsnorth [Thu, 4 Jun 2015 10:03:19 +0000 (11:03 +0100)]
CRM-16624: Add required mark for number of participants
Eileen McNaughton [Wed, 3 Jun 2015 05:40:29 +0000 (17:40 +1200)]
CRM-16555 paypal express is still not replacing the confirm button with it's own - but it's failing in the same way as in 4.6 & this is closer to how we want to code it
Eileen McNaughton [Wed, 3 Jun 2015 03:25:32 +0000 (15:25 +1200)]
CRM-16555 move paypal code addition to buildForm
Not 100% sure about bringing this (existing override) to the fore as opposed to a more granular one
but it does already exist?. The biggest problem is the temptation to do lots of altering from there which
might not be upgrade proof - as opposed to just addition as per here
Eileen McNaughton [Sun, 24 May 2015 20:58:10 +0000 (08:58 +1200)]
CRM-16555 rationalise paypal express behaviour into a generic behaviour (suppress submit button)
Eileen McNaughton [Thu, 4 Jun 2015 04:53:20 +0000 (16:53 +1200)]
Merge pull request #5894 from eileenmcnaughton/CRM-16555
CRM-16555 - Make Payment form credit / debit card changing available …
Coleman Watts [Thu, 4 Jun 2015 02:56:57 +0000 (22:56 -0400)]
CRM-16555 - Cleanup billing block js
Eileen McNaughton [Wed, 3 Jun 2015 22:49:34 +0000 (10:49 +1200)]
Merge pull request #5900 from eileenmcnaughton/CRM-16566
CRM-16566 upgrade authorize.net to support new style IPNS
Monish Deb [Wed, 3 Jun 2015 13:26:32 +0000 (18:56 +0530)]
Merge pull request #5950 from deepak-srivastava/CRM-16563
CRM-16563 include end-date by using time 23:59 than incrementing by day1
Eileen McNaughton [Wed, 3 Jun 2015 10:47:50 +0000 (22:47 +1200)]
Merge pull request #5949 from mallezie/crm-16615
CRM-16615 add getDefaultContext to ManageEvent form
deepak-srivastava [Wed, 3 Jun 2015 08:50:43 +0000 (09:50 +0100)]
CRM-16563 include end-date by using time 23:59 than incrementing by day 1
----------------------------------------
* CRM-16563: Recurring event system sometimes suggests incorrect dates
https://issues.civicrm.org/jira/browse/CRM-16563
Tim Mallezie [Wed, 3 Jun 2015 08:09:17 +0000 (10:09 +0200)]
add getDefaultContext to ManageEvent form
Eileen McNaughton [Wed, 3 Jun 2015 04:23:54 +0000 (16:23 +1200)]
Merge pull request #5943 from eileenmcnaughton/master
Remove some unused params & a call by reference
Eileen McNaughton [Wed, 3 Jun 2015 04:22:10 +0000 (16:22 +1200)]
Merge pull request #5945 from eileenmcnaughton/no-auction-46
Remove Auction & Touchstone
Coleman Watts [Wed, 3 Jun 2015 02:07:29 +0000 (22:07 -0400)]
CRM-16310 - Fix option view close button
Eileen McNaughton [Wed, 3 Jun 2015 02:02:53 +0000 (14:02 +1200)]
CRM-16555 do not include js in snippet
Karin Gerritsen [Wed, 3 Jun 2015 01:23:43 +0000 (19:23 -0600)]
Update Recur.php - add AND email is_primary = 1
to avoid duplicate results for contacts who have multiple email addresses in their contact record.
Eileen McNaughton [Wed, 3 Jun 2015 00:35:09 +0000 (12:35 +1200)]
Remove Auction & Touchstone
Conflicts:
tools/CRM/Auction/BAO/Auction.php
tools/CRM/Auction/BAO/Item.php
tools/CRM/Auction/Form/Auction.php
tools/CRM/Auction/Form/Item.php
Eileen McNaughton [Wed, 3 Jun 2015 00:04:54 +0000 (12:04 +1200)]
phpcs fixes
Eileen McNaughton [Tue, 2 Jun 2015 23:43:42 +0000 (11:43 +1200)]
Merge pull request #5942 from eileenmcnaughton/CRM-16605
CRM-16605 remove hard-coded payment processor ref
Coleman Watts [Tue, 2 Jun 2015 20:58:57 +0000 (16:58 -0400)]
CRM-16310 - Fix inline link handling with dynamic content
Coleman Watts [Tue, 2 Jun 2015 19:20:10 +0000 (15:20 -0400)]
CRM-16555 - Fix paymentBlock js for front-end forms
Coleman Watts [Tue, 2 Jun 2015 18:52:41 +0000 (14:52 -0400)]
Fix backend PayPal button style
colemanw [Tue, 2 Jun 2015 18:09:21 +0000 (14:09 -0400)]
Merge pull request #5933 from colemanw/Print
Print button should print
Monish Deb [Tue, 2 Jun 2015 11:04:13 +0000 (16:34 +0530)]
Merge pull request #5941 from rohankatkar/CRM16565
When signing up multiple participants, the second contact's selections appear on the first contact's participant record
Eileen McNaughton [Tue, 2 Jun 2015 10:46:48 +0000 (22:46 +1200)]
refactor pending one step closer to the form when renewing membership status - goal is to get it completely out of the form layer
Eileen McNaughton [Tue, 2 Jun 2015 09:52:30 +0000 (21:52 +1200)]
Remove some unused params & a call by reference
Eileen McNaughton [Tue, 2 Jun 2015 09:34:24 +0000 (21:34 +1200)]
CRM-16605 remove hard-coded payment processor ref
projects / civicrm-core.git / log