Dave Greenberg [Tue, 9 Dec 2014 02:00:12 +0000 (18:00 -0800)]
Merge pull request #4685 from davecivicrm/CRM-4193
CRM-4193 - current employer dupe match should use Unsupervised rule.
Dave Greenberg [Tue, 9 Dec 2014 00:37:25 +0000 (16:37 -0800)]
CRM-4193 - current employer dupe match should use Unsupervised rule.
----------------------------------------
* CRM-4193:
https://issues.civicrm.org/jira/browse/CRM-4193
Dave Greenberg [Mon, 8 Dec 2014 21:47:28 +0000 (13:47 -0800)]
Merge pull request #4677 from colemanw/CRM-15495
CRM-15495 - Add filtering control to entityRef widget
Dave Greenberg [Mon, 8 Dec 2014 19:29:40 +0000 (11:29 -0800)]
Merge pull request #4679 from davecivicrm/CRM-13611
CRM-13611 - Improvements to tab titles. Add {ts} to tab href titles and ...
Dave Greenberg [Mon, 8 Dec 2014 19:28:32 +0000 (11:28 -0800)]
CRM-13611 - Improvements to tab titles. Add {ts} to tab href titles and make them consistent.
----------------------------------------
* CRM-13611:
https://issues.civicrm.org/jira/browse/CRM-13611
Dave Greenberg [Mon, 8 Dec 2014 18:47:17 +0000 (10:47 -0800)]
Merge pull request #4678 from colemanw/CRM-13611
CRM-13611 - Hide tab content if report has rows
Monish Deb [Mon, 8 Dec 2014 10:30:29 +0000 (16:00 +0530)]
Merge pull request #4676 from rohankatkar/CRM_14988
CRM-14988 URL encoding error
Monish Deb [Mon, 8 Dec 2014 06:13:30 +0000 (11:43 +0530)]
Merge pull request #4674 from atif-shaikh/CRM-11993
Crm 11993
atif-shaikh [Mon, 8 Dec 2014 04:53:54 +0000 (10:23 +0530)]
CRM-11993 - Onchange locale(Language Switcher) reload on the same page
----------------------------------------
* CRM-11993: Few bugs on switching language
https://issues.civicrm.org/jira/browse/CRM-11993
Coleman Watts [Sat, 6 Dec 2014 21:20:27 +0000 (16:20 -0500)]
CRM-13611 - Hide tab content if report has rows
Coleman Watts [Sat, 6 Dec 2014 02:11:46 +0000 (21:11 -0500)]
EntityRef tag-related code cleanup
Coleman Watts [Thu, 4 Dec 2014 20:15:22 +0000 (15:15 -0500)]
CRM-15495 - Add filtering control to entityRef widget
Dave Greenberg [Fri, 5 Dec 2014 18:35:13 +0000 (10:35 -0800)]
Merge pull request #4671 from davecivicrm/CRM-15407a
CRM-15407 - add fee amount to Dummy transaction.
Rohan Katkar [Fri, 5 Dec 2014 13:47:05 +0000 (19:17 +0530)]
CRM-14988 URL encoding error
atif-shaikh [Fri, 5 Dec 2014 10:27:51 +0000 (15:57 +0530)]
CRM-11993 - QA fix
----------------------------------------
* CRM-11993: Few bugs on switching language
https://issues.civicrm.org/jira/browse/CRM-11993
Yashodha Chaku [Fri, 5 Dec 2014 10:11:57 +0000 (15:41 +0530)]
Merge pull request #4673 from yashodha/4.6
CRM-15690 : Merge UI - show text in place of id for gender and employer
CiviCRM [Fri, 5 Dec 2014 10:09:50 +0000 (15:39 +0530)]
CRM-15690 : Merge UI - show text in place of id for gender and employer
atif-shaikh [Fri, 5 Dec 2014 09:51:40 +0000 (15:21 +0530)]
CRM-11993 Fixes - Few bugs on switching language
https://issues.civicrm.org/jira/browse/CRM-11993
samuelsov [Thu, 25 Sep 2014 21:49:27 +0000 (17:49 -0400)]
Get the default language from database not from current viewing language
Conflicts:
CRM/Core/BAO/ConfigSetting.php
samuelsov [Thu, 25 Sep 2014 21:29:45 +0000 (17:29 -0400)]
Remove the multiplication of lcMessages in url when switching language
Yashodha Chaku [Fri, 5 Dec 2014 07:17:42 +0000 (12:47 +0530)]
Merge pull request #4637 from eileenmcnaughton/CRM-15670
CRM-15670 Allow overriding of privacy settings & updating of receive_dat...
Eileen McNaughton [Fri, 5 Dec 2014 02:39:39 +0000 (15:39 +1300)]
Merge pull request #4667 from eileenmcnaughton/whitespace
whitepace y, std is => array( on same line,
Dave Greenberg [Fri, 5 Dec 2014 00:54:47 +0000 (16:54 -0800)]
CRM-15407 - add fee amount to Dummy transaction.
----------------------------------------
* CRM-15407:
https://issues.civicrm.org/jira/browse/CRM-15407
Dave Greenberg [Fri, 5 Dec 2014 00:53:07 +0000 (16:53 -0800)]
Merge pull request #4670 from civicrm/revert-4669-CRM-15407
Revert "CRM-15407 - add fee amount to Dummy transaction."
Dave Greenberg [Fri, 5 Dec 2014 00:52:34 +0000 (16:52 -0800)]
Revert "CRM-15407 - add fee amount to Dummy transaction."
Dave Greenberg [Fri, 5 Dec 2014 00:51:02 +0000 (16:51 -0800)]
Merge pull request #4669 from davecivicrm/CRM-15407
CRM-15407 - add fee amount to Dummy transaction.
Dave Greenberg [Fri, 5 Dec 2014 00:49:38 +0000 (16:49 -0800)]
CRM-15407 - add fee amount to Dummy transaction.
----------------------------------------
* CRM-15407:
https://issues.civicrm.org/jira/browse/CRM-15407
Tim Otten [Thu, 4 Dec 2014 23:06:49 +0000 (15:06 -0800)]
Merge pull request #4553 from giant-rabbit/findById
Add a new findById DAO method.
Eileen McNaughton [Thu, 4 Dec 2014 21:54:07 +0000 (10:54 +1300)]
whitepace y, std is => array( on same line,
Reports have always been all over the place on this leading to PRs often going stale
Dave Greenberg [Thu, 4 Dec 2014 22:35:08 +0000 (14:35 -0800)]
Merge pull request #4666 from davecivicrm/CRM-15180
CRM-15180 - is_selectable must default to checked for new tags.
Anthony Nemirovsky [Thu, 4 Dec 2014 21:36:25 +0000 (13:36 -0800)]
Fix foreign key error reported by the findById DAO test.
The root cause of the error was a problem with the CiviUnitTestCase
setUpBeforeClass and tearDown methods. The setUpBeforeClass method imports an
sql file that creates two domains and two contacts to associate with those
domains. The tearDown was set to truncate the civicrm_contact table and this
would happen after every test function run. So, if a test function that was
not the first test function in the class created a contact that it then
wanted to delete, the foreign key error would be thrown. Rather than doing
a workaround, I decided to fix the underlying issue and add back the two
domain contacts after the db tables are truncated.
This broke some tests that were depending on using contact ID 1 for the
contact record that was created, so I went ahead and fixed those, too.
Dave Greenberg [Thu, 4 Dec 2014 21:07:23 +0000 (13:07 -0800)]
CRM-15180 - is_selectable must default to checked for new tags.
----------------------------------------
* CRM-15180:
https://issues.civicrm.org/jira/browse/CRM-15180
Coleman Watts [Thu, 4 Dec 2014 20:09:05 +0000 (15:09 -0500)]
Hide 'multi-activity' option when not relevant
Monish Deb [Thu, 4 Dec 2014 06:15:28 +0000 (11:45 +0530)]
Merge pull request #4654 from atif-shaikh/CRM-14840-fix
Crm 14840 fix
atif-shaikh [Thu, 4 Dec 2014 05:38:09 +0000 (11:08 +0530)]
QA Fix
Anthony Nemirovsky [Thu, 4 Dec 2014 01:08:16 +0000 (17:08 -0800)]
Merge branch 'master' into findById
colemanw [Wed, 3 Dec 2014 19:52:36 +0000 (14:52 -0500)]
Merge pull request #4643 from colemanw/CRM-13611
CRM-13611 - Add tabbed interface to report UI
colemanw [Wed, 3 Dec 2014 17:48:19 +0000 (12:48 -0500)]
Merge pull request #4511 from giant-rabbit/ajax-fatal-log-fix
Log fatal errors for AJAX responses. CRM-15560
colemanw [Wed, 3 Dec 2014 14:06:10 +0000 (09:06 -0500)]
Merge pull request #4629 from systopia/CRM-15665
CRM-15665
systopia [Wed, 3 Dec 2014 14:03:22 +0000 (15:03 +0100)]
included @colemanw 's doc update
atif-shaikh [Wed, 3 Dec 2014 14:01:40 +0000 (19:31 +0530)]
CRM-14840 - minor fix for handling CiviCase Component
----------------------------------------
* CRM-14840: File schedule reminder on case
https://issues.civicrm.org/jira/browse/CRM-14840
colemanw [Wed, 3 Dec 2014 13:57:13 +0000 (08:57 -0500)]
Merge pull request #4087 from robinmitra/master
Fix a bug in CRM_Mailing_BAO_Mailing::add() with wrong class instantiation
atif-shaikh [Wed, 3 Dec 2014 13:29:31 +0000 (18:59 +0530)]
Regression Fix
Jaap Jansma [Wed, 11 Jun 2014 10:08:17 +0000 (12:08 +0200)]
Fix for CRM-14840: Record reminder sent activity on case when the source activity is case activity
Conflicts:
CRM/Core/BAO/ActionSchedule.php
----------------------------------------
* CRM-14840: File schedule reminder on case
https://issues.civicrm.org/jira/browse/CRM-14840
colemanw [Wed, 3 Dec 2014 13:16:21 +0000 (08:16 -0500)]
Merge pull request #4375 from totten/master-mysqli-compat
CRM-15431 - CRM_Core_I18n - Use CRM_Core_DAO::escapeString for typical, runtime escaping
Yashodha Chaku [Wed, 3 Dec 2014 09:21:43 +0000 (14:51 +0530)]
Merge pull request #4650 from yashodha/CRM-15627
CRM-15627: fix fee level on change price selection
Monish Deb [Wed, 3 Dec 2014 08:09:47 +0000 (13:39 +0530)]
Merge pull request #4651 from jitendrapurohit/CRM-15559
CRM-15559 fix - Cannot register lifetime membership for someone else [cid=0] if already ...
systopia [Wed, 3 Dec 2014 07:07:50 +0000 (08:07 +0100)]
made the fix more generic and robust
jitendrapurohit [Wed, 3 Dec 2014 05:17:44 +0000 (10:47 +0530)]
Cannot register lifetime membership for someone else [cid=0] if already have lifetime membership
CiviCRM [Wed, 3 Dec 2014 03:59:48 +0000 (09:29 +0530)]
CRM-15627: fix fee level on change price selection
colemanw [Wed, 3 Dec 2014 02:27:38 +0000 (21:27 -0500)]
Merge pull request #4360 from christianwach/wordpress-hooks
CRM-15454 - Enable multiple WordPress plugins to receive callbacks from CiviCRM hooks
colemanw [Wed, 3 Dec 2014 02:19:27 +0000 (21:19 -0500)]
Merge pull request #4634 from giant-rabbit/JobLogCommandListingBug
Correctly display the API Entity and Action in the Job Log.
Dave Greenberg [Tue, 2 Dec 2014 21:52:46 +0000 (16:52 -0500)]
Merge pull request #4636 from colemanw/CRM-15653
CRM-15653 - Fix contact search when input contains spaces
colemanw [Tue, 2 Dec 2014 21:22:31 +0000 (16:22 -0500)]
Merge pull request #4644 from monishdeb/CRM-15291-fix
CRM-15291 fix - Remove CRM_Event_Form_ManageEvent_ScheduleReminders
monishdeb [Tue, 2 Dec 2014 17:35:30 +0000 (23:05 +0530)]
tpl placeholder fix
monishdeb [Tue, 2 Dec 2014 16:30:22 +0000 (22:00 +0530)]
minor changes
Coleman Watts [Tue, 2 Dec 2014 16:18:45 +0000 (11:18 -0500)]
CRM-13611 - Add tabbed interface to report UI
colemanw [Tue, 2 Dec 2014 16:16:31 +0000 (11:16 -0500)]
Merge pull request #4642 from colemanw/CRM-15674
CRM-15674 - API rest code cleanup
Coleman Watts [Tue, 2 Dec 2014 15:12:01 +0000 (10:12 -0500)]
CRM-15674 - API rest code cleanup
monishdeb [Tue, 2 Dec 2014 14:53:38 +0000 (20:23 +0530)]
CRM-15291 fix - Remove CRM_Event_Form_ManageEvent_ScheduleReminders
https://issues.civicrm.org/jira/browse/CRM-15291
Kurund Jalmi [Tue, 2 Dec 2014 06:22:38 +0000 (11:52 +0530)]
Merge pull request #4638 from jitendrapurohit/CRM-13456
Advanced Search does not filter relationships with deleted contacts
Monish Deb [Tue, 2 Dec 2014 06:13:06 +0000 (11:43 +0530)]
Merge pull request #4630 from atif-shaikh/CRM-15546
CRM-15546 - Fixed constants issue/bug in BaseIPN.php and PaymentProcesso...
jitendrapurohit [Tue, 2 Dec 2014 05:14:03 +0000 (10:44 +0530)]
Advanced Search does not filter relationships with deleted contacts Fix
Eileen McNaughton [Tue, 2 Dec 2014 01:14:12 +0000 (14:14 +1300)]
CRM-15670 Allow overriding of privacy settings & updating of receive_date when sending receipts from search
Coleman Watts [Tue, 2 Dec 2014 00:47:46 +0000 (19:47 -0500)]
CRM-15653 - Fix contact search when input contains spaces
colemanw [Mon, 1 Dec 2014 23:37:26 +0000 (18:37 -0500)]
Merge pull request #4635 from colemanw/comments
Cleanup phpdoc comments
Coleman Watts [Mon, 1 Dec 2014 22:00:35 +0000 (17:00 -0500)]
Cleanup phpdoc comments
Dave Greenberg [Mon, 1 Dec 2014 22:27:01 +0000 (17:27 -0500)]
Merge pull request #4621 from atif-shaikh/CRM-15589
CRM-15589 - Membership section label mixup
Dave Greenberg [Mon, 1 Dec 2014 20:45:45 +0000 (15:45 -0500)]
Merge pull request #4628 from priyankakaran26/recurring-entity-improvements-phase-2
CRM-15490 - Reccuring Activities: Notice and Message Fixes
Anthony Nemirovsky [Mon, 1 Dec 2014 20:38:10 +0000 (12:38 -0800)]
Correctly display the API Entity and Action in the Job Log.
The scheduled jobs log was setting the command for every job entry to 0
because of a string concatenation bug. This commit corrects that bug so API
Entity and Action is now correctly shown.
Dave Greenberg [Mon, 1 Dec 2014 16:06:13 +0000 (11:06 -0500)]
Merge pull request #4616 from Edzelopez/CRM-15642
CRM-15642 Modified use location widget to include supplemental addresses...
atif-shaikh [Mon, 1 Dec 2014 14:36:25 +0000 (20:06 +0530)]
CRM-15546 - Fixed constants issue/bug in BaseIPN.php and PaymentProcessor.tpl
https://issues.civicrm.org/jira/browse/CRM-15546
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
kurund [Mon, 1 Dec 2014 09:10:30 +0000 (14:40 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-01-14-40-22
Yashodha Chaku [Mon, 1 Dec 2014 05:43:06 +0000 (11:13 +0530)]
Merge pull request #4619 from jitendrapurohit/CRM-15645
CRM-15645 Petition email confirmation URL incompatible with WordPress
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
atif-shaikh [Thu, 27 Nov 2014 13:49:11 +0000 (19:19 +0530)]
CRM-15589 - Membership section label mixup
https://issues.civicrm.org/jira/browse/CRM-15589
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
jitendrapurohit [Thu, 27 Nov 2014 09:22:35 +0000 (14:52 +0530)]
support for old variable
Rohan Katkar [Thu, 27 Nov 2014 07:19:51 +0000 (12:49 +0530)]
CRM-15654 Contact Edit Form spacing can be improved
jitendrapurohit [Thu, 27 Nov 2014 06:42:11 +0000 (12:12 +0530)]
CRM-15645 Petition email confirmation URL incompatible with WordPress
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
projects / civicrm-core.git / log