civicrm-core.git
9 years agoCRM-16555 - Cleanup billing block js
Coleman Watts [Thu, 4 Jun 2015 02:56:57 +0000 (22:56 -0400)]
CRM-16555 - Cleanup billing block js

9 years agoCRM-16555 do not include js in snippet
Eileen McNaughton [Wed, 3 Jun 2015 02:02:53 +0000 (14:02 +1200)]
CRM-16555 do not include js in snippet

9 years agoCRM-16555 - Fix paymentBlock js for front-end forms
Coleman Watts [Tue, 2 Jun 2015 19:20:10 +0000 (15:20 -0400)]
CRM-16555 - Fix paymentBlock js for front-end forms

9 years agoFix backend PayPal button style
Coleman Watts [Tue, 2 Jun 2015 18:52:41 +0000 (14:52 -0400)]
Fix backend PayPal button style

9 years agoFix js error on contribution page
Coleman Watts [Fri, 29 May 2015 19:04:10 +0000 (15:04 -0400)]
Fix js error on contribution page

9 years agoCRM-16555 remove accordian from billing section & hence a bunch of code
Eileen McNaughton [Sun, 24 May 2015 11:19:30 +0000 (23:19 +1200)]
CRM-16555 remove accordian from billing section & hence a bunch of code
None of the other backoffice forms put this in an accordian & it is not optional if shown - because it is processor loaded
so putting in an accordian here seems odd. If it is to be in an accordian we should do in billingblock & apply to membership & event forms

9 years agoCRM-16555 call extracted form snippet not overloaded form snippet.
Eileen McNaughton [Wed, 27 May 2015 22:26:56 +0000 (10:26 +1200)]
CRM-16555 call extracted form snippet not overloaded form snippet.
The payment form snippet has been extracted so it can be called from anywhere, use this & remove the over-loaded snippet
note the change of field name is to align front end & back-end but still an issue as back-end is select & front end is radio

CRM-16555 last may have been too agressive

CRM-16555 test fixes

x

