Dave Greenberg [Wed, 5 Nov 2014 21:35:02 +0000 (13:35 -0800)]
Merge pull request #4512 from eileenmcnaughton/CRM-15555
CRM-15555 QA fix - ensure email always assigned
Eileen McNaughton [Wed, 5 Nov 2014 04:33:17 +0000 (17:33 +1300)]
CRM-15555 fix for paypal express code showing in backoffice
Eileen McNaughton [Wed, 5 Nov 2014 03:58:15 +0000 (16:58 +1300)]
CRM-15555 QA fix - ensure email always assigned
Dave Greenberg [Wed, 5 Nov 2014 03:57:10 +0000 (19:57 -0800)]
Merge pull request #4493 from eileenmcnaughton/CRM-15555
CRM-15555 refactor definition of fields onto payment processors
Eileen McNaughton [Tue, 4 Nov 2014 12:40:14 +0000 (01:40 +1300)]
Merge pull request #4505 from eileenmcnaughton/CRM-15203
CRM-15203 fix situation where membership payment record is not created
Eileen McNaughton [Tue, 4 Nov 2014 10:37:58 +0000 (23:37 +1300)]
CRM-15203 fix situation where membership payment record is not created
Eileen McNaughton [Tue, 4 Nov 2014 10:36:54 +0000 (23:36 +1300)]
CRM-15203 test fixes to test for membership_payment creation
Monish Deb [Tue, 4 Nov 2014 10:10:32 +0000 (15:40 +0530)]
Merge pull request #4496 from jitendrapurohit/CRM-15449Fix
CRM-15549 Fatal error on View Activity of type Membership Signup for sam...
Dave Greenberg [Tue, 4 Nov 2014 02:13:29 +0000 (18:13 -0800)]
Merge pull request #4198 from sunilpawar/CRM-15332
Fix for CRM-15332
Eileen McNaughton [Mon, 3 Nov 2014 23:25:30 +0000 (12:25 +1300)]
remove now unused function
Eileen McNaughton [Mon, 3 Nov 2014 22:17:57 +0000 (11:17 +1300)]
Merge pull request #4497 from johanv/CRM-15542-unit_test
CRM-15542 - Unit test.
Johan Vervloet [Mon, 3 Nov 2014 20:50:41 +0000 (21:50 +0100)]
CRM-15542 - Unit test.
----------------------------------------
* CRM-15542: The api ignores option_group_id when creating a new custom_field.
https://issues.civicrm.org/jira/browse/CRM-15542
kurund [Mon, 3 Nov 2014 20:17:12 +0000 (01:47 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-04-01-46-50
jitendrapurohit [Mon, 3 Nov 2014 14:15:10 +0000 (19:45 +0530)]
CRM-15549 Fatal error on View Activity of type Membership Signup for sample data
Eileen McNaughton [Mon, 3 Nov 2014 11:53:45 +0000 (00:53 +1300)]
CRM-15555 fix participant billing block by leveragint abstractPayment
Eileen McNaughton [Mon, 3 Nov 2014 11:47:08 +0000 (00:47 +1300)]
CRM-15555 fix membership forms by inheriting & re-using abstract payment methods
Eileen McNaughton [Mon, 3 Nov 2014 10:54:08 +0000 (23:54 +1300)]
remove debug
Eileen McNaughton [Mon, 3 Nov 2014 10:18:36 +0000 (23:18 +1300)]
CRM-15555 fix front end form to use byProcessor method rather than type
Eileen McNaughton [Mon, 3 Nov 2014 09:34:35 +0000 (22:34 +1300)]
towards CRM-15555 add comments
Eileen McNaughton [Mon, 3 Nov 2014 09:15:17 +0000 (22:15 +1300)]
towards CRM-15555 re-add session object
Eileen McNaughton [Mon, 3 Nov 2014 09:13:04 +0000 (22:13 +1300)]
towards CRM-15555 set payment processor type on processor object
Eileen McNaughton [Mon, 3 Nov 2014 08:51:47 +0000 (21:51 +1300)]
CRM-15555 add doPayment wrapper for doDirect & doTransfer
Eileen McNaughton [Mon, 3 Nov 2014 07:59:23 +0000 (20:59 +1300)]
towards CRM-15555 showing billing fields for backoffice contributions
eileenmcnaughton [Mon, 3 Nov 2014 07:56:59 +0000 (07:56 +0000)]
CRM-15555 add DirectDebit.tpl (not liking this pattern but for now)
Eileen McNaughton [Mon, 3 Nov 2014 06:16:18 +0000 (19:16 +1300)]
Merge pull request #4485 from eileenmcnaughton/processor
fix a few comment blocks, minor tidy ups
Yashodha Chaku [Mon, 3 Nov 2014 05:28:50 +0000 (10:58 +0530)]
Merge pull request #4484 from atif-shaikh/CRM-15547
CRM-15547 - Current Employer not saved on Drupal user profile
Eileen McNaughton [Mon, 3 Nov 2014 04:26:56 +0000 (17:26 +1300)]
CRM-15555 towards allowing processor fields to be set by processors
Coleman Watts [Sat, 1 Nov 2014 19:36:19 +0000 (15:36 -0400)]
crm.multilingual.js code comment cleanup
colemanw [Fri, 31 Oct 2014 23:54:17 +0000 (19:54 -0400)]
Merge pull request #4486 from colemanw/CRM-15551
CRM-15551 - crmEditable: add placeholder if empty after editing
Coleman Watts [Fri, 31 Oct 2014 23:51:04 +0000 (19:51 -0400)]
CRM-15551 - crmEditable: add placeholder if empty after editing
Eileen McNaughton [Fri, 31 Oct 2014 22:32:30 +0000 (11:32 +1300)]
fixing processor based support
Eileen McNaughton [Fri, 31 Oct 2014 21:45:03 +0000 (10:45 +1300)]
minor code simplification - use wrapper function
Eileen McNaughton [Fri, 31 Oct 2014 21:39:52 +0000 (10:39 +1300)]
move definition of payment fields to the processor
Eileen McNaughton [Fri, 31 Oct 2014 18:58:07 +0000 (07:58 +1300)]
use processor class to determine if backoffice processing is supported
Eileen McNaughton [Fri, 31 Oct 2014 18:52:32 +0000 (07:52 +1300)]
fix a few comment blocks, minor tidy ups
Eileen McNaughton [Fri, 31 Oct 2014 15:56:47 +0000 (04:56 +1300)]
Merge pull request #4482 from jitendrapurohit/CRM-15508
CRM-15508 Custom Group Create API references non existant var
Dave Greenberg [Fri, 31 Oct 2014 15:40:19 +0000 (08:40 -0700)]
Merge pull request #4478 from davecivicrm/CRM-15197
CRM-15197 - Fix date formatting in PCP page tpl (should use crmDate). Co...
atif-shaikh [Fri, 31 Oct 2014 13:47:38 +0000 (19:17 +0530)]
CRM-15547 - Current Employer not saved on Drupal user profile
https://issues.civicrm.org/jira/browse/CRM-15547
Monish Deb [Fri, 31 Oct 2014 12:53:27 +0000 (18:23 +0530)]
Merge pull request #4481 from jitendrapurohit/CRM-15542Fix
CRM-15542 The api ignores option_group_id when creating a new custom_fie...
Yashodha Chaku [Fri, 31 Oct 2014 10:53:43 +0000 (16:23 +0530)]
Merge pull request #4480 from rohankatkar/CRM_15540
Additional changes and notices fix for CRM-15540
jitendrapurohit [Fri, 31 Oct 2014 10:21:49 +0000 (15:51 +0530)]
CRM-15508 Custom Group Create API references non existant var Fix
Yashodha Chaku [Fri, 31 Oct 2014 09:05:33 +0000 (14:35 +0530)]
Merge pull request #4463 from jmcclelland/authorize-recur-unlimited
CRM-15537 - translate open ended installments to 9999 for authorize.net
jitendrapurohit [Fri, 31 Oct 2014 08:49:14 +0000 (14:19 +0530)]
CRM-15542 The api ignores option_group_id when creating a new custom_field fix
Rohan Katkar [Fri, 31 Oct 2014 07:19:20 +0000 (12:49 +0530)]
Additional changes and notices fix for CRM-15540
Dave Greenberg [Fri, 31 Oct 2014 00:33:26 +0000 (17:33 -0700)]
CRM-15197 - Fix date formatting in PCP page tpl (should use crmDate). Corresponding webtest fix as well.
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
colemanw [Thu, 30 Oct 2014 22:04:42 +0000 (18:04 -0400)]
Merge pull request #4477 from colemanw/CRM-15541
CRM-15541 - change crm-container-snippet to crm-container for embedded profile forms
Coleman Watts [Thu, 30 Oct 2014 21:58:58 +0000 (17:58 -0400)]
CRM-15541 - change crm-container-snippet to crm-container for embedded profile forms
colemanw [Thu, 30 Oct 2014 20:34:16 +0000 (16:34 -0400)]
Merge pull request #4476 from colemanw/CRM-15534
CRM-15534 - Fix api.getfields to return custom fields from sub-types
Coleman Watts [Thu, 30 Oct 2014 18:57:32 +0000 (14:57 -0400)]
Api getfields code cleanup
Coleman Watts [Thu, 30 Oct 2014 18:55:20 +0000 (14:55 -0400)]
CRM-15534 - Fix api.getfields to return custom fields from sub-types
Kurund Jalmi [Thu, 30 Oct 2014 14:54:34 +0000 (10:54 -0400)]
Merge pull request #4475 from jitendrapurohit/webtestfixes
Fix for webtest WebTest_Contribute_UpdateContributionTest.testDeletePrem...
jitendrapurohit [Thu, 30 Oct 2014 13:07:09 +0000 (18:37 +0530)]
Fix for webtest WebTest_Contribute_UpdateContributionTest.testDeletePremium
Yashodha Chaku [Thu, 30 Oct 2014 07:48:15 +0000 (13:18 +0530)]
Merge pull request #4474 from jitendrapurohit/CRM-15538
DB error fix on search for account_type_code or account_code
jitendrapurohit [Thu, 30 Oct 2014 06:38:01 +0000 (12:08 +0530)]
DB error on search for account_type_code or account_code
Dave Greenberg [Wed, 29 Oct 2014 21:35:44 +0000 (14:35 -0700)]
Merge pull request #4471 from monishdeb/CRM-15500
CRM-15500 fix - Scheduled reminders: if 'Also include' and 'Choose recip...
Dave Greenberg [Wed, 29 Oct 2014 21:15:05 +0000 (14:15 -0700)]
Merge pull request #4468 from monishdeb/CRM-15481
CRM-15481 additional fix
Yashodha Chaku [Wed, 29 Oct 2014 18:01:39 +0000 (23:31 +0530)]
Merge pull request #4470 from rohankatkar/tests
webtest fixes
Rohan Katkar [Wed, 29 Oct 2014 15:00:54 +0000 (20:30 +0530)]
webtest fixes
monishdeb [Wed, 29 Oct 2014 14:58:44 +0000 (20:28 +0530)]
CRM-15500 fix - Scheduled reminders: if 'Also include' and 'Choose recipients' is selected, and no recipients are entered - reminder is sent to all contacts
https://issues.civicrm.org/jira/browse/CRM-15500
monishdeb [Wed, 29 Oct 2014 11:01:47 +0000 (16:31 +0530)]
Minor change
Yashodha Chaku [Wed, 29 Oct 2014 09:09:12 +0000 (14:39 +0530)]
Merge pull request #4291 from mrpaulc/CRM-12920
CRM-12920 - search exposes bulk actions user has no permission to access...
monishdeb [Wed, 29 Oct 2014 08:40:16 +0000 (14:10 +0530)]
CRM-15481 additional fix
----------------------------------------
* CRM-15481: Scheduled Reminders job failure with event reminders
https://issues.civicrm.org/jira/browse/CRM-15481
Eileen McNaughton [Wed, 29 Oct 2014 05:06:48 +0000 (18:06 +1300)]
Merge pull request #4466 from eileenmcnaughton/master
Master
Eileen McNaughton [Wed, 29 Oct 2014 04:14:19 +0000 (17:14 +1300)]
whitespace - strip trailing spaces:
Eileen McNaughton [Wed, 29 Oct 2014 04:11:04 +0000 (17:11 +1300)]
more whitespace cleanup
Eileen McNaughton [Wed, 29 Oct 2014 03:34:42 +0000 (16:34 +1300)]
whitespace cleanup
Eileen McNaughton [Wed, 29 Oct 2014 03:26:35 +0000 (16:26 +1300)]
Merge pull request #4465 from eileenmcnaughton/master
remove trailing whitespace & tabs
Tim Otten [Wed, 29 Oct 2014 03:20:26 +0000 (20:20 -0700)]
Merge pull request #4464 from totten/4.5-regen
regen.sh - Add support for alternate ports (using same configuration as setup.sh)
Eileen McNaughton [Wed, 29 Oct 2014 02:25:16 +0000 (15:25 +1300)]
more whitespace -remove trailing spaces
Eileen McNaughton [Wed, 29 Oct 2014 02:16:09 +0000 (15:16 +1300)]
whitespace fixups
Eileen McNaughton [Wed, 29 Oct 2014 02:07:09 +0000 (15:07 +1300)]
remove tabs, trailing spaces
Tim Otten [Wed, 29 Oct 2014 01:54:49 +0000 (18:54 -0700)]
regen.sh - Add support for alternate ports (using same configuration as setup.sh)
Tim Otten [Tue, 28 Oct 2014 21:21:41 +0000 (14:21 -0700)]
Merge pull request #4299 from JohnFF/4.5-metafix
CRM-15251 - Contact details revealed when certain URLs indexed by search engines
Jamie McClelland [Tue, 28 Oct 2014 21:21:28 +0000 (17:21 -0400)]
CRM-15537 - translate open ended installments to 9999 for authorize.net
----------------------------------------
* CRM-15537: editing recurring contribution for authorize.net with unlimited contributions throws error
https://issues.civicrm.org/jira/browse/CRM-15537
kurund [Tue, 28 Oct 2014 21:03:43 +0000 (17:03 -0400)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-28-17-02-35
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
Kurund Jalmi [Tue, 28 Oct 2014 21:00:43 +0000 (17:00 -0400)]
Merge pull request #4462 from kurund/permission-fixes
add missing / new permissions
kurund [Tue, 28 Oct 2014 20:59:52 +0000 (16:59 -0400)]
add missing / new permissions
Monish Deb [Tue, 28 Oct 2014 10:13:01 +0000 (15:43 +0530)]
Merge pull request #4459 from rohankatkar/CRM-15517
CRM-15517 Fix for, images broken for Premiums on contribution page
Monish Deb [Tue, 28 Oct 2014 05:59:33 +0000 (11:29 +0530)]
Merge pull request #4451 from atif-shaikh/CRM-15520
CRM-15520 - Titles of Screens do not support two-line titles
Rohan Katkar [Tue, 28 Oct 2014 05:31:46 +0000 (11:01 +0530)]
CRM-15517 Fix for images broken for Premiums on contribution page
Yashodha Chaku [Tue, 28 Oct 2014 05:27:03 +0000 (10:57 +0530)]
Merge pull request #4453 from jitendrapurohit/CRM-15501
CRM-15501 Wrong File ID on Public Multi-Record Detail View Fix
Yashodha Chaku [Tue, 28 Oct 2014 05:23:12 +0000 (10:53 +0530)]
Merge pull request #4452 from yashodha/CRM-15445
CRM-15445: fix missing title
Eileen McNaughton [Tue, 28 Oct 2014 03:35:42 +0000 (16:35 +1300)]
Merge pull request #4457 from eileenmcnaughton/master
tidy up of trailing spaces & tabs
Eileen McNaughton [Tue, 28 Oct 2014 03:34:37 +0000 (16:34 +1300)]
Merge pull request #4456 from eileenmcnaughton/CRM-15509
CRM-15509 remove hard-coded billing info from Billing.tpl
Eileen McNaughton [Tue, 28 Oct 2014 01:48:31 +0000 (14:48 +1300)]
CRM-15509 fix paypal express path
Eileen McNaughton [Tue, 28 Oct 2014 00:18:40 +0000 (13:18 +1300)]
remove trailing spaces, swap tabs for double spaces
Eileen McNaughton [Mon, 27 Oct 2014 23:29:45 +0000 (12:29 +1300)]
whitespace
Dave Greenberg [Mon, 27 Oct 2014 23:09:38 +0000 (16:09 -0700)]
Merge pull request #4439 from colemanw/CRM-15523
CRM-15523 - Add sub-type custom fields to list of available tokens
Dave Greenberg [Mon, 27 Oct 2014 22:21:34 +0000 (15:21 -0700)]
Merge pull request #4455 from lcdservices/CRM-15525
CRM-15525 change require to require_once
Eileen McNaughton [Mon, 27 Oct 2014 21:34:38 +0000 (10:34 +1300)]
CRM-15509 remove hidePaypalExpress assignment as I've switched to an opt-in in the tpl
Eileen McNaughton [Mon, 27 Oct 2014 21:26:42 +0000 (10:26 +1300)]
CRM-15509 put div outside if statements & ensure fieldsets are enclosing within an if statement
Eileen McNaughton [Mon, 27 Oct 2014 21:21:48 +0000 (10:21 +1300)]
CRM-15509 payment processor structure fix typo on previous
Eileen McNaughton [Mon, 27 Oct 2014 21:14:03 +0000 (10:14 +1300)]
CRM-15509 move paypal express to its own file for clarity
Eileen McNaughton [Mon, 27 Oct 2014 21:02:49 +0000 (10:02 +1300)]
CRM-15509 remove hard-coded billing & card blocks in the tpl in favour of assigned fields
(note that a next step will be to allow processors to interact with the defined fields
Eileen McNaughton [Mon, 27 Oct 2014 19:24:36 +0000 (08:24 +1300)]
CRM-15509 towards refactoring control of payment fields to the payment
processors
This doesn't do much in itself but moves a small piece of the logic out
of the tpl where it can be more easily overrided. However, this is not
expected to be the final resting place of this assignment
Eileen McNaughton [Mon, 27 Oct 2014 19:11:47 +0000 (08:11 +1300)]
CRM-15509 cleanup, I grepped templates & couldn't find this param in use
Brian Shaughnessy [Mon, 27 Oct 2014 18:14:33 +0000 (14:14 -0400)]
CRM-15525 change require to require_once
Dave Greenberg [Mon, 27 Oct 2014 17:57:28 +0000 (10:57 -0700)]
Merge pull request #4437 from atif-shaikh/CRM-15427
CRM-15427 - Profiles using Participants (Event type), Participants (Even...
colemanw [Mon, 27 Oct 2014 17:25:35 +0000 (13:25 -0400)]
Merge pull request #4454 from colemanw/CRM-15530
CRM-15530 - Fix event profile remove button
Coleman Watts [Mon, 27 Oct 2014 17:16:32 +0000 (13:16 -0400)]
CRM-15530 - Fix event profile remove button
projects / civicrm-core.git / log