Monish Deb [Thu, 13 Nov 2014 05:35:18 +0000 (11:05 +0530)]
Merge pull request #4545 from monishdeb/CRM-15361
CRM-15361 fix - allow selection of location type when sending bulk email
monishdeb [Thu, 13 Nov 2014 05:18:52 +0000 (10:48 +0530)]
Version change in xml
Eileen McNaughton [Thu, 13 Nov 2014 01:56:21 +0000 (14:56 +1300)]
Merge pull request #4533 from davecivicrm/CRM-15555
CRM-15555 - Fix fatal error from protected vars (contactID and context).
Dave Greenberg [Wed, 12 Nov 2014 19:38:57 +0000 (11:38 -0800)]
Merge pull request #4540 from christianwach/crm-12616
Page title fixes to accompany plugin fixes for CRM-12616
Christian Wach [Wed, 12 Nov 2014 16:03:51 +0000 (16:03 +0000)]
pinking shears - remove stray whitespace
monishdeb [Wed, 12 Nov 2014 12:36:27 +0000 (18:06 +0530)]
CRM-15361 fix - allow selection of location type when sending bulk email
https://issues.civicrm.org/jira/browse/CRM-15361
Monish Deb [Wed, 12 Nov 2014 07:08:42 +0000 (12:38 +0530)]
Merge pull request #4536 from monishdeb/CRM-14585
CRM-14585 fix - Incorrect defaults loaded when two phone fields are adde...
Yashodha Chaku [Tue, 11 Nov 2014 13:37:09 +0000 (19:07 +0530)]
Merge pull request #4296 from mrpaulc/CRM-14751
CRM-14751, deleted contacts visible in search
Christian Wach [Tue, 11 Nov 2014 11:58:16 +0000 (11:58 +0000)]
update docblock for setTitle()
Christian Wach [Tue, 11 Nov 2014 11:57:48 +0000 (11:57 +0000)]
use new title-setting method for civicm-wordpress 4.6+
Yashodha Chaku [Tue, 11 Nov 2014 09:13:34 +0000 (14:43 +0530)]
Merge pull request #4415 from rnao/add-participants-to-group
CRM-15428 - CiviEvent - Add participants to a group
monishdeb [Tue, 11 Nov 2014 07:33:25 +0000 (13:03 +0530)]
CRM-14585 fix - Incorrect defaults loaded when two phone fields are added to the same profile one primary and one not primary (EG. Home) with different phone types
https://issues.civicrm.org/jira/browse/CRM-14585
Monish Deb [Tue, 11 Nov 2014 06:54:23 +0000 (12:24 +0530)]
Merge pull request #4520 from jitendrapurohit/CRM-15545
Exporting related contacts prefix exports prefix_id CRM-15545
Dave Greenberg [Mon, 10 Nov 2014 22:58:55 +0000 (14:58 -0800)]
CRM-15555 - Fix fatal error from protected vars (contactID and context).
----------------------------------------
* CRM-15555:
https://issues.civicrm.org/jira/browse/CRM-15555
Monish Deb [Mon, 10 Nov 2014 19:26:50 +0000 (00:56 +0530)]
Merge pull request #4531 from rohankatkar/CRM_12281
CRM-12281: To update name of Latvian provinces and also handled in upgradation.
Rohan Katkar [Mon, 10 Nov 2014 13:31:03 +0000 (19:01 +0530)]
CRM-12281: To update name of Latvian provinces.
Monish Deb [Mon, 10 Nov 2014 13:11:02 +0000 (18:41 +0530)]
Merge pull request #4530 from atif-shaikh/CRM-14550
CRM-14550 Fix - Future date selection in reports
atif-shaikh [Mon, 10 Nov 2014 12:21:39 +0000 (17:51 +0530)]
CRM-14550 Fix - Future date selection in reports
https://issues.civicrm.org/jira/browse/CRM-14550
Kurund Jalmi [Mon, 10 Nov 2014 09:26:41 +0000 (14:56 +0530)]
Merge pull request #4274 from mrpaulc/CRM-14868
CRM-14868 - allow currency symbol in contribution amount_other
Dave Greenberg [Sat, 8 Nov 2014 00:32:39 +0000 (16:32 -0800)]
Merge pull request #4207 from TeNNoX/bettertagoverview3
Better tag overview
jitendrapurohit [Thu, 6 Nov 2014 12:43:20 +0000 (18:13 +0530)]
Exporting related contacts' prefix exports prefix_id CRM-15545
Dave Greenberg [Thu, 6 Nov 2014 02:01:02 +0000 (18:01 -0800)]
Merge pull request #4389 from priyankakaran26/recurring-activity-46
CRM-15490 - Recurring Activities Using Core Recursion
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
unknown [Tue, 4 Nov 2014 22:59:57 +0000 (22:59 +0000)]
Merge branch 'master' into recurring-activity-46
Conflicts:
CRM/Core/BAO/RecurringEntity.php
CRM/Core/Form/RecurringEntity.php
CRM/Core/Page/AJAX/RecurringEntity.php
CRM/Event/Form/ManageEvent/Repeat.php
templates/CRM/Core/Form/RecurringEntity.tpl
templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
unknown [Tue, 4 Nov 2014 14:15:32 +0000 (14:15 +0000)]
some code improvements
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
unknown [Mon, 3 Nov 2014 11:44:25 +0000 (11:44 +0000)]
few dialog fixes
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
unknown [Fri, 31 Oct 2014 23:31:56 +0000 (23:31 +0000)]
hide submit button for activity add screen
Eileen McNaughton [Fri, 31 Oct 2014 22:32:30 +0000 (11:32 +1300)]
fixing processor based support
unknown [Fri, 31 Oct 2014 22:25:51 +0000 (22:25 +0000)]
recurring activity table for activity tabs on contact details page
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...
unknown [Fri, 31 Oct 2014 13:51:43 +0000 (13:51 +0000)]
Added recurring activites label
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...
unknown [Fri, 31 Oct 2014 11:24:46 +0000 (11:24 +0000)]
Removed trailing whitespaces
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
unknown [Thu, 30 Oct 2014 18:18:10 +0000 (18:18 +0000)]
recurring activities in create mode
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
projects / civicrm-core.git / log