systopia [Wed, 3 Dec 2014 14:03:22 +0000 (15:03 +0100)]
included @colemanw 's doc update
systopia [Wed, 3 Dec 2014 07:07:50 +0000 (08:07 +0100)]
made the fix more generic and robust
Niko Bochan [Mon, 1 Dec 2014 11:29:20 +0000 (12:29 +0100)]
use id instead of title
Niko Bochan [Mon, 1 Dec 2014 10:22:50 +0000 (11:22 +0100)]
order items alphabetically if weights are the same
colemanw [Sun, 30 Nov 2014 19:37:34 +0000 (14:37 -0500)]
Merge pull request #4627 from colemanw/docblocks
Mass cleanup of docblocks/code/comments
Coleman Watts [Thu, 27 Nov 2014 16:53:14 +0000 (11:53 -0500)]
Mass cleanup of docblocks/code/comments
Yashodha Chaku [Fri, 28 Nov 2014 10:12:45 +0000 (15:42 +0530)]
Merge pull request #4124 from tohojo/adv-search-fix
Fix returning to a smart group search after adding an activity.
Yashodha Chaku [Fri, 28 Nov 2014 08:00:29 +0000 (13:30 +0530)]
Merge pull request #4624 from eileenmcnaughton/CRM-15659-master
CRM-15659 - Contribution Thank you page says ' will be processed every 1 week(s)'
Eileen McNaughton [Thu, 27 Nov 2014 23:18:44 +0000 (12:18 +1300)]
CRM-15659 - Contribution Thank you page says ' will be processed every 1
week(s)'
Conflicts:
templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
colemanw [Thu, 27 Nov 2014 15:08:07 +0000 (10:08 -0500)]
Merge pull request #4622 from civicrm/4.5
Merge branch 4.5 into master
Monish Deb [Thu, 27 Nov 2014 13:49:34 +0000 (19:19 +0530)]
Merge pull request #4612 from rohankatkar/CRM-15557
Fix for CRM-15557 Allow decimal 'other amount' field in priceset
Yashodha Chaku [Thu, 27 Nov 2014 11:18:44 +0000 (16:48 +0530)]
Merge pull request #4617 from ejegg/master
Allow falsy values as custom field db defaults
Rohan Katkar [Wed, 26 Nov 2014 06:58:28 +0000 (12:28 +0530)]
CRM-15557 Changed cloumn type for civicrm_line_item.qty and handled in upgrade
Rohan Katkar [Tue, 25 Nov 2014 12:47:00 +0000 (18:17 +0530)]
Minor changes to CRM-15557
Rohan Katkar [Tue, 25 Nov 2014 11:11:01 +0000 (16:41 +0530)]
Fix for CRM-15557 Allow decimal 'other amount' field in priceset
Monish Deb [Thu, 27 Nov 2014 10:26:28 +0000 (15:56 +0530)]
Merge pull request #4620 from rohankatkar/CRM-15654
CRM-15654 Contact Edit Form spacing can be improved
Rohan Katkar [Thu, 27 Nov 2014 07:19:51 +0000 (12:49 +0530)]
CRM-15654 Contact Edit Form spacing can be improved
Yashodha Chaku [Thu, 27 Nov 2014 06:27:30 +0000 (11:57 +0530)]
Merge pull request #4615 from williamtheaker/upstream
Fixed typo/broken links
Yashodha Chaku [Thu, 27 Nov 2014 03:27:00 +0000 (08:57 +0530)]
Merge pull request #4618 from laryn/patch-2
Fix spelling mistake
colemanw [Wed, 26 Nov 2014 23:27:32 +0000 (18:27 -0500)]
Merge pull request #4610 from colemanw/CRM-15613
CRM-15613 - Fix access to undefined property error
laryn [Wed, 26 Nov 2014 20:17:59 +0000 (14:17 -0600)]
Fix spelling mistake
Particiapnt => Participant
Elliott Eggleston [Wed, 26 Nov 2014 17:47:52 +0000 (09:47 -0800)]
Allow falsy values as custom field db defaults
Use if isset($field->default_value) instead of just
if ($field->default_value) so we can set a custom field database
column's default to zero.
William Theaker [Wed, 26 Nov 2014 01:59:04 +0000 (20:59 -0500)]
Fixed typo/broken links
colemanw [Tue, 25 Nov 2014 20:59:15 +0000 (15:59 -0500)]
Merge pull request #4614 from colemanw/CRM-15646
CRM-15646 - api.setvalue: Add support for custom fields
Dave Greenberg [Tue, 25 Nov 2014 20:00:34 +0000 (12:00 -0800)]
Merge pull request #4613 from atif-shaikh/CRM-11302
CRM-11302 - added code which conditionally lists the group(s) that the person is unsubscribing from
Coleman Watts [Tue, 25 Nov 2014 17:59:41 +0000 (12:59 -0500)]
CRM-15646 - api.setvalue: Add support for custom fields
atif-shaikh [Tue, 25 Nov 2014 13:12:09 +0000 (18:42 +0530)]
CRM-11302 - Enhance unsubscribe form to reduce likelihood of accidental unsubscribes
https://issues.civicrm.org/jira/browse/CRM-11302
colemanw [Tue, 25 Nov 2014 03:14:23 +0000 (22:14 -0500)]
Merge pull request #4544 from colemanw/CRM-15585
CRM-15585 - Call pre hooks from api.setvalue
Coleman Watts [Tue, 25 Nov 2014 03:08:25 +0000 (22:08 -0500)]
CRM-15613 - Fix access to undefined property error
Tim Otten [Tue, 25 Nov 2014 02:04:37 +0000 (18:04 -0800)]
Merge pull request #4552 from giant-rabbit/preprocess-hook
Add hook_civicrm_preProcess function.
Tim Otten [Tue, 25 Nov 2014 01:50:05 +0000 (17:50 -0800)]
Merge pull request #4608 from totten/4.5-trigger-rebuild
CRM-15602 Fix for logging- only regenerate timestamp triggers on requested tables
David Knoll [Thu, 20 Nov 2014 11:14:38 +0000 (11:14 +0000)]
CRM-15602 Fix for logging- only regenerate timestamp triggers on requested tables
kurund [Mon, 24 Nov 2014 10:31:09 +0000 (16:01 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-24-15-59-25
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
Yashodha Chaku [Mon, 24 Nov 2014 09:06:51 +0000 (14:36 +0530)]
Merge pull request #4594 from jmcclelland/petition-email-mode
CRM-15630 - ensure social media links work in email messages.
Monish Deb [Mon, 24 Nov 2014 07:53:53 +0000 (13:23 +0530)]
Merge pull request #4575 from jitendrapurohit/CRM-15552
CRM-15552 Field communication_style not available to be added to profile...
colemanw [Mon, 24 Nov 2014 04:04:54 +0000 (23:04 -0500)]
Merge pull request #4603 from colemanw/CRM-15633
CRM-15633 - Fix js on campaign dashboard tables
Coleman Watts [Mon, 24 Nov 2014 04:02:18 +0000 (23:02 -0500)]
CRM-15633 - Fix js on campaign dashboard tables
Dave Greenberg [Fri, 21 Nov 2014 19:51:05 +0000 (11:51 -0800)]
Merge pull request #4578 from pradpnayak/CRM-10206
--CRM-10206, reverted back some changes that caused regression when crea...
Dave Greenberg [Fri, 21 Nov 2014 19:01:05 +0000 (11:01 -0800)]
Merge pull request #4584 from davecivicrm/CRM-15621
CRM-15621 - prevent fatal on payment updates with Auth.net IPN
Jamie McClelland [Fri, 21 Nov 2014 18:43:37 +0000 (13:43 -0500)]
CRM-15630 - ensure social media links work in email messages.
----------------------------------------
* CRM-15630: Petition add signature thank you email doesn't send correct social networking links
https://issues.civicrm.org/jira/browse/CRM-15630
jitendrapurohit [Fri, 21 Nov 2014 06:36:58 +0000 (12:06 +0530)]
optimised modification
jitendrapurohit [Tue, 18 Nov 2014 13:06:18 +0000 (18:36 +0530)]
CRM-15552 Field communication_style not available to be added to profiles
Dave Greenberg [Thu, 20 Nov 2014 23:45:25 +0000 (15:45 -0800)]
Merge pull request #4586 from giant-rabbit/CRM-15622
CRM-15622: Fix for incorrect Fee Amount.
colemanw [Thu, 20 Nov 2014 23:16:42 +0000 (18:16 -0500)]
Merge pull request #4591 from colemanw/CRM-15625
CRM-15625 - Add support for contribution api honor_type_id param
Coleman Watts [Thu, 20 Nov 2014 21:16:39 +0000 (16:16 -0500)]
CRM-15625 - Add support for contribution api honor_type_id param
Monish Deb [Thu, 20 Nov 2014 08:22:08 +0000 (13:52 +0530)]
Merge pull request #4588 from rohankatkar/CRM-15617
CRM-15617 SYBUNT report doesn't have Add Contacts to Group Option
Rohan Katkar [Thu, 20 Nov 2014 06:53:03 +0000 (12:23 +0530)]
CRM-15617 SYBUNT report doesn't have Add Contacts to Group Option
Dave Greenberg [Thu, 20 Nov 2014 02:03:18 +0000 (18:03 -0800)]
Merge pull request #4583 from deepak-srivastava/CRM-15490
CRM-15490: fix for additional activity same as parent
CiviCRM [Thu, 20 Nov 2014 01:18:09 +0000 (17:18 -0800)]
Update version to 4.5.5
Peter Haight [Wed, 19 Nov 2014 23:57:59 +0000 (15:57 -0800)]
CRM-15622: Fix for incorrect Fee Amount.
There's a bunch of fee_amount fields in this section of the code leading
to a lot of confusion (see CRM-15372). Many of the payment processors set
the fee_amount field in the result array they return which sets up the
contribution.fee_amount field, but the Authorize.Net AIM API doesn't
return fee information, so Authorize.Net doesn't set this field. Instead
of setting this field to 0 there, I thought it would be better to not
require that the payment processor set this field. Since some of the
payment processors return the same array that was passed into them and the
payment processors don't need the fee_amount field as an argument, I think
that setting that to NULL before passing it in gets us the correct output.
Note that we still need the fix from CRM-15372 to get the
participant.fee_amount field set correctly because the code that sets up
the pariticpant shares the field array that the contribution creation
uses even though they don't have the same 'fee_amount' field.
Dave Greenberg [Wed, 19 Nov 2014 23:23:31 +0000 (15:23 -0800)]
CRM-15621 - prevent fatal on payment updates with Auth.net IPN
----------------------------------------
* CRM-15621:
https://issues.civicrm.org/jira/browse/CRM-15621
Coleman Watts [Wed, 19 Nov 2014 16:36:14 +0000 (11:36 -0500)]
Remove redundant help link
Pradeep Nayak [Wed, 19 Nov 2014 16:19:35 +0000 (21:49 +0530)]
--CRM-10206, added api test
deepak-srivastava [Wed, 19 Nov 2014 15:24:14 +0000 (15:24 +0000)]
CRM-15490: fix for additional activity same as parent
----------------------------------------
* CRM-15490: Recurring Activities Using Core Recursion
https://issues.civicrm.org/jira/browse/CRM-15490
Monish Deb [Wed, 19 Nov 2014 12:35:41 +0000 (18:05 +0530)]
Merge pull request #4556 from jitendrapurohit/CRM-15586
Search Filter for Activity Type in Case Mgt screen does not display acti...
Pradeep Nayak [Tue, 18 Nov 2014 15:04:26 +0000 (20:34 +0530)]
--CRM-10206, reverted back some changes that caused regression when creating multi value custom field value using api
Monish Deb [Wed, 19 Nov 2014 10:10:31 +0000 (15:40 +0530)]
Merge pull request #4582 from rohankatkar/CRM_15594
Fix for CRM-15594
Rohan Katkar [Wed, 19 Nov 2014 08:53:52 +0000 (14:23 +0530)]
Fix for CRM-15594
Monish Deb [Wed, 19 Nov 2014 06:23:32 +0000 (11:53 +0530)]
Merge pull request #4581 from rohankatkar/CRM-15594
CRM-15594 Fix alignments on Merge Rules page
Rohan Katkar [Wed, 19 Nov 2014 05:17:53 +0000 (10:47 +0530)]
CRM-15594 Fix alignments on Merge Rules page
Monish Deb [Wed, 19 Nov 2014 05:02:26 +0000 (10:32 +0530)]
Merge pull request #4574 from rohankatkar/CRM-15594
CRM-15594 : Fix alignments on Merge Rules page
colemanw [Tue, 18 Nov 2014 19:06:56 +0000 (14:06 -0500)]
Merge pull request #4579 from colemanw/CRM_Utils_Array
CRM_Utils_Array - Remove old unused functions
Coleman Watts [Tue, 18 Nov 2014 18:20:13 +0000 (13:20 -0500)]
Add test for CRM_Utils_Array::remove
colemanw [Tue, 18 Nov 2014 18:10:11 +0000 (13:10 -0500)]
Merge pull request #4509 from colemanw/addVars
Encourage better scoping of js CRM vars with new addVars method
Coleman Watts [Tue, 18 Nov 2014 17:45:33 +0000 (12:45 -0500)]
CRM_Utils_Array - Remove old unused functions
Coleman Watts [Tue, 4 Nov 2014 16:09:05 +0000 (11:09 -0500)]
Encourage better scoping of js CRM vars with new addVars method
Monish Deb [Tue, 18 Nov 2014 14:21:16 +0000 (19:51 +0530)]
Merge pull request #4577 from monishdeb/CRM-15595
CRM-15595 indentation fix
monishdeb [Tue, 18 Nov 2014 14:18:52 +0000 (19:48 +0530)]
CRM-15595 indentation fix
----------------------------------------
* CRM-15595: Individual sub-type custom fields don't appear in online event registration
https://issues.civicrm.org/jira/browse/CRM-15595
Monish Deb [Tue, 18 Nov 2014 14:04:28 +0000 (19:34 +0530)]
Merge pull request #4572 from atif-shaikh/CRM-15595
CRM-15595 - Individual sub-type custom fields don't appear in online eve...
Monish Deb [Tue, 18 Nov 2014 13:21:12 +0000 (18:51 +0530)]
Merge pull request #4576 from yashodha/CRM-15611
Tested, works fine
CiviCRM [Tue, 18 Nov 2014 13:13:21 +0000 (18:43 +0530)]
CRM-15611: fix send copy for case activity
Rohan Katkar [Tue, 18 Nov 2014 12:40:34 +0000 (18:10 +0530)]
CRM-15594 Fix alignments on Merge Rules page
Monish Deb [Tue, 18 Nov 2014 07:13:49 +0000 (12:43 +0530)]
Merge pull request #4550 from jitendrapurohit/CRM-15568
Cannot use search builder on multiple Grant and Case types Fix
atif-shaikh [Tue, 18 Nov 2014 05:58:22 +0000 (11:28 +0530)]
CRM-15595 - Individual sub-type custom fields don't appear in online event registration
https://issues.civicrm.org/jira/browse/CRM-15595
Dave Greenberg [Tue, 18 Nov 2014 01:43:19 +0000 (17:43 -0800)]
Merge pull request #4560 from priyankakaran26/recurring-entity-improvements
CRM-15490 - Recurring entity QA fixes
Dave Greenberg [Mon, 17 Nov 2014 22:45:07 +0000 (14:45 -0800)]
Merge pull request #4563 from monishdeb/CRM-15536
CRM-15536 fix - Scheduled reminders: Clarify "Limit to" and "Also includ...
monishdeb [Mon, 17 Nov 2014 21:43:37 +0000 (03:13 +0530)]
CRM-15536 fix - Scheduled reminders: Clarify "Limit to" and "Also include" UI to prevent user errors
https://issues.civicrm.org/jira/browse/CRM-15536
monishdeb [Mon, 17 Nov 2014 20:07:17 +0000 (01:37 +0530)]
CRM-11518 fix - Smart groups in scheduled reminders
https://issues.civicrm.org/jira/browse/CRM-11518
monishdeb [Mon, 17 Nov 2014 19:50:27 +0000 (01:20 +0530)]
indentation fix
monishdeb [Mon, 17 Nov 2014 19:48:58 +0000 (01:18 +0530)]
QA fix
colemanw [Mon, 17 Nov 2014 18:55:56 +0000 (13:55 -0500)]
Merge pull request #4568 from colemanw/CRM-15603
CRM-15603 - Misc translated string cleanup
Yashodha Chaku [Mon, 17 Nov 2014 13:30:35 +0000 (19:00 +0530)]
Merge pull request #4569 from rohankatkar/CRM-15564
Fix for CRM-15564
kurund [Mon, 17 Nov 2014 08:10:30 +0000 (13:40 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-17-13-40-23
Kurund Jalmi [Mon, 17 Nov 2014 05:59:03 +0000 (11:29 +0530)]
Merge pull request #4570 from kurund/CRM-15527
CRM-15527
Rohan Katkar [Mon, 17 Nov 2014 05:31:21 +0000 (11:01 +0530)]
Fix for CRM-15564
kurund [Mon, 17 Nov 2014 04:13:06 +0000 (09:43 +0530)]
Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527
Conflicts:
templates/CRM/Event/Form/Participant.tpl
----------------------------------------
* CRM-15474: Event cart option js breaks "add participant" form
https://issues.civicrm.org/jira/browse/CRM-15474
* CRM-15527: error in IPN relating to numRelatedMemberships
https://issues.civicrm.org/jira/browse/CRM-15527
Coleman Watts [Mon, 17 Nov 2014 00:43:25 +0000 (19:43 -0500)]
CRM-15603 - Remove concatenated parentheses from the end of strings
Coleman Watts [Mon, 17 Nov 2014 00:33:40 +0000 (19:33 -0500)]
CRM-15603 - Misc string fixes
Coleman Watts [Mon, 17 Nov 2014 00:32:44 +0000 (19:32 -0500)]
CRM-15603 - Standardize pluralization of 'Languages, Currency, Locations'
Coleman Watts [Mon, 17 Nov 2014 00:31:16 +0000 (19:31 -0500)]
CRM-15603 - Standardize 'Opt-out'
Coleman Watts [Sun, 16 Nov 2014 23:59:16 +0000 (18:59 -0500)]
CRM-15603 - Tame punctuation of 'This event is full!!!'
Coleman Watts [Sun, 16 Nov 2014 22:34:29 +0000 (17:34 -0500)]
CRM-15603 - Remove extra space
Coleman Watts [Sun, 16 Nov 2014 22:31:57 +0000 (17:31 -0500)]
CRM-15603 - Standardize case of reminders labels
Coleman Watts [Sun, 16 Nov 2014 22:29:43 +0000 (17:29 -0500)]
CRM-15603 - Standardize case of 'Batch Update Contributions Via Profile'
Coleman Watts [Sun, 16 Nov 2014 22:27:28 +0000 (17:27 -0500)]
CRM-15603 - Standardize punctuation of 'Title is a required field.'
Coleman Watts [Sun, 16 Nov 2014 22:21:46 +0000 (17:21 -0500)]
CRM-15603 - Remove unnecessary variables in contribution tab titles
Coleman Watts [Sun, 16 Nov 2014 22:15:41 +0000 (17:15 -0500)]
CRM-15603 - Standardize case of 'Recurring Contributions'
Coleman Watts [Sun, 16 Nov 2014 22:14:35 +0000 (17:14 -0500)]
CRM-15603 - Standardize punctuation of 'End date should be after Start date.'
Coleman Watts [Sun, 16 Nov 2014 22:13:04 +0000 (17:13 -0500)]
CRM-15603 - Standardize case of 'Pledge Made'
Coleman Watts [Sun, 16 Nov 2014 22:11:01 +0000 (17:11 -0500)]
CRM-15603 - Standardize case of 'Supporter Profile'
projects / civicrm-core.git / log