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
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
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
Tim Otten [Wed, 12 Mar 2014 22:34:27 +0000 (15:34 -0700)]
Merge pull request #2552 from totten/4.4-report-test-output
HR-216 - CiviReportTestCase - Add more output for diagnosing errors
Tim Otten [Wed, 12 Mar 2014 22:33:49 +0000 (15:33 -0700)]
Merge pull request #2633 from totten/4.4-wr-long
CRM-14224 - Upgrade WordReplacements:
colemanw [Tue, 11 Mar 2014 19:22:51 +0000 (15:22 -0400)]
Merge pull request #2644 from colemanw/inline
CRM-14336 - Clear up potential memory leaks from ajaxForm
Coleman Watts [Tue, 11 Mar 2014 18:35:49 +0000 (14:35 -0400)]
CRM-14336 - Clear up potential memory leaks from ajaxForm
colemanw [Mon, 10 Mar 2014 19:37:49 +0000 (15:37 -0400)]
Merge pull request #2640 from colemanw/4.4
CRM-13966 - Fix export prefix, suffix, gender
Coleman Watts [Mon, 10 Mar 2014 19:36:48 +0000 (15:36 -0400)]
CRM-13966 - Fix export prefix, suffix, gender
colemanw [Mon, 10 Mar 2014 19:20:55 +0000 (15:20 -0400)]
Merge pull request #2639 from colemanw/4.4
CRM-14065 - Only compare date not time for activity status warning
Coleman Watts [Mon, 10 Mar 2014 19:19:25 +0000 (15:19 -0400)]
CRM-14065 - Only compare date not time for activity status warning
colemanw [Mon, 10 Mar 2014 17:22:31 +0000 (13:22 -0400)]
Merge pull request #2638 from colemanw/CRM-14196
Apply eileen's patch for CRM-14196
Eileen McNaughton [Tue, 18 Feb 2014 23:32:40 +0000 (12:32 +1300)]
CRM-14196 - states missing from export fuzion fix - not sure what final fix will be
Eileen [Mon, 24 Feb 2014 00:57:22 +0000 (13:57 +1300)]
CRM-14196 - states missing from export fuzion fix - part 2 = resulting e-notice
colemanw [Mon, 10 Mar 2014 13:47:06 +0000 (09:47 -0400)]
Merge pull request #2637 from colemanw/4.4
ContactInfo.tpl - Fix broken markup
Coleman Watts [Mon, 10 Mar 2014 13:45:50 +0000 (09:45 -0400)]
ContactInfo.tpl - Fix broken markup
Pratik Joshi [Mon, 10 Mar 2014 13:28:40 +0000 (18:58 +0530)]
CRM-14297 : added tables for member_is_test field
Pratik Joshi [Mon, 10 Mar 2014 08:33:39 +0000 (14:03 +0530)]
CRM-14317 fix for : while looking into this issue, found a DB: NAN field not found
Tim Otten [Mon, 10 Mar 2014 03:34:20 +0000 (20:34 -0700)]
CRM-14224 - Upgrade WordReplacements:
* Display a pre-upgrade message if any WordReplacements are too long
* Log old/long WordReplacements
* Don't migrate WordRepalcements which are too long
Tim Otten [Mon, 10 Mar 2014 00:48:38 +0000 (17:48 -0700)]
Merge pull request #2631 from totten/4.4-14210
CRM-14210 - Use get_headers(). Add API.
Tim Otten [Mon, 10 Mar 2014 00:40:58 +0000 (17:40 -0700)]
CRM-14210 - Add API for running security checks
Tim Otten [Mon, 10 Mar 2014 00:40:31 +0000 (17:40 -0700)]
CRM_Utils_Check_Security - Represent messages as objects
Tim Otten [Mon, 10 Mar 2014 00:22:23 +0000 (17:22 -0700)]
CRM-14210 - Add hidden option to disable security alerts
Chris Burgess [Sun, 16 Feb 2014 22:14:31 +0000 (11:14 +1300)]
CRM-14210. Use get_headers() and check for 200 response instead of file_get_contents(), as some servers do not return FALSE on 40x response code.
dlobo [Sat, 8 Mar 2014 11:27:11 +0000 (16:57 +0530)]
Merge pull request #2626 from jmcclelland/participants-to-event
CRM-14325 - adding participants to event from manage groups
Tim Otten [Sat, 8 Mar 2014 07:55:28 +0000 (23:55 -0800)]
Merge pull request #2342 from totten/4.4-cache-codegen
GenCode - Add an optional caching mode.
Jamie McClelland [Fri, 7 Mar 2014 19:16:11 +0000 (14:16 -0500)]
CRM-14325 - adding participants to event from manage groups
If default search profile is set, you cannot reliably add participants
to an event when doing so from the manage group interface.
----------------------------------------
* CRM-14325: when default search profile is set, can't reliably add contacts to event from manage group page
http://issues.civicrm.org/jira/browse/CRM-14325
Kurund Jalmi [Wed, 5 Mar 2014 02:49:40 +0000 (08:19 +0530)]
Merge pull request #2547 from davecivicrm/CRM-14249
CRM-14249 - fix fatal error when anonymous user accesses civicrm/mailing...
dlobo [Fri, 28 Feb 2014 23:24:34 +0000 (15:24 -0800)]
Merge pull request #2571 from mlutfy/4.4-crm13859
CRM-13859 Backport PR #2195: set database connection to UTF-8 during install (by clandmeter).
dlobo [Fri, 28 Feb 2014 20:20:39 +0000 (12:20 -0800)]
Merge pull request #2580 from dlobo/CRM-14294
CRM-14294 - Fix typo in function call to retrieve in Controller.php
Donald A. Lobo [Fri, 28 Feb 2014 20:19:12 +0000 (12:19 -0800)]
CRM-14294 - Fix typo in function call to retrieve in Controller.php
http://issues.civicrm.org/jira/browse/CRM-14294
Mathieu Lutfy [Thu, 27 Feb 2014 13:26:06 +0000 (08:26 -0500)]
CRM-13859 Backport PR #2195: set database connection to UTF-8 during install (by clandmeter).
Tim Otten [Tue, 25 Feb 2014 01:28:18 +0000 (17:28 -0800)]
Merge pull request #2554 from totten/4.4-settings-hook-dedupe
HR-287 - CRM_Core_BAO_Setting - Guard against duplicate settings folders
Tim Otten [Tue, 25 Feb 2014 01:16:53 +0000 (17:16 -0800)]
HR-287 - CRM_Core_BAO_Setting - Guard against duplicate settings folders
Not sure this is needed, but there's been some example code floating around
in which extensions use buggy self-defenses to avoid duplicates.
Tim Otten [Mon, 24 Feb 2014 23:23:31 +0000 (15:23 -0800)]
Merge pull request #2538 from totten/4.4-crm-button
HR-216 - civicrm.css - Use same styling for "crm-button" in ".crm-container" and "#crm-container"
Tim Otten [Mon, 24 Feb 2014 23:20:43 +0000 (15:20 -0800)]
Merge pull request #2544 from totten/4.4-query-builder
CRM_Utils_SQL_Select - Backport
Tim Otten [Mon, 24 Feb 2014 22:56:08 +0000 (14:56 -0800)]
CRM_Utils_SQL_Select cleanup:
* Add more docs
* Add test for ORDER BY
* Add support for LIMIT
Tim Otten [Mon, 24 Feb 2014 22:33:03 +0000 (14:33 -0800)]
HR-216 - CiviReportTestCase - Add more output for diagnosing errors
Dave Greenberg [Sun, 23 Feb 2014 02:35:45 +0000 (18:35 -0800)]
CRM-14249 - fix fatal error when anonymous user accesses civicrm/mailing/view.
----------------------------------------
* CRM-14249: Can't view public mailings when logged out
http://issues.civicrm.org/jira/browse/CRM-14249
Tim Otten [Fri, 21 Feb 2014 22:10:18 +0000 (14:10 -0800)]
CRM_Utils_SQL_Select - Backport
Tim Otten [Fri, 21 Feb 2014 00:21:03 +0000 (16:21 -0800)]
Merge pull request #2537 from totten/4.4-rest-cookie
CRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE
Tim Otten [Thu, 20 Feb 2014 23:40:23 +0000 (15:40 -0800)]
Merge pull request #2541 from totten/4.4-gencode-uid
GenCode - Ensure separate temp dirs on multi-user system
Tim Otten [Thu, 20 Feb 2014 23:39:01 +0000 (15:39 -0800)]
GenCode - Ensure separate temp dirs on multi-user system
Tim Otten [Thu, 20 Feb 2014 02:13:43 +0000 (18:13 -0800)]
HR-216 - civicrm.css - Use same styling for "crm-button" in ".crm-container" and "#crm-container"
Tim Otten [Thu, 20 Feb 2014 01:58:13 +0000 (17:58 -0800)]
HR-216 - Setting.API - Ignore "options"
Tim Otten [Thu, 20 Feb 2014 00:48:16 +0000 (16:48 -0800)]
CRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE
Tim Otten [Thu, 20 Feb 2014 00:07:54 +0000 (16:07 -0800)]
Merge pull request #2536 from totten/4.4-backbone-return
HR-216 - crm.backbone.js - Allow limiting the return to specific fields
Tim Otten [Wed, 19 Feb 2014 23:39:57 +0000 (15:39 -0800)]
HR-216 - crm.backbone.js - Allow limiting the return to specific fields
dlobo [Wed, 19 Feb 2014 14:33:14 +0000 (06:33 -0800)]
Merge pull request #2534 from mlutfy/4.4-crm14243-tsfix
CRM-14243: 'ts' fix for file upload description.
Mathieu Lutfy [Tue, 18 Feb 2014 21:03:36 +0000 (16:03 -0500)]
CRM-14243: 'ts' fix for file upload description.
Kurund Jalmi [Tue, 18 Feb 2014 12:24:00 +0000 (17:54 +0530)]
Merge pull request #2533 from yashodha/4.4
HR-231 : support for Report menu items based on grouping
yashodha [Tue, 18 Feb 2014 12:11:52 +0000 (17:41 +0530)]
HR-231 : support for Report menu items based on grouping
dlobo [Fri, 14 Feb 2014 00:31:01 +0000 (16:31 -0800)]
Merge pull request #2522 from mlutfy/4.4-crm14217
CRM-14217: Fixes for CSS of PCPAccount pages (also affects profiles) where the password/confirm fields are shown.
Mathieu Lutfy [Thu, 13 Feb 2014 22:22:54 +0000 (17:22 -0500)]
CRM-14217: Fixes for CSS of PCPAccount pages (also affects profiles) where the password/confirm fields are shown.
colemanw [Thu, 13 Feb 2014 02:33:52 +0000 (18:33 -0800)]
Merge pull request #2517 from eileenmcnaughton/examples
Examples
Eileen [Thu, 13 Feb 2014 00:55:49 +0000 (00:55 +0000)]
updated examples
projects / civicrm-core.git / log