Frank J. Gómez [Wed, 16 Jul 2014 14:28:29 +0000 (10:28 -0400)]
CRM-14990: Don't force a value for is_reserved if it isn't passed into CRM_Core_BAO_CustomGroup::create().
Frank J. Gómez [Wed, 16 Jul 2014 14:15:59 +0000 (10:15 -0400)]
Added pre- hook to CRM_Core_BAO_CustomGroup::create().
Monish Deb [Wed, 16 Jul 2014 08:55:00 +0000 (14:25 +0530)]
Merge pull request #3682 from monishdeb/CRM-14969
Minor fix - CRM-14969
monishdeb [Wed, 16 Jul 2014 08:49:45 +0000 (14:19 +0530)]
Minor fix
kurund [Wed, 16 Jul 2014 07:38:50 +0000 (13:08 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-16-12-52-48
Conflicts:
CRM/Contact/Form/Contact.php
CRM/Profile/Form.php
CRM/Upgrade/Incremental/php/FourFour.php
CRM/Utils/String.php
Kurund Jalmi [Wed, 16 Jul 2014 07:18:33 +0000 (12:48 +0530)]
Merge pull request #3538 from totten/4.4-wordrep
CRM-14224 - CRM_Upgrade_Incremental_php_FourFour - Fix isValidWordReplacement()
Kurund Jalmi [Wed, 16 Jul 2014 07:15:09 +0000 (12:45 +0530)]
Merge pull request #3670 from monishdeb/CRM-14888
CRM-14888 fix - historical smart groups with membership status break on ...
Yashodha Chaku [Wed, 16 Jul 2014 04:55:14 +0000 (10:25 +0530)]
Merge pull request #3678 from kenwest/CRM-14994
CRM-14994 Fix activity type values
Eileen McNaughton [Wed, 16 Jul 2014 04:18:51 +0000 (16:18 +1200)]
Merge pull request #3677 from eileenmcnaughton/test-fix
reformat whitespace
Ken West [Wed, 16 Jul 2014 04:03:40 +0000 (14:03 +1000)]
CRM-14994 Fix activity type values
Eileen McNaughton [Wed, 16 Jul 2014 02:49:53 +0000 (14:49 +1200)]
reformat whitespace
Eileen McNaughton [Wed, 16 Jul 2014 02:47:18 +0000 (14:47 +1200)]
Merge pull request #3676 from eileenmcnaughton/test-fix
reformat whitespace
Eileen McNaughton [Wed, 16 Jul 2014 02:45:21 +0000 (14:45 +1200)]
fix whitespace
Eileen McNaughton [Wed, 16 Jul 2014 02:05:20 +0000 (14:05 +1200)]
reformat whitespace
Dave Greenberg [Wed, 16 Jul 2014 00:20:43 +0000 (17:20 -0700)]
Merge pull request #3669 from GinkgoFJG/CRM-14990
Fix for CRM-14990: allow is_reserved field on CustomGroup to be set during create.
Dave Greenberg [Wed, 16 Jul 2014 00:00:21 +0000 (17:00 -0700)]
Merge pull request #3671 from agh1/contrib-date-sort
CRM-14991 CiviContribute: add sort by date to contrib detail report
Eileen McNaughton [Tue, 15 Jul 2014 22:49:26 +0000 (10:49 +1200)]
Merge pull request #3675 from eileenmcnaughton/test-fix
fixes to test cleanup routine
Eileen McNaughton [Tue, 15 Jul 2014 22:48:23 +0000 (10:48 +1200)]
fixes to test cleanup routine
Eileen McNaughton [Tue, 15 Jul 2014 22:41:09 +0000 (10:41 +1200)]
Merge pull request #3674 from eileenmcnaughton/test-fix
Test fix
Eileen McNaughton [Tue, 15 Jul 2014 22:40:22 +0000 (10:40 +1200)]
update completetransaction test to reflect the update to make it only complete incomplete transactions
Eileen McNaughton [Tue, 15 Jul 2014 22:07:33 +0000 (10:07 +1200)]
comment fixes
Tim Otten [Tue, 15 Jul 2014 20:39:45 +0000 (13:39 -0700)]
Merge pull request #3660 from totten/4.4-imgsize
CRM-14971 - Fix resizing of contact images
Andrew Hunt [Tue, 15 Jul 2014 17:59:30 +0000 (13:59 -0400)]
CRM-14991 CiviContribute: add sort by date to contrib detail report
----------------------------------------
* CRM-14991: Sort contribution detail report by contribution date
https://issues.civicrm.org/jira/browse/CRM-14991
monishdeb [Tue, 15 Jul 2014 17:09:15 +0000 (22:39 +0530)]
CRM-14888 fix - historical smart groups with membership status break on upgrade to 4.4
https://issues.civicrm.org/jira/browse/CRM-14888
Frank J. Gómez [Tue, 15 Jul 2014 15:38:14 +0000 (11:38 -0400)]
Fix for CRM-14990: allow is_reserved field on CustomGroup to be set during create.
Kurund Jalmi [Tue, 15 Jul 2014 15:29:56 +0000 (20:59 +0530)]
Merge pull request #3651 from monishdeb/CRM-14969
Crm 14969
Kurund Jalmi [Tue, 15 Jul 2014 13:38:58 +0000 (19:08 +0530)]
Merge pull request #3665 from NileemaJadhav/CRM-master
-- Fix for broken js on form
Eileen McNaughton [Tue, 15 Jul 2014 08:43:48 +0000 (20:43 +1200)]
Merge pull request #3666 from eileenmcnaughton/test-fix
test fix to compensate for not truncating status anymore
Eileen McNaughton [Tue, 15 Jul 2014 08:42:30 +0000 (20:42 +1200)]
test fix to compensate for not truncating status anymore
Nileema [Tue, 15 Jul 2014 07:44:49 +0000 (13:14 +0530)]
-- Fix for broken js on form
Eileen McNaughton [Tue, 15 Jul 2014 04:43:20 +0000 (16:43 +1200)]
Merge pull request #3664 from eileenmcnaughton/CRM-14986
CRM-14986 add function comments as pointer as to why isoToDate fn may be...
Eileen McNaughton [Tue, 15 Jul 2014 04:35:48 +0000 (16:35 +1200)]
CRM-14986 add function comments as pointer as to why isoToDate fn may be over-used
Eileen McNaughton [Tue, 15 Jul 2014 04:27:10 +0000 (16:27 +1200)]
Merge pull request #3663 from eileenmcnaughton/CRM-14986
CRM-14986 fix DB error on date find + save
Eileen McNaughton [Tue, 15 Jul 2014 03:33:03 +0000 (15:33 +1200)]
CRM-14986 fix DB error on date find + save
this is manefesting in the failure to save contributions, however, it has been a recurrent problem
that the format used for date fields on ->find does not match the requirement of ->save
hence we see in the ContributionRecur class 3 lines like
->modified_date = CRM_Utils_Date::isoToMysql(->modified_date);
which exist simply to format the date fields for re-save.
The end_date & next_scheduled_date were missed - resulting in fatals when this function
is used
It seems kind of crazy to keep solving this problem in the form & BAO layer
so this commit is tests only & there is a commit on the packages dir
that alters the DAO->update fn to check for the presence of a '-' & do the isoToMysql there
instead.
Tim Otten [Tue, 15 Jul 2014 00:32:34 +0000 (17:32 -0700)]
Merge pull request #3662 from totten/master-contribution-syntax
Fix hard crash of test-suite due to syntax error
Tim Otten [Tue, 15 Jul 2014 00:27:44 +0000 (17:27 -0700)]
Fix hard crash of test-suite due to syntax error
Note: This is *only* a syntax fix. I don't what's supposed to be going on,
and there are other tests which fails... but at least they don't
crash the test-suite.
Original change was:
9e2ee07bf82624fe50070e14ccc6aa39ffa1b7d9
Dave Greenberg [Tue, 15 Jul 2014 00:19:51 +0000 (17:19 -0700)]
Merge pull request #3661 from davecivicrm/CRM-14789
CRM-14789 - Translate and tweak the error message when attempting to del...
Dave Greenberg [Tue, 15 Jul 2014 00:19:17 +0000 (17:19 -0700)]
CRM-14789 - Translate and tweak the error message when attempting to delete case type which is in use.
----------------------------------------
* CRM-14789:
https://issues.civicrm.org/jira/browse/CRM-14789
Tim Otten [Tue, 15 Jul 2014 00:08:19 +0000 (17:08 -0700)]
CRM-14971 - Fix resizing of contact images
----------------------------------------
* CRM-14971: Contact image URLs broken in WordPress after upgrade to 4.4.6
https://issues.civicrm.org/jira/browse/CRM-14971
Dave Greenberg [Mon, 14 Jul 2014 23:15:16 +0000 (16:15 -0700)]
Merge pull request #3655 from totten/master-casetype-delete-2
CRM-14789 - CaseType.delete - Generate error
Tim Otten [Mon, 14 Jul 2014 23:11:32 +0000 (16:11 -0700)]
Merge pull request #3647 from totten/4.4-wp-images
CRM-14971 - Contact image URLs should go through WP frontend
Dave Greenberg [Mon, 14 Jul 2014 23:05:51 +0000 (16:05 -0700)]
Merge pull request #3658 from atif-shaikh/CRM-14977
CRM-14977 - Can't enable waitlist and approval partcipant statuses
Dave Greenberg [Mon, 14 Jul 2014 19:03:27 +0000 (12:03 -0700)]
Merge pull request #3654 from yashodha/CRM-14968
CRM-14968: fix skipping membership record creation for free membership
Dave Greenberg [Mon, 14 Jul 2014 18:34:57 +0000 (11:34 -0700)]
Merge pull request #3657 from pradpnayak/CRM-14362
-- CRM-14362, added form rule to restrict duplicate Financial Type and a...
Dave Greenberg [Mon, 14 Jul 2014 16:37:33 +0000 (09:37 -0700)]
Merge pull request #3626 from yashodha/CRM-14670
CRM-14670 : load only one target record per activity in temp table
Kurund Jalmi [Mon, 14 Jul 2014 14:55:31 +0000 (20:25 +0530)]
Merge pull request #3656 from rohankatkar/CRM_14953
Patch - CRM-14953
atif-shaikh [Mon, 14 Jul 2014 13:11:02 +0000 (18:41 +0530)]
CRM-14977 - Can't enable waitlist and approval partcipant statuses
https://issues.civicrm.org/jira/browse/CRM-14977
Kurund Jalmi [Mon, 14 Jul 2014 10:00:20 +0000 (15:30 +0530)]
Merge pull request #3633 from eileenmcnaughton/CRM-14967
CRM-14967 fix redirect link
kurund [Mon, 14 Jul 2014 09:29:02 +0000 (14:59 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39
Conflicts:
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/Contact/Utils.php
Pradeep Nayak [Mon, 14 Jul 2014 07:25:32 +0000 (12:55 +0530)]
-- CRM-14362, added form rule to restrict duplicate Financial Type and added code for https://issues.civicrm.org/jira/browse/CRM-14362?focusedCommentId=62629&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-62629
Rohan Katkar [Mon, 14 Jul 2014 07:14:35 +0000 (12:44 +0530)]
Patch - CRM-14953
Tim Otten [Mon, 14 Jul 2014 06:17:12 +0000 (23:17 -0700)]
CRM-14789 - crmCaseType - Pass through more specific error
Tim Otten [Mon, 14 Jul 2014 06:01:32 +0000 (23:01 -0700)]
CRM-14789 - CaseType.delete API - Throw error if there are existing cases
Kurund Jalmi [Mon, 14 Jul 2014 06:14:26 +0000 (11:44 +0530)]
Merge pull request #3652 from davecivicrm/CRM-14961
CRM-14961 - Fix (mostly) for display on Merge screen. Still need to fix ...
Tim Otten [Mon, 14 Jul 2014 05:55:29 +0000 (22:55 -0700)]
RelationshipType - Flush static caches after creating RelationshipType
Tim Otten [Mon, 14 Jul 2014 05:50:13 +0000 (22:50 -0700)]
CRM_Core_DAO - Add doc
CiviCRM [Mon, 14 Jul 2014 05:23:42 +0000 (10:53 +0530)]
CRM-14968: fix skipping membership record creation for free membership
Tim Otten [Mon, 14 Jul 2014 05:10:55 +0000 (22:10 -0700)]
js/angular-crm-ui.js - Typo
Tim Otten [Mon, 14 Jul 2014 00:28:16 +0000 (17:28 -0700)]
crmCaseTye/list.html - s/\t/ /
Eileen McNaughton [Mon, 14 Jul 2014 04:14:58 +0000 (16:14 +1200)]
Merge pull request #3614 from eileenmcnaughton/CRM-14951
CRM-14951 test & fix incorrect number of terms on IPN update of memberships
Eileen McNaughton [Mon, 14 Jul 2014 04:14:20 +0000 (16:14 +1200)]
Merge pull request #3645 from eileenmcnaughton/CRM-14972
CRM-14972 fix test-exposed bug in separate membership payment
Tim Otten [Mon, 14 Jul 2014 03:36:11 +0000 (20:36 -0700)]
Merge pull request #3653 from totten/master-case-failures
CiviCase - Fix naming inconsistencies
Tim Otten [Mon, 14 Jul 2014 03:28:20 +0000 (20:28 -0700)]
api/v3/Case - Continue accepting case-type by title
Tim Otten [Mon, 14 Jul 2014 03:06:42 +0000 (20:06 -0700)]
CiviCase - Consistently use name "housing_support" and "adult_day_care_referral"
See:
* http://forum.civicrm.org/index.php/topic,33512.0.html
* CRM-14798
Tim Otten [Mon, 14 Jul 2014 02:36:21 +0000 (19:36 -0700)]
api_v3_CaseTest - Fix failures. Load case-types by name (not title).
The old title-based lookup worked because it was subjected to munging, but
that mechanism changed in CRM-14798.
Dave Greenberg [Fri, 11 Jul 2014 22:49:00 +0000 (15:49 -0700)]
CRM-14961 - Fix (mostly) for display on Merge screen. Still need to fix postProcess and convert contact_type.name to label.
----------------------------------------
* CRM-14961:
https://issues.civicrm.org/jira/browse/CRM-14961
Tim Otten [Fri, 11 Jul 2014 22:01:15 +0000 (15:01 -0700)]
Merge pull request #3649 from colemanw/totten-colemanw-validate
CRM-14949 - Move jQuery validate strings and other l10n settings to a dynamic js file
monishdeb [Fri, 11 Jul 2014 20:55:10 +0000 (02:25 +0530)]
minor fix
monishdeb [Fri, 11 Jul 2014 20:52:13 +0000 (02:22 +0530)]
CRM-14969 fix - Array to string conversion in CRM_Utils_Hook::post()
https://issues.civicrm.org/jira/browse/CRM-14969
Kurund Jalmi [Fri, 11 Jul 2014 13:10:41 +0000 (18:40 +0530)]
Merge pull request #3650 from kurund/CRM-14952
notice fixes, CRM-14952
kurund [Fri, 11 Jul 2014 13:09:39 +0000 (18:39 +0530)]
notice fixes, CRM-14952
----------------------------------------
* CRM-14952: Sorting on state in search throws FATAL error: Database Error Code: Unknown column 'civicrm_state_province.name' in 'field list'
https://issues.civicrm.org/jira/browse/CRM-14952
Coleman Watts [Fri, 11 Jul 2014 11:04:11 +0000 (12:04 +0100)]
CRM-14949 - For now we'll use imageUpload location to ensure consistency
Tim Otten [Fri, 11 Jul 2014 05:39:26 +0000 (22:39 -0700)]
CRM-14971 - CRM_Upgrade - Change backend image_URLs to frontend image_URLs
----------------------------------------
* CRM-14971: Contact image URLs broken in WordPress after upgrade to 4.4.6
https://issues.civicrm.org/jira/browse/CRM-14971
Dave Greenberg [Fri, 11 Jul 2014 02:13:14 +0000 (19:13 -0700)]
Merge pull request #3646 from davecivicrm/crm-14954
CRM-14954 - Fix for offline membership message template and move sample ...
Dave Greenberg [Fri, 11 Jul 2014 02:09:27 +0000 (19:09 -0700)]
CRM-14954 - Fix for offline membership message template and move sample newsletter upgrade templates to sample sub-dir.
----------------------------------------
* CRM-14954:
https://issues.civicrm.org/jira/browse/CRM-14954
Tim Otten [Fri, 11 Jul 2014 01:58:45 +0000 (18:58 -0700)]
CRM-14971 - Contact image URLs should go through WP frontend
----------------------------------------
* CRM-14971: Contact image URLs broken in WordPress after upgrade to 4.4.6
https://issues.civicrm.org/jira/browse/CRM-14971
Eileen McNaughton [Fri, 11 Jul 2014 01:40:14 +0000 (13:40 +1200)]
CRM-14972 update tests
Eileen McNaughton [Fri, 11 Jul 2014 01:39:44 +0000 (13:39 +1200)]
CRM-14972 fix for test breakage - the fix part
Eileen McNaughton [Thu, 10 Jul 2014 21:52:52 +0000 (09:52 +1200)]
Merge pull request #3644 from eileenmcnaughton/e-notice-ps
fix enotice on priceset update
Eileen McNaughton [Thu, 10 Jul 2014 21:50:41 +0000 (09:50 +1200)]
fix enotice on priceset update
Dave Greenberg [Thu, 10 Jul 2014 19:48:50 +0000 (12:48 -0700)]
Merge pull request #3638 from totten/master-casetype-delete
CRM-14789 - crmCaseType - Allow enable/disable/delete
Dave Greenberg [Thu, 10 Jul 2014 19:24:10 +0000 (12:24 -0700)]
Merge pull request #3643 from davecivicrm/CRM-14940a
CRM-14940 - Removed extraneous literal tags from .tpl files and added po...
Dave Greenberg [Thu, 10 Jul 2014 19:22:26 +0000 (12:22 -0700)]
CRM-14940 - Removed extraneous literal tags from .tpl files and added postUpgradeMessage.
----------------------------------------
* CRM-14940:
https://issues.civicrm.org/jira/browse/CRM-14940
Monish Deb [Thu, 10 Jul 2014 16:39:39 +0000 (22:09 +0530)]
Merge pull request #3603 from monishdeb/CRM-14758
w.r.t. 44 fix https://github.com/civicrm/civicrm-core/pull/3623
Kurund Jalmi [Thu, 10 Jul 2014 15:08:47 +0000 (20:38 +0530)]
Merge pull request #3641 from kurund/CRM-14952
CRM-14952, fixes for sorting
Kurund Jalmi [Thu, 10 Jul 2014 12:25:07 +0000 (17:55 +0530)]
Merge pull request #3620 from rohankatkar/CRM_14948
CRM-14948 Modification in names of Russian provinces.
Kurund Jalmi [Thu, 10 Jul 2014 12:23:15 +0000 (17:53 +0530)]
Merge pull request #3637 from jitendrapurohit/CRM14957
CRM-14957
Kurund Jalmi [Thu, 10 Jul 2014 12:07:42 +0000 (17:37 +0530)]
Merge pull request #3630 from jmcclelland/dashboard-api-cli
CRM-14966 - ensure we have a contactid before inserting dashboard item.
Kurund Jalmi [Thu, 10 Jul 2014 12:04:31 +0000 (17:34 +0530)]
Merge pull request #3639 from atif-shaikh/CRM-14965
CRM-14965 - Fix Search Builder notice : Notice: Only variable references...
Kurund Jalmi [Thu, 10 Jul 2014 12:04:19 +0000 (17:34 +0530)]
Merge pull request #3640 from atif-shaikh/CRM-14964
CRM-14964 - Session error on 'add activity to group'
kurund [Thu, 10 Jul 2014 11:55:05 +0000 (17:25 +0530)]
CRM-14952, fixes for sorting
----------------------------------------
* CRM-14952: Sorting on state in search throws FATAL error: Database Error Code: Unknown column 'civicrm_state_province.name' in 'field list'
https://issues.civicrm.org/jira/browse/CRM-14952
atif-shaikh [Thu, 10 Jul 2014 11:26:57 +0000 (16:56 +0530)]
CRM-14964 - Session error on 'add activity to group'
https://issues.civicrm.org/jira/browse/CRM-14964
jitendrapurohit [Thu, 10 Jul 2014 10:58:50 +0000 (16:28 +0530)]
CRM-14957
atif-shaikh [Thu, 10 Jul 2014 10:31:17 +0000 (16:01 +0530)]
CRM-14965 - Fix Search Builder notice : Notice: Only variable references should be returned by reference in CRM_Contact_Form_Search_Builder->convertFormValues()
https://issues.civicrm.org/jira/browse/CRM-14965
Tim Otten [Thu, 10 Jul 2014 08:10:22 +0000 (01:10 -0700)]
crmCaseType/list.html - Autoformat
Tim Otten [Thu, 10 Jul 2014 07:53:38 +0000 (00:53 -0700)]
CRM-14789 - crmCaseType - Allow enable/disable/delete
jitendrapurohit [Thu, 10 Jul 2014 05:18:52 +0000 (10:48 +0530)]
CRM-14957
Tim Otten [Thu, 10 Jul 2014 03:33:37 +0000 (20:33 -0700)]
CRM-14949 - CRM_Core_Resources::addLocalizationJs
Cleanly separate file-IO and file-content
Tim Otten [Thu, 10 Jul 2014 03:23:52 +0000 (20:23 -0700)]
CRM-14949 - CRM_Core_Page_AJAX::returnDynamicJS() => CRM_Core_Smarty::fetchWith()
The returnDynamicJS() looks like sugar for Smarty's assign()+fetch() --
don't see anything about it that's particular to dynamic-JS.
Tim Otten [Thu, 10 Jul 2014 03:10:35 +0000 (20:10 -0700)]
crmScope - Move logic to CRM_Core_Smarty
Currently, you can enter/exit scopes with Smarty tags. This patch allows you
to also enter/exit scopes using PHP.
projects / civicrm-core.git / log