9 years agoCRM-16555 include BillingBlockWrapper as part of refactoring forms to have same behaviour
Eileen McNaughton [Thu, 28 May 2015 12:04:27 +0000 (00:04 +1200)]
CRM-16555 include BillingBlockWrapper as part of refactoring forms to have same behaviour
The wrapper has an extra div which is crucial for switching so where it isn't present, add the wrapper version
Also, note the wrapper may get the extra script added rather than billingBlock as part of the refactor (scri

9 years agoMerge pull request #5916 from laryn/patch-2
Monish Deb [Thu, 28 May 2015 10:19:22 +0000 (15:49 +0530)]
Merge pull request #5916 from laryn/patch-2

CRM-15839 fix - Honoree section not showing on Test Contribution Page

9 years agoMerge pull request #5917 from eileenmcnaughton/master
Eileen McNaughton [Thu, 28 May 2015 07:30:22 +0000 (19:30 +1200)]
Merge pull request #5917 from eileenmcnaughton/master

CRM-16555 add missing path fix from previous PR & phpcs tidyups

9 years agoclarify param
Eileen McNaughton [Tue, 26 May 2015 03:52:25 +0000 (15:52 +1200)]
clarify param

9 years agominor phpcs updates
Eileen McNaughton [Tue, 26 May 2015 04:02:03 +0000 (16:02 +1200)]
minor phpcs updates

9 years agoCRM-16555 fix incorrect path on previous commit
Eileen McNaughton [Thu, 28 May 2015 00:43:33 +0000 (12:43 +1200)]
CRM-16555 fix incorrect path on previous commit

9 years agoMerge pull request #5915 from eileenmcnaughton/master
Eileen McNaughton [Thu, 28 May 2015 00:38:30 +0000 (12:38 +1200)]
Merge pull request #5915 from eileenmcnaughton/master

CRM-16555 extract payment form into a separate class to make accessible from elsewhere

9 years agoHonoree section not showing on Test Contribution Page
Laryn [Wed, 27 May 2015 22:31:27 +0000 (17:31 -0500)]
Honoree section not showing on Test Contribution Page

9 years agoCRM-16555 introduce separated payment form as snippet
Eileen McNaughton [Wed, 27 May 2015 21:53:18 +0000 (09:53 +1200)]
CRM-16555 introduce separated payment form as snippet
The point of this is to allow the payment form to be disambiguated from the contribution & event forms - allowing it to be called from elsewhere

9 years agoCRM-16555 remove unnecessary variable assignment
Eileen McNaughton [Sun, 24 May 2015 11:27:27 +0000 (23:27 +1200)]
CRM-16555 remove unnecessary variable assignment

9 years agoCRM-16555 code tidy up
Eileen McNaughton [Sun, 24 May 2015 21:25:51 +0000 (09:25 +1200)]
CRM-16555 code tidy up

9 years agoMerge pull request #5905 from jitendrapurohit/CRM-16567
Monish Deb [Wed, 27 May 2015 06:48:30 +0000 (12:18 +0530)]
Merge pull request #5905 from jitendrapurohit/CRM-16567

CRM-16567 - Zero Amount Contribution returns an error message

9 years agoMerge pull request #5873 from Kajakaran/hidecredit
Monish Deb [Tue, 26 May 2015 19:19:38 +0000 (00:49 +0530)]
Merge pull request #5873 from Kajakaran/hidecredit

CRM-16527 - Hide credit card section in membership contribution form

9 years agoCRM-16567 - Zero Amount Contribution returns an error message
jitendrapurohit [Tue, 26 May 2015 13:01:55 +0000 (18:31 +0530)]
CRM-16567 - Zero Amount Contribution returns an error message

9 years agoMerge pull request #5876 from mallezie/remove-inline-assert-message
Eileen McNaughton [Sun, 24 May 2015 11:31:44 +0000 (23:31 +1200)]
Merge pull request #5876 from mallezie/remove-inline-assert-message

CRM-16532 remove inline message from assert messages

9 years agoMerge pull request #5883 from mallezie/addfield-website
Eileen McNaughton [Sun, 24 May 2015 11:29:01 +0000 (23:29 +1200)]
Merge pull request #5883 from mallezie/addfield-website

CRM-16178 use addfield in website form

9 years agoMerge pull request #5892 from eileenmcnaughton/CRM-16431
Eileen McNaughton [Sun, 24 May 2015 11:28:22 +0000 (23:28 +1200)]
Merge pull request #5892 from eileenmcnaughton/CRM-16431

CRM-16431 update syntax conformance tests to test timestamps

9 years agoMerge pull request #5893 from eileenmcnaughton/billing-type-consolidate
Eileen McNaughton [Sun, 24 May 2015 08:23:15 +0000 (20:23 +1200)]
Merge pull request #5893 from eileenmcnaughton/billing-type-consolidate

Put function to assign billing type onto core_form due to frequency o…

9 years agoPut function to assign billing type onto core_form due to frequency of functionality
Eileen McNaughton [Sat, 23 May 2015 09:06:55 +0000 (21:06 +1200)]
Put function to assign billing type onto core_form due to frequency of functionality

9 years agoCRM-16431 update syntax conformance tests to test timestamps
Eileen McNaughton [Sat, 2 May 2015 23:55:39 +0000 (11:55 +1200)]
CRM-16431 update syntax conformance tests to test timestamps

9 years agoMerge pull request #5888 from JKingsnorth/CRM-16546
Dave Greenberg [Fri, 22 May 2015 23:02:34 +0000 (16:02 -0700)]
Merge pull request #5888 from JKingsnorth/CRM-16546

CRM-16546 Event registration navigation warning

9 years agoMerge pull request #5881 from mallezie/fix-hiddenfields-addfield
colemanw [Fri, 22 May 2015 14:03:12 +0000 (10:03 -0400)]
Merge pull request #5881 from mallezie/fix-hiddenfields-addfield

fix hidden form elements in addFieldMethod

9 years agoCRM-16546 Event registration navigation warning
JKingsnorth [Fri, 22 May 2015 10:19:09 +0000 (11:19 +0100)]
CRM-16546 Event registration navigation warning

9 years agouse addfield in website form
Tim Mallezie [Thu, 21 May 2015 15:52:05 +0000 (17:52 +0200)]
use addfield in website form

9 years agofix hidden form elements in addFieldMethod
Tim Mallezie [Thu, 21 May 2015 06:24:42 +0000 (08:24 +0200)]
fix hidden form elements in addFieldMethod

9 years agoremove more inline messages
Tim Mallezie [Thu, 21 May 2015 05:50:07 +0000 (07:50 +0200)]
remove more inline messages

9 years agofix membershiptypetest
Tim Mallezie [Thu, 21 May 2015 05:45:49 +0000 (07:45 +0200)]
fix membershiptypetest

9 years agoMerge pull request #5878 from narayanis/narayanis-patch-2
Dave Greenberg [Wed, 20 May 2015 23:44:05 +0000 (16:44 -0700)]
Merge pull request #5878 from narayanis/narayanis-patch-2

CRM-16090

9 years agoCRM-16090 remove pre-sort on title
narayanis [Wed, 20 May 2015 21:28:47 +0000 (17:28 -0400)]
CRM-16090 remove pre-sort on title

9 years agoCRM-16090
narayanis [Wed, 20 May 2015 21:26:42 +0000 (17:26 -0400)]
CRM-16090

sort contribution pages by is_active, then title. fix broken 'All' link on pager.

9 years agoMerge pull request #5875 from JKingsnorth/CRM-16529
Dave Greenberg [Wed, 20 May 2015 17:03:41 +0000 (10:03 -0700)]
Merge pull request #5875 from JKingsnorth/CRM-16529

CRM-16529 Remove repeated table names in error

9 years agoremove inline message from assert messages
Tim Mallezie [Wed, 20 May 2015 14:43:48 +0000 (16:43 +0200)]
remove inline message from assert messages

9 years agoCRM-16529 Remove repeated table names in error
JKingsnorth [Wed, 20 May 2015 14:16:08 +0000 (15:16 +0100)]
CRM-16529 Remove repeated table names in error

9 years agoMerge pull request #5872 from eileenmcnaughton/CRM-16530
Eileen McNaughton [Wed, 20 May 2015 13:14:55 +0000 (01:14 +1200)]
Merge pull request #5872 from eileenmcnaughton/CRM-16530

CRM-16530 introduce supportsMultipleConcurrentPayments"

9 years agoCRM-16527 - Hide credit card section in membership contribution form
Kajan [Wed, 20 May 2015 09:27:26 +0000 (10:27 +0100)]
CRM-16527 - Hide credit card section in membership contribution form

9 years agoMerge pull request #5845 from mallezie/demographics-add-field
Eileen McNaughton [Wed, 20 May 2015 08:40:26 +0000 (20:40 +1200)]
Merge pull request #5845 from mallezie/demographics-add-field

CRM-16178 use addfield in demographics

9 years agoMerge pull request #5866 from mallezie/addfield-phone
Eileen McNaughton [Wed, 20 May 2015 08:40:09 +0000 (20:40 +1200)]
Merge pull request #5866 from mallezie/addfield-phone

CRM-16178 use addField in phone form

9 years agoMerge pull request #5851 from mallezie/addfield-organization
Eileen McNaughton [Wed, 20 May 2015 08:39:56 +0000 (20:39 +1200)]
Merge pull request #5851 from mallezie/addfield-organization

CRM-16178 use addfield method in organization form

9 years agoMerge pull request #5853 from mallezie/add-OpenID-API
Eileen McNaughton [Wed, 20 May 2015 08:24:21 +0000 (20:24 +1200)]
Merge pull request #5853 from mallezie/add-OpenID-API

CRM-16517 add OpenID Api methods

9 years agoMerge pull request #5856 from eileenmcnaughton/CRM-16402
Eileen McNaughton [Wed, 20 May 2015 06:39:43 +0000 (18:39 +1200)]
Merge pull request #5856 from eileenmcnaughton/CRM-16402

CRM-16402 consolidate shared code onto parent class

9 years agoCRM-16530 introduce supportsMultipleConcurrentPayments"
Eileen McNaughton [Wed, 20 May 2015 06:36:51 +0000 (18:36 +1200)]
CRM-16530 introduce supportsMultipleConcurrentPayments"

9 years agoMerge pull request #5870 from kurund/gen-data
Kurund Jalmi [Wed, 20 May 2015 06:15:15 +0000 (11:45 +0530)]
Merge pull request #5870 from kurund/gen-data

fixed generated data

9 years agofixed generated data
kurund [Wed, 20 May 2015 06:13:24 +0000 (11:43 +0530)]
fixed generated data

9 years agouse addField in phone form
Tim Mallezie [Tue, 19 May 2015 15:52:43 +0000 (17:52 +0200)]
use addField in phone form

9 years agoAdd titles to OpenID fields
Tim Mallezie [Tue, 19 May 2015 05:01:52 +0000 (07:01 +0200)]
Add titles to OpenID fields

9 years agoMerge pull request #5862 from totten/master-ang-cke
colemanw [Mon, 18 May 2015 23:12:42 +0000 (17:12 -0600)]
Merge pull request #5862 from totten/master-ang-cke

CRM-16354 - Civi/Angular - Don't load ckeditor from "packages"

9 years agoCRM-16354 - Civi/Angular - Don't load ckeditor from "packages"
Tim Otten [Mon, 18 May 2015 22:15:20 +0000 (15:15 -0700)]
CRM-16354 - Civi/Angular - Don't load ckeditor from "packages"

It's now loaded on all pages via Resources::coreResourceList().
The old references produces a warning in dev console.

9 years agoMerge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-19-00-08-12
kurund [Mon, 18 May 2015 19:51:14 +0000 (01:21 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-19-00-08-12

Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Member/Form/MembershipRenewal.tpl

9 years agoMerge pull request #5857 from sudhabisht/CRM-16390
Kurund Jalmi [Mon, 18 May 2015 17:01:55 +0000 (22:31 +0530)]
Merge pull request #5857 from sudhabisht/CRM-16390

Fix for pledge payments record for particular contact id

9 years agoMerge pull request #5859 from sudhabisht/CRM16485
Kurund Jalmi [Mon, 18 May 2015 17:01:51 +0000 (22:31 +0530)]
Merge pull request #5859 from sudhabisht/CRM16485

Fix for subject not display on delete page

9 years agocleanup and fix tests
Tim Mallezie [Mon, 18 May 2015 15:52:01 +0000 (17:52 +0200)]
cleanup and fix tests

9 years agocorrect api function naming
Tim Mallezie [Mon, 18 May 2015 15:51:36 +0000 (17:51 +0200)]
correct api function naming

9 years agoMerge pull request #5858 from jitendrapurohit/CRM-16488
Kurund Jalmi [Mon, 18 May 2015 15:42:34 +0000 (21:12 +0530)]
Merge pull request #5858 from jitendrapurohit/CRM-16488

Search Builder: Qill display operator is missing when searching by Co…

9 years agoMerge pull request #5736 from eileenmcnaughton/CRM-16422
Kurund Jalmi [Mon, 18 May 2015 12:32:19 +0000 (18:02 +0530)]
Merge pull request #5736 from eileenmcnaughton/CRM-16422

CRM-16422 permit processor_id without ? in IPN urls

9 years agoMerge pull request #5854 from kurund/CRM-15629
Kurund Jalmi [Mon, 18 May 2015 11:31:04 +0000 (17:01 +0530)]
Merge pull request #5854 from kurund/CRM-15629

CRM-15629

9 years agoFix for subject not display on delete page
Sudha Bisht [Mon, 18 May 2015 10:03:59 +0000 (15:33 +0530)]
Fix for subject not display on delete page

9 years agoCRM-16402 consolidate shared code onto parent class
Eileen McNaughton [Mon, 18 May 2015 09:40:26 +0000 (21:40 +1200)]
CRM-16402 consolidate shared code onto parent class

9 years agoUse function on parent class to assign processors rather than duplication
Eileen McNaughton [Wed, 13 May 2015 05:50:29 +0000 (17:50 +1200)]
Use function on parent class to assign processors rather than duplication

9 years agoFix for pledge api
Sudha Bisht [Mon, 18 May 2015 09:40:29 +0000 (15:10 +0530)]
Fix for pledge api

9 years agoSearch Builder: Qill display operator is missing when searching by Contact Type
jitendrapurohit [Mon, 18 May 2015 09:34:59 +0000 (15:04 +0530)]
Search Builder: Qill display operator is missing when searching by Contact Type

9 years agoMerge pull request #5848 from mallezie/addfield-email
Eileen McNaughton [Mon, 18 May 2015 07:01:38 +0000 (19:01 +1200)]
Merge pull request #5848 from mallezie/addfield-email

CRM-16178 convert some form elements in email to addfield

9 years agoMerge pull request #5852 from eileenmcnaughton/unusedparams
Eileen McNaughton [Mon, 18 May 2015 07:00:54 +0000 (19:00 +1200)]
Merge pull request #5852 from eileenmcnaughton/unusedparams

comment fixes

9 years agoCRM-15629, more cleanup
kurund [Mon, 18 May 2015 06:38:12 +0000 (12:08 +0530)]
CRM-15629, more cleanup

----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
  https://issues.civicrm.org/jira/browse/CRM-15629

9 years agoCRM-15629, more cleanup
kurund [Mon, 18 May 2015 06:35:53 +0000 (12:05 +0530)]
CRM-15629, more cleanup

----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
  https://issues.civicrm.org/jira/browse/CRM-15629

9 years agoAdd OpenID API with tests
Tim Mallezie [Mon, 18 May 2015 06:22:56 +0000 (08:22 +0200)]
Add OpenID API with tests

9 years agoMerge pull request #5849 from mallezie/addField-household
Eileen McNaughton [Mon, 18 May 2015 00:14:14 +0000 (12:14 +1200)]
Merge pull request #5849 from mallezie/addField-household

CRM-16178 use addField in Household form

9 years agoMerge pull request #5850 from mallezie/addfield-IM
Eileen McNaughton [Mon, 18 May 2015 00:13:39 +0000 (12:13 +1200)]
Merge pull request #5850 from mallezie/addfield-IM

CRM-16178 use addfield in IM form

9 years agoremoved unused param from signature
Eileen McNaughton [Mon, 18 May 2015 00:01:12 +0000 (12:01 +1200)]
removed unused param from signature

9 years agocomment fixes
Eileen McNaughton [Sun, 17 May 2015 23:51:51 +0000 (11:51 +1200)]
comment fixes

9 years agouse addfield method
Tim Mallezie [Sun, 17 May 2015 18:18:47 +0000 (20:18 +0200)]
use addfield method

9 years agoaddfield in IM form
Tim Mallezie [Sun, 17 May 2015 14:06:08 +0000 (16:06 +0200)]
addfield in IM form

9 years agouse addField in Household form
Tim Mallezie [Sun, 17 May 2015 13:30:09 +0000 (15:30 +0200)]
use addField in Household form

9 years agoconvert some form elements in email to addfield
Tim Mallezie [Sun, 17 May 2015 13:20:50 +0000 (15:20 +0200)]
convert some form elements in email to addfield

9 years agoMerge pull request #5833 from kurund/CRM-15629
Kurund Jalmi [Sat, 16 May 2015 09:31:27 +0000 (15:01 +0530)]
Merge pull request #5833 from kurund/CRM-15629

CRM-15629

9 years agoMerge pull request #5846 from totten/4.6-dedupe-email
Dave Greenberg [Fri, 15 May 2015 21:48:49 +0000 (14:48 -0700)]
Merge pull request #5846 from totten/4.6-dedupe-email

CRM-16465 - CiviMail - Handle dedupe_email

9 years agoMerge pull request #5836 from eileenmcnaughton/4.6
Dave Greenberg [Fri, 15 May 2015 21:39:50 +0000 (14:39 -0700)]
Merge pull request #5836 from eileenmcnaughton/4.6

CRM-16504 add auto-renew to back office renewal form

9 years agoMerge pull request #5823 from eileenmcnaughton/CRM-16402-master
Eileen McNaughton [Fri, 15 May 2015 21:09:40 +0000 (09:09 +1200)]
Merge pull request #5823 from eileenmcnaughton/CRM-16402-master

CRM-16402 instantiate payment object in new way

9 years agoMerge pull request #5835 from eileenmcnaughton/CRM-16504
Eileen McNaughton [Fri, 15 May 2015 21:09:19 +0000 (09:09 +1200)]
Merge pull request #5835 from eileenmcnaughton/CRM-16504

CRM-16504 fix recurring option to show on membership renewal

9 years agoMerge pull request #5842 from sudhabisht/CRM-16441
Dave Greenberg [Fri, 15 May 2015 21:07:18 +0000 (14:07 -0700)]
Merge pull request #5842 from sudhabisht/CRM-16441

Fix for re-assign a case to another contact

9 years agoCRM-16465 - crmMailing - Update estimate when toggling dedupe_email
Tim Otten [Fri, 15 May 2015 19:57:12 +0000 (12:57 -0700)]
CRM-16465 - crmMailing - Update estimate when toggling dedupe_email

9 years agoCRM-16465 - Mailing BAO - Handle dedupe_email
Tim Otten [Fri, 15 May 2015 19:56:20 +0000 (12:56 -0700)]
CRM-16465 - Mailing BAO - Handle dedupe_email

9 years agoMerge pull request #5841 from rohankatkar/CRM-16475
Dave Greenberg [Fri, 15 May 2015 19:14:21 +0000 (12:14 -0700)]
Merge pull request #5841 from rohankatkar/CRM-16475

Fix for CRM-16475

9 years agoCRM-16178 use addfield in demographics
Tim Mallezie [Fri, 15 May 2015 19:07:09 +0000 (21:07 +0200)]
CRM-16178 use addfield in demographics

9 years agoMerge pull request #5834 from sudhabisht/CRM-16480
Kurund Jalmi [Fri, 15 May 2015 12:00:42 +0000 (17:30 +0530)]
Merge pull request #5834 from sudhabisht/CRM-16480

Fix for batch validation issue

9 years agoMerge pull request #5744 from davejenx/CRM-16427
Kurund Jalmi [Fri, 15 May 2015 11:36:27 +0000 (17:06 +0530)]
Merge pull request #5744 from davejenx/CRM-16427

CRM-16427 - Advanced logging: ignore changes to civicrm_group refresh_date field

9 years agoMerge pull request #5813 from kenwest/CRM-16276-4.6
Kurund Jalmi [Fri, 15 May 2015 07:01:07 +0000 (12:31 +0530)]
Merge pull request #5813 from kenwest/CRM-16276-4.6

CRM-16276

9 years agoFix for re-assign a case to another contact
Sudha Bisht [Fri, 15 May 2015 06:02:03 +0000 (11:32 +0530)]
Fix for re-assign a case to another contact

9 years agoFix for CRM-16475
Web Access [Fri, 15 May 2015 05:35:14 +0000 (11:05 +0530)]
Fix for CRM-16475

9 years agoMerge pull request #5820 from GinkgoFJG/CRM-16497
Kurund Jalmi [Fri, 15 May 2015 05:19:03 +0000 (10:49 +0530)]
Merge pull request #5820 from GinkgoFJG/CRM-16497

CRM-16497: Fixed problematic loop related to report display options.

9 years agoMerge pull request #5818 from mallezie/commpref-addfield
Eileen McNaughton [Fri, 15 May 2015 00:48:43 +0000 (12:48 +1200)]
Merge pull request #5818 from mallezie/commpref-addfield

use addField in communication preferences form

9 years agocomment tidyups & whitespace
Eileen McNaughton [Thu, 14 May 2015 22:28:34 +0000 (10:28 +1200)]
comment tidyups & whitespace

9 years agoCRM-16402 payment processor factory change
Eileen McNaughton [Wed, 13 May 2015 04:52:04 +0000 (16:52 +1200)]
CRM-16402 payment processor factory change

9 years agoCRM-16402 instantiation of payment processor simplification
Eileen McNaughton [Tue, 12 May 2015 12:21:47 +0000 (00:21 +1200)]
CRM-16402 instantiation of payment processor simplification