dlobo [Thu, 10 Apr 2014 17:33:11 +0000 (10:33 -0700)]
Merge pull request #2858 from totten/4.4-wp-breadcrumb-cacheclear
CRM-14439 - Fix WP breadcrumbs by forcibly pre-computing them with "wp-admin/admin.php"
dlobo [Thu, 10 Apr 2014 17:32:35 +0000 (10:32 -0700)]
Merge pull request #2859 from totten/4.4-wp-breadcrumb-forceBackend
CRM-14439 - Fix WP breadcrumbs by setting forceBackend=1 and consistently respecting that option
dlobo [Thu, 10 Apr 2014 17:26:39 +0000 (10:26 -0700)]
Merge pull request #2833 from lcdservices/CRM-14208b
CRM-14208 additional includes for J3.2.1+
Dave Greenberg [Wed, 9 Apr 2014 20:36:57 +0000 (13:36 -0700)]
Merge pull request #2867 from davecivicrm/CRM-14450
CRM-14450 - fix notice on additional participants form.
Dave Greenberg [Wed, 9 Apr 2014 20:34:57 +0000 (13:34 -0700)]
CRM-14450 - fix notice on additional participants form.
----------------------------------------
* CRM-14450:
https://issues.civicrm.org/jira/browse/CRM-14450
Kurund Jalmi [Wed, 9 Apr 2014 19:07:51 +0000 (12:07 -0700)]
Merge pull request #2866 from davecivicrm/CRM-14442
CRM-14442 - prevent presence of Direct Debit (payment_type=2) payment pr...
Dave Greenberg [Wed, 9 Apr 2014 19:05:27 +0000 (12:05 -0700)]
CRM-14442 - prevent presence of Direct Debit (payment_type=2) payment processors from breaking the back-office Submit Credit Card Contribution form.
----------------------------------------
* CRM-14442:
https://issues.civicrm.org/jira/browse/CRM-14442
Kurund Jalmi [Wed, 9 Apr 2014 04:04:14 +0000 (21:04 -0700)]
Merge pull request #2843 from kurund/CRM-14427
CRM-14427
Tim Otten [Wed, 9 Apr 2014 03:03:40 +0000 (20:03 -0700)]
CRM_Utils_System_WordPress::url - Simplify deep if/else/string-concatenation. Fix forceBackend.
Tim Otten [Wed, 9 Apr 2014 00:41:18 +0000 (17:41 -0700)]
CRM_Utils_System_WordPress::url - Change code-branch for case "!isset($path)&&!isset($query)"
Tim Otten [Tue, 8 Apr 2014 23:46:10 +0000 (16:46 -0700)]
CRM_Utils_System_WordPress::url - Change code-branch for caes "isset($path)&&isset($query)"
In the other usages of $script and $base, there's a decision to use $script XOR $base as the effective
base-URL. However, in this branch, the values are concatenated to form the effective base-URL -- which
shouldn't produce a valid base-URL. (Note: In this context, we're evaluating conditons of isset($path) and
isset($query) which should have no bearing on the validity of $script or $base as a base-URL.)
Brian Shaughnessy [Wed, 9 Apr 2014 01:34:08 +0000 (21:34 -0400)]
CRM-14208 move joomlaBase outside of condition clause
Dave Greenberg [Wed, 9 Apr 2014 01:05:59 +0000 (18:05 -0700)]
Merge pull request #2835 from lcdservices/CRM-14334
CRM-14334 merge records: allow empty value to overwrite existing value
Tim Otten [Tue, 8 Apr 2014 23:23:00 +0000 (16:23 -0700)]
CRM-14439 - CRM_Core_Invoke::rebuildMenuAndCaches - Change order
Currently, CRM_Core_Menu::store() truncates "civicrm_menu" and then refills
it; then, CRM_Core_Config::clearCaches (by-way-of clearDBCache) truncates
"civicrm_menu" without refilling. This seems pointless. (For CRM-14439,
this has the effect of producing an empty menu table after running setup.sh
-- so the table is eventually filled at some uncontrolled future point.)
The evident intent of "rebuildMenuAndCaches" is to truncate and then refill
the table, so this patch does that.
----------------------------------------
* CRM-14439: WP demo - Access denied when visiting breadcrumb links from field listing
https://issues.civicrm.org/jira/browse/CRM-14439
Tim Otten [Tue, 8 Apr 2014 23:21:32 +0000 (16:21 -0700)]
CRM-14439 - CRM_Core_Menu - For breadcrumbs, set forceBackend=1
----------------------------------------
* CRM-14439: WP demo - Access denied when visiting breadcrumb links from field listing
https://issues.civicrm.org/jira/browse/CRM-14439
Dave Greenberg [Tue, 8 Apr 2014 20:20:16 +0000 (13:20 -0700)]
Merge pull request #2855 from mlutfy/4.4-crm14444
CRM-14444: templates/CRM/Report/Form/Layout/Table.tpl: right-align report cells that are T_FLOAT.
Mathieu Lutfy [Tue, 8 Apr 2014 19:57:54 +0000 (15:57 -0400)]
CRM-14444: templates/CRM/Report/Form/Layout/Table.tpl: right-align report cells that are T_FLOAT.
dlobo [Tue, 8 Apr 2014 19:15:45 +0000 (12:15 -0700)]
Merge pull request #2854 from dlobo/CRM-14390
CRM-14390 - Inherit CMS language don't work in WordPress
Donald A. Lobo [Tue, 8 Apr 2014 19:14:16 +0000 (12:14 -0700)]
CRM-14390 - Inherit CMS language don't work in WordPress
https://issues.civicrm.org/jira/browse/CRM-14390
Kurund Jalmi [Tue, 8 Apr 2014 17:20:29 +0000 (10:20 -0700)]
Merge pull request #2851 from kurund/CRM-14393
fixes for CRM-14393
kurund [Tue, 8 Apr 2014 17:19:35 +0000 (10:19 -0700)]
fixes for CRM-14393
----------------------------------------
* CRM-14393: State not showing in advanced search
https://issues.civicrm.org/jira/browse/CRM-14393
Dave Greenberg [Tue, 8 Apr 2014 16:50:28 +0000 (09:50 -0700)]
Merge pull request #2848 from eileenmcnaughton/CRM-14389
CRM-14389 membership api - add test for fix + alter to 'correct fix'
Eileen [Tue, 8 Apr 2014 12:17:34 +0000 (12:17 +0000)]
CRM-14389 membership api - add test for fix
----------------------------------------
* CRM-14389: Get memberships api ignores membership_type_id if contact_id is present
https://issues.civicrm.org/jira/browse/CRM-14389
Tim Otten [Tue, 8 Apr 2014 05:11:11 +0000 (22:11 -0700)]
Merge pull request #2844 from totten/4.4-handlePaymentNotification
CRM-14396 - add module extension support to handlePaymentNotification
Eileen McNaughton [Thu, 27 Mar 2014 00:38:14 +0000 (13:38 +1300)]
CRM-14396 - add module extension support to handlePaymentNotification
kurund [Tue, 8 Apr 2014 00:43:27 +0000 (17:43 -0700)]
notice fixes
kurund [Tue, 8 Apr 2014 00:14:16 +0000 (17:14 -0700)]
fix for CRM-14427
----------------------------------------
* CRM-14427: PCP account creation fails if contact already exists
https://issues.civicrm.org/jira/browse/CRM-14427
kurund [Mon, 7 Apr 2014 23:19:50 +0000 (16:19 -0700)]
notice fixes
Kurund Jalmi [Mon, 7 Apr 2014 22:30:10 +0000 (15:30 -0700)]
Merge pull request #2840 from kurund/git-hook-fixes
commit hook fixes
kurund [Mon, 7 Apr 2014 22:26:11 +0000 (15:26 -0700)]
commit hook fixes
colemanw [Mon, 7 Apr 2014 22:13:29 +0000 (18:13 -0400)]
Merge pull request #2838 from eileenmcnaughton/CRM-14419
Crm 14220 & CRM-14419 api enotice fix & extra param + e-notice
dlobo [Mon, 7 Apr 2014 21:16:33 +0000 (14:16 -0700)]
Merge pull request #2743 from eileenmcnaughton/CRM-14319-mini-fix
CRM-14319 - alter job api to not limit scheduled reminders
Eileen McNaughton [Mon, 7 Apr 2014 05:49:42 +0000 (17:49 +1200)]
E-notice fix, next_sched_contribution
Field was renamed to reflect in built handling around suffix '_date' but this instance missed
Eileen McNaughton [Thu, 3 Apr 2014 10:39:21 +0000 (23:39 +1300)]
CRM-14420 - api contribution.completetransaction should accept 'trxn_id' as a param
Eileen McNaughton [Thu, 3 Apr 2014 08:13:06 +0000 (21:13 +1300)]
CRM-14419 - e-notice on activity.getcount when contact_id is not passed in
dlobo [Mon, 7 Apr 2014 21:02:01 +0000 (14:02 -0700)]
Merge pull request #2805 from rnao/CRM-14389
CRM-14389 - CiviMember API - Fixes a membership get API regression that ...
Brian Shaughnessy [Mon, 7 Apr 2014 19:11:49 +0000 (15:11 -0400)]
CRM-14334 merge records: allow empty value to overwrite existing value
Brian Shaughnessy [Mon, 7 Apr 2014 14:31:53 +0000 (10:31 -0400)]
CRM-14208 additional includes for J3.2.1+
Tim Otten [Fri, 4 Apr 2014 07:48:17 +0000 (00:48 -0700)]
Merge pull request #2820 from totten/4.4-tz-opt
CRM-14423 - CiviUnitTestCase - Only run env checks, not security checks, during unit-tests.
Tim Otten [Fri, 4 Apr 2014 07:39:03 +0000 (00:39 -0700)]
CRM-14423 - CiviUnitTestCase - Only run env checks, not security checks, during unit-tests.
The security checks are more I/O intensive.
Tim Otten [Fri, 4 Apr 2014 07:08:17 +0000 (00:08 -0700)]
Merge pull request #2819 from totten/4.4-tz-alert
CRM-14423 - Alert admins/developers if env is misconfigured
Tim Otten [Fri, 4 Apr 2014 05:16:10 +0000 (22:16 -0700)]
CRM-14423 - Run env checks before executing tests
Tim Otten [Fri, 4 Apr 2014 04:37:58 +0000 (21:37 -0700)]
CRM-14423 - CRM_Utils_Check_Env - Add check for other environmental configuration issues
Tim Otten [Fri, 4 Apr 2014 04:36:48 +0000 (21:36 -0700)]
CRM-14423 - Extract class CRM_Utils_Check from CRM_Utils_Check_Security
colemanw [Thu, 3 Apr 2014 19:34:35 +0000 (15:34 -0400)]
Merge pull request #2812 from eileenmcnaughton/CRM-14220
Crm 14220 & CRM-14419 api enotice fix & extra param
Dave Greenberg [Thu, 3 Apr 2014 17:26:25 +0000 (10:26 -0700)]
Merge pull request #2810 from pratik-joshi/crm-14379-fix
CRM-14379
Eileen McNaughton [Thu, 3 Apr 2014 08:13:06 +0000 (21:13 +1300)]
CRM-14419 - e-notice on activity.getcount when contact_id is not passed in
Eileen McNaughton [Thu, 3 Apr 2014 10:39:21 +0000 (23:39 +1300)]
CRM-14420 - api contribution.completetransaction should accept 'trxn_id' as a param
Pratik Joshi [Thu, 3 Apr 2014 05:42:39 +0000 (11:12 +0530)]
CRM-14379
Stan Dragnev [Wed, 2 Apr 2014 14:44:53 +0000 (10:44 -0400)]
CRM-14389 - CiviMember API - Fixes a membership get API regression that caused membership type to be ignored
----------------------------------------
* CRM-14389:
http://issues.civicrm.org/jira/browse/CRM-14389
colemanw [Tue, 1 Apr 2014 17:07:48 +0000 (13:07 -0400)]
Merge pull request #2686 from eileenmcnaughton/CRM-14148
CRM-14148 fix half hour timezones for d7
colemanw [Tue, 1 Apr 2014 16:38:25 +0000 (12:38 -0400)]
Merge pull request #2747 from colemanw/4.4
Backport CRM.api3 to 4.4
Dave Greenberg [Mon, 31 Mar 2014 15:45:00 +0000 (08:45 -0700)]
Merge pull request #2778 from eileenmcnaughton/message_fix
fix error message to make more sense
pratik-joshi [Mon, 31 Mar 2014 12:35:17 +0000 (18:05 +0530)]
Merge pull request #2779 from jaapjansma/CRM-14397
fix for CRM-14397
Jaap Jansma [Mon, 31 Mar 2014 08:46:09 +0000 (10:46 +0200)]
fix for CRM-14397
Signed-off-by: Jaap Jansma <info@edeveloper.nl>
Eileen McNaughton [Mon, 31 Mar 2014 04:17:39 +0000 (17:17 +1300)]
fix error message to make more sense
Dave Greenberg [Fri, 28 Mar 2014 21:33:46 +0000 (14:33 -0700)]
Merge pull request #2760 from pradpnayak/CRM-14191
--CRM-14191, fixed the upgrade code and also added upgrade code to updat...
Tim Otten [Fri, 28 Mar 2014 05:43:23 +0000 (22:43 -0700)]
Merge pull request #2764 from eileenmcnaughton/static_warnings
Static warnings
Eileen McNaughton [Fri, 28 Mar 2014 03:59:18 +0000 (16:59 +1300)]
fix trailing spaces (whitespace issue)
Eileen McNaughton [Fri, 28 Mar 2014 02:49:02 +0000 (15:49 +1300)]
fix function signature to match interface & not give warning
Pradeep Nayak [Thu, 27 Mar 2014 11:23:11 +0000 (16:53 +0530)]
--CRM-14191, fixed the upgrade code and also added upgrade code to update civicrm_option_value.value for batch_status and batch_mode
Tim Otten [Thu, 27 Mar 2014 00:58:57 +0000 (17:58 -0700)]
Merge pull request #2756 from eileenmcnaughton/patch-1
Alter singleton signature to match interface
Eileen McNaughton [Wed, 26 Mar 2014 21:41:15 +0000 (10:41 +1300)]
Alter singleton signature to match interface
(fix strict warning)
Coleman Watts [Mon, 20 Jan 2014 00:12:43 +0000 (16:12 -0800)]
CRM-14093 - add CRM.api3 to rest.js
Eileen McNaughton [Thu, 13 Mar 2014 04:49:13 +0000 (17:49 +1300)]
CRM-14319 - alter job api to not limit scheduled reminders
----------------------------------------
* CRM-14319: not all scheduled reminders are being sent
http://issues.civicrm.org/jira/browse/CRM-14319
Tim Otten [Wed, 26 Mar 2014 05:39:47 +0000 (22:39 -0700)]
Merge pull request #2740 from eileenmcnaughton/strict_warnings
fix function to be static to avoid strict warnings
Eileen McNaughton [Wed, 26 Mar 2014 05:29:23 +0000 (18:29 +1300)]
fix function to be static to avoid strict warnings
Kurund Jalmi [Tue, 25 Mar 2014 19:37:51 +0000 (01:07 +0530)]
Merge pull request #2738 from jmcclelland/no-date-picker-on-view-only-fields
CRM-14384 - only display date picker if is_view neq 1
Kurund Jalmi [Tue, 25 Mar 2014 19:35:43 +0000 (01:05 +0530)]
Merge pull request #2701 from yashodha/HR-265
use group by to ensure we get single results for contacts
Jamie McClelland [Tue, 25 Mar 2014 19:31:58 +0000 (15:31 -0400)]
CRM-14384 - only display date picker if is_view neq 1
----------------------------------------
* CRM-14384: don't display date picker in survey data entry screen for view only field
http://issues.civicrm.org/jira/browse/CRM-14384
Tim Otten [Wed, 19 Mar 2014 22:03:18 +0000 (15:03 -0700)]
Merge pull request #2702 from eileenmcnaughton/CRM-14355
CRM-14355 fix test-exposed bugs in contribute, participant, pledge get
Kurund Jalmi [Wed, 19 Mar 2014 09:56:14 +0000 (15:26 +0530)]
Merge pull request #2693 from lcdservices/CRM-14338-2
CRM-14338-2 fix prefix/suffix on profile view page
Eileen McNaughton [Wed, 19 Mar 2014 09:12:48 +0000 (22:12 +1300)]
CRM-14355 fix test-exposed bugs in contribute, participant, pledge get
----------------------------------------
* CRM-14355: make api treat limit = 0 as an unlimited request
http://issues.civicrm.org/jira/browse/CRM-14355
yashodha [Wed, 19 Mar 2014 05:49:59 +0000 (11:19 +0530)]
use group by to ensure we get single results for contacts
Tim Otten [Wed, 19 Mar 2014 03:57:50 +0000 (20:57 -0700)]
Merge pull request #2699 from eileenmcnaughton/CRM-14355
CRM-14355 fix api to accept empty limit as unlimited
Tim Otten [Wed, 19 Mar 2014 01:03:15 +0000 (18:03 -0700)]
CRM-14355 - SyntaxConformanceTest::testLimit - Cleanup all 30 test records
Eileen McNaughton [Wed, 19 Mar 2014 00:42:07 +0000 (13:42 +1300)]
add call to delete objects
Eileen McNaughton [Tue, 18 Mar 2014 22:38:16 +0000 (11:38 +1300)]
CRM-14355 alter behaviour to do an unlimited retrieve if ['options']['limit'] (or a legacy variant) is set but has an empty value
----------------------------------------
* CRM-14355: make api treat limit = 0 as an unlimited request
http://issues.civicrm.org/jira/browse/CRM-14355
Eileen McNaughton [Tue, 18 Mar 2014 21:50:12 +0000 (10:50 +1300)]
CRM-14355 test to check existing behaviour of alternate syntaxes
----------------------------------------
* CRM-14355: make api treat limit = 0 as an unlimited request
http://issues.civicrm.org/jira/browse/CRM-14355
colemanw [Tue, 18 Mar 2014 23:04:49 +0000 (19:04 -0400)]
Merge pull request #2697 from eileenmcnaughton/CRM-14355-output
CRM-14355 ensure backtrace is on for test entity create & delete
Eileen McNaughton [Tue, 18 Mar 2014 23:01:45 +0000 (12:01 +1300)]
ensure backtrace is on for test entity create & delete
Tim Otten [Tue, 18 Mar 2014 21:35:36 +0000 (14:35 -0700)]
Merge pull request #2690 from eileenmcnaughton/CRM-14355
CRM-14355 - test auditing existing limit behaviour
dlobo [Tue, 18 Mar 2014 20:54:23 +0000 (13:54 -0700)]
Merge pull request #2695 from jmcclelland/authorize-recur-contributions-assigned-to-deleted-contact
CRM-14360 - ensure recur contributions not assigned to deleted contact.
Jamie McClelland [Tue, 18 Mar 2014 20:29:35 +0000 (16:29 -0400)]
CRM-14360 - ensure recur contributions not assigned to deleted contact.
----------------------------------------
* CRM-14360: recurring contributions still assigned to deleted contacts for authorize.net
http://issues.civicrm.org/jira/browse/CRM-14360
colemanw [Tue, 18 Mar 2014 17:42:50 +0000 (13:42 -0400)]
Merge pull request #2691 from atif-shaikh/CRM-14259
Crm 14259
Brian Shaughnessy [Tue, 18 Mar 2014 16:59:43 +0000 (12:59 -0400)]
CRM-14338-2 fix prefix/suffix on profile view page
Atif Shaikh [Tue, 18 Mar 2014 12:15:40 +0000 (17:45 +0530)]
CRM-14259 Further Improvements
Eileen [Tue, 18 Mar 2014 08:45:19 +0000 (08:45 +0000)]
CRM-14355 - test auditing existing limit behaviour
----------------------------------------
* CRM-14355: make api treat limit = 0 as an unlimited request
http://issues.civicrm.org/jira/browse/CRM-14355
Atif Shaikh [Tue, 18 Mar 2014 07:15:26 +0000 (12:45 +0530)]
CRM-14259 Webtest for Contact Export
Eileen McNaughton [Sat, 15 Feb 2014 23:21:18 +0000 (12:21 +1300)]
CRM-14148 fix half hour timezones for d7
Fix on previous patch on d6 version
Dave Greenberg [Mon, 17 Mar 2014 01:43:22 +0000 (18:43 -0700)]
Merge pull request #2681 from pradpnayak/CRM-14113
-- CRM-14113 fixed search builder error for activity type and activity s...
Pradeep Nayak [Sat, 15 Mar 2014 16:12:48 +0000 (21:42 +0530)]
-- CRM-14113 fixed search builder error for activity type and activity status
----------------------------------------
* CRM-14113: Activity Search Builder
http://issues.civicrm.org/jira/browse/CRM-14113
Kurund Jalmi [Fri, 14 Mar 2014 09:02:52 +0000 (14:32 +0530)]
Merge pull request #2673 from kurund/CRM-8338
backport household merge fixes to 4.4, CRM-8338
dlobo [Mon, 14 Oct 2013 14:15:47 +0000 (07:15 -0700)]
Merge pull request #1773 from davejenx/CRM-8338-merge-by-household
CRM-8338 implement CRM_Contact_Form_Task::mergeContactIdsByHousehold(), ...
Kurund Jalmi [Fri, 14 Mar 2014 07:24:51 +0000 (12:54 +0530)]
Merge pull request #2672 from kurund/CRM-14225
waiting list signup fixes, CRM-14225
kurund [Fri, 14 Mar 2014 07:23:51 +0000 (12:53 +0530)]
waiting list signup fixes, CRM-14225
----------------------------------------
* CRM-14225: Waitlist signup not working for full paid events
http://issues.civicrm.org/jira/browse/CRM-14225
Kurund Jalmi [Thu, 13 Mar 2014 15:43:13 +0000 (21:13 +0530)]
Merge pull request #2667 from kurund/CRM-14180
fixes for CRM-14180, also notice fixes
kurund [Thu, 13 Mar 2014 15:42:24 +0000 (21:12 +0530)]
fixes for CRM-14180, also notice fixes
----------------------------------------
* CRM-14180: Declined Credit card redirects user to wrong page.
http://issues.civicrm.org/jira/browse/CRM-14180
Kurund Jalmi [Thu, 13 Mar 2014 12:46:49 +0000 (18:16 +0530)]
Merge pull request #2634 from pratik-joshi/CRM-14317-NAN-field-not-found-bug
CRM-14317 fix for : while looking into this issue, found a DB: NAN field not found
Kurund Jalmi [Thu, 13 Mar 2014 12:32:35 +0000 (18:02 +0530)]
Merge pull request #2636 from pratik-joshi/CRM-14297
CRM-14297 : added tables definition for member_is_test field
projects / civicrm-core.git / log