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
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
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 ...
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
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
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
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.
Tim Otten [Thu, 10 Jul 2014 02:55:02 +0000 (19:55 -0700)]
CRM-14949 - Replace {$timeGenerated} with {$smarty.now}
Eileen McNaughton [Thu, 10 Jul 2014 01:15:04 +0000 (13:15 +1200)]
Merge pull request #3635 from eileenmcnaughton/4.4-tests
revert minor data change in test suite
Eileen McNaughton [Thu, 10 Jul 2014 01:14:58 +0000 (13:14 +1200)]
revert minor data change in test suite
Eileen McNaughton [Thu, 10 Jul 2014 01:06:33 +0000 (13:06 +1200)]
Merge pull request #3634 from eileenmcnaughton/4.4-tests
fix in test suite - mistype
Eileen McNaughton [Thu, 10 Jul 2014 01:05:44 +0000 (13:05 +1200)]
fix in test suite - mistype
Eileen McNaughton [Wed, 9 Jul 2014 22:52:34 +0000 (10:52 +1200)]
Merge pull request #3632 from eileenmcnaughton/tests
add pseudoconstant on tests
Eileen McNaughton [Wed, 9 Jul 2014 22:52:26 +0000 (10:52 +1200)]
add pseudoconstants for domain_id
Eileen McNaughton [Wed, 9 Jul 2014 22:45:41 +0000 (10:45 +1200)]
fix test by using a different variable (one that is still, but shouldn't be, config only
Dave Greenberg [Wed, 9 Jul 2014 21:39:45 +0000 (14:39 -0700)]
Merge pull request #3631 from davecivicrm/CRM-13973a
CRM-13973 - set cancelled class in line item listings for line items tha...
Dave Greenberg [Wed, 9 Jul 2014 21:37:33 +0000 (14:37 -0700)]
CRM-13973 - set cancelled class in line item listings for line items that have been de-selected - e.g. QTY = 0.
----------------------------------------
* CRM-13973:
https://issues.civicrm.org/jira/browse/CRM-13973
Eileen McNaughton [Wed, 9 Jul 2014 20:44:11 +0000 (08:44 +1200)]
Merge pull request #3623 from monishdeb/CRM-14758-44-fixes
CRM-14758 fixes for 4.4
Coleman Watts [Wed, 9 Jul 2014 19:56:08 +0000 (20:56 +0100)]
CRM-14949 - Flush dynamic resources when clearing caches
Coleman Watts [Wed, 9 Jul 2014 16:26:13 +0000 (17:26 +0100)]
CRM-14949 - Switch dynamic js to a file instead of a callback
Jamie McClelland [Wed, 9 Jul 2014 20:00:51 +0000 (16:00 -0400)]
CRM-14966 - ensure we have a contactid before inserting dashboard item.
----------------------------------------
* CRM-14966: inserting dashboard item using api from cli results in sql exception
https://issues.civicrm.org/jira/browse/CRM-14966
Coleman Watts [Sun, 6 Jul 2014 20:17:30 +0000 (21:17 +0100)]
CRM-14949 - Move more stuff into dynamic js tpl
Coleman Watts [Sun, 6 Jul 2014 17:35:03 +0000 (18:35 +0100)]
CRM-14949 - Move localization strings into a dynamic js tpl
Coleman Watts [Thu, 3 Jul 2014 21:17:54 +0000 (22:17 +0100)]
Rename navigation.js.tpl
Kurund Jalmi [Wed, 9 Jul 2014 14:01:18 +0000 (19:31 +0530)]
Merge pull request #3627 from atif-shaikh/CRM-14956
CRM-14956 - Copying Event Price Set Fails If Any Price Has Active Date
Kurund Jalmi [Wed, 9 Jul 2014 14:00:38 +0000 (19:30 +0530)]
Merge pull request #3628 from atif-shaikh/CRM-14959
CRM-14959 - PHP Fatal Error when Address State is Set to View Only
atif-shaikh [Wed, 9 Jul 2014 12:19:07 +0000 (17:49 +0530)]
CRM-14959 - PHP Fatal Error when Address State is Set to View Only
https://issues.civicrm.org/jira/browse/CRM-14959
atif-shaikh [Wed, 9 Jul 2014 10:23:18 +0000 (15:53 +0530)]
CRM-14956 - Copying Event Price Set Fails If Any Price Has Active Date
https://issues.civicrm.org/jira/browse/CRM-14956
monishdeb [Wed, 9 Jul 2014 09:54:36 +0000 (15:24 +0530)]
Test fixes
CiviCRM [Wed, 9 Jul 2014 07:08:17 +0000 (12:38 +0530)]
CRM-14670 : load only one target record per activity in temp table
Kurund Jalmi [Wed, 9 Jul 2014 06:41:46 +0000 (12:11 +0530)]
Merge pull request #3625 from jitendrapurohit/CRM_test_4.5beta2
CRM Test Fix 4.5beta2
jitendrapurohit [Wed, 9 Jul 2014 06:04:37 +0000 (11:34 +0530)]
CRM Test Fix 4.5beta2
Kurund Jalmi [Wed, 9 Jul 2014 05:55:00 +0000 (11:25 +0530)]
Merge pull request #3621 from jitendrapurohit/API_test_fix4.5beta2
API Test fix 4.5beta2
jitendrapurohit [Wed, 9 Jul 2014 05:33:55 +0000 (11:03 +0530)]
Api Test fix
jitendrapurohit [Tue, 8 Jul 2014 13:42:01 +0000 (19:12 +0530)]
API Test fix 4.5beta2
Eileen McNaughton [Wed, 9 Jul 2014 02:12:44 +0000 (14:12 +1200)]
add pseudoconstant on tests
monishdeb [Tue, 8 Jul 2014 20:20:29 +0000 (01:50 +0530)]
CRM-14758 fixes for 4.4
----------------------------------------
* CRM-14758: API ( contact, create ) does not always create related membership
https://issues.civicrm.org/jira/browse/CRM-14758
Dave Greenberg [Tue, 8 Jul 2014 18:51:20 +0000 (11:51 -0700)]
Merge pull request #3622 from agh1/birthdaytest
CRM-14879 tests for reminders on contact date fields
Andrew Hunt [Tue, 8 Jul 2014 15:43:36 +0000 (11:43 -0400)]
CRM-14879 tests for reminders on contact date fields
----------------------------------------
* CRM-14879: Scheduled reminders for contact date fields
https://issues.civicrm.org/jira/browse/CRM-14879
Yashodha Chaku [Tue, 8 Jul 2014 13:56:56 +0000 (19:26 +0530)]
Merge pull request #3616 from jmcclelland/greetings-hook-tokens
CRM-14955 - add custom tokens to greetings
Rohan Katkar [Tue, 8 Jul 2014 10:48:17 +0000 (16:18 +0530)]
CRM-14948 Modification in names of Russian provinces.
Tim Otten [Tue, 8 Jul 2014 09:10:02 +0000 (02:10 -0700)]
Merge pull request #3619 from totten/master-14871
CRM-14871 - Extension & Flushing
Tim Otten [Tue, 8 Jul 2014 09:05:41 +0000 (02:05 -0700)]
CRM-14871 - CRM_Core_Invoke::rebuildMenuAndCaches - Fix regression where CiviCase XML from newly-downloaded extension doesn't get loaded.
Tim Otten [Tue, 8 Jul 2014 08:11:57 +0000 (01:11 -0700)]
CRM-14871 - CRM_Extension_Manager - Fix typo
Frank J. Gómez [Tue, 17 Jun 2014 16:47:57 +0000 (12:47 -0400)]
CRM-14871: Supply api call extension.upgrade for admins who manage extensions outside of CiviCRM (e.g., manual download).
Frank J. Gómez [Tue, 17 Jun 2014 15:44:24 +0000 (11:44 -0400)]
CRM-14871: Rebuild caches after extensions are upgraded in a CiviCRM-managed way (e.g., through the web UI or drush).
Kurund Jalmi [Tue, 8 Jul 2014 07:11:57 +0000 (12:41 +0530)]
Merge pull request #3618 from rohankatkar/CRM-14948
CRM-14948
Rohan Katkar [Tue, 8 Jul 2014 06:13:01 +0000 (11:43 +0530)]
CRM-14948
Jamie McClelland [Mon, 7 Jul 2014 20:35:39 +0000 (16:35 -0400)]
CRM-14955 - add custom tokens to greetings
----------------------------------------
* CRM-14955: can't add custom defined tokens to custom greetings
https://issues.civicrm.org/jira/browse/CRM-14955
Coleman Watts [Mon, 7 Jul 2014 19:18:10 +0000 (20:18 +0100)]
Add missing ;
Kurund Jalmi [Mon, 7 Jul 2014 15:45:06 +0000 (21:15 +0530)]
Merge pull request #3615 from jmcclelland/prev-next-page-10
CRM-14939 - ensure proper pagination of search results past page 10.
Jamie McClelland [Mon, 7 Jul 2014 15:00:30 +0000 (11:00 -0400)]
CRM-14939 - ensure proper pagination of search results past page 10.
----------------------------------------
* CRM-14939: unpredictable behavior with pagination of search results with duplicates
https://issues.civicrm.org/jira/browse/CRM-14939
Kurund Jalmi [Mon, 7 Jul 2014 13:42:12 +0000 (19:12 +0530)]
Merge pull request #3612 from jitendrapurohit/CRM-14945
CRM-14945
Eileen McNaughton [Mon, 7 Jul 2014 12:11:35 +0000 (00:11 +1200)]
CRM-14950 exit on completetransaction is already completed
Eileen McNaughton [Mon, 7 Jul 2014 12:06:04 +0000 (00:06 +1200)]
CRM-14951 fix for number of terms on IPN
Eileen McNaughton [Mon, 7 Jul 2014 12:02:49 +0000 (00:02 +1200)]
CRM-14951 test for numterms not applied
Kurund Jalmi [Mon, 7 Jul 2014 12:00:47 +0000 (17:30 +0530)]
Merge pull request #3613 from atif-shaikh/CRM-14944
CRM-14944 QA fixes
atif-shaikh [Mon, 7 Jul 2014 11:38:12 +0000 (17:08 +0530)]
CRM-14944 QA fixes
----------------------------------------
* CRM-14944: function should not be called statically - pledge page
https://issues.civicrm.org/jira/browse/CRM-14944
jitendrapurohit [Mon, 7 Jul 2014 11:14:34 +0000 (16:44 +0530)]
CRM-14945
kurund [Mon, 7 Jul 2014 10:24:13 +0000 (15:54 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-07-15-48-59
Conflicts:
CRM/Dedupe/Merger.php
sql/civicrm_generated.mysql
xml/version.xml
Yashodha Chaku [Mon, 7 Jul 2014 10:03:42 +0000 (15:33 +0530)]
Merge pull request #3602 from yashodha/CRM-14629
CRM-14629: fix query to enable cancel/update on recurring contribution
Kurund Jalmi [Mon, 7 Jul 2014 09:30:39 +0000 (15:00 +0530)]
Merge pull request #3608 from kurund/CRM-14877
ACL's not working correctly for select all options in export, CRM-14877
Kurund Jalmi [Mon, 7 Jul 2014 08:36:56 +0000 (14:06 +0530)]
Merge pull request #3611 from kurund/CRM-14944
strict warning fixes CRM-14944
projects / civicrm-core.git / log