Tim Otten [Wed, 15 Jan 2014 19:54:12 +0000 (11:54 -0800)]
Merge pull request #2340 from totten/master-cache-codegen
GenCode - Add an optional caching mode.
Tim Otten [Wed, 15 Jan 2014 04:34:28 +0000 (20:34 -0800)]
setup.conf.txt - Add suggestions about CIVICRM_GENCODE_DIGEST
Tim Otten [Wed, 15 Jan 2014 04:10:48 +0000 (20:10 -0800)]
GenCode - Cleanup
Tim Otten [Wed, 15 Jan 2014 03:52:16 +0000 (19:52 -0800)]
GenCode - Add an optional caching mode.
If CIVICRM_GENCODE_DIGEST is set, then GenCode will write out a digest of
all its inputs & templates. If someone tries to rerun with the same inputs,
then GenCode will do nothing.
Dave Greenberg [Tue, 14 Jan 2014 02:51:42 +0000 (18:51 -0800)]
Merge pull request #2333 from davecivicrm/CRM-10043
CRM-10043 - merge in changes to Activity.tpl and splitting of ActivityJs...
Dave Greenberg [Tue, 14 Jan 2014 02:50:41 +0000 (18:50 -0800)]
CRM-10043 - one more fatal fix - ts w/o array.
Dave Greenberg [Tue, 14 Jan 2014 02:26:20 +0000 (18:26 -0800)]
CRM-10043 - merge in changes to Activity.tpl and splitting of ActivityJs.tpl with the follow-up assignee changes.
Dave Greenberg [Mon, 13 Jan 2014 21:37:22 +0000 (13:37 -0800)]
Merge pull request #2287 from pradpnayak/CRM-13848
--CRM-13848, used UX pattern for financial type to allow multiple accoun...
kurund [Mon, 13 Jan 2014 20:07:24 +0000 (12:07 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-13-11-57-38
Conflicts:
CRM/Core/Form/Tag.php
colemanw [Sat, 11 Jan 2014 04:36:04 +0000 (20:36 -0800)]
Merge pull request #2327 from colemanw/4.4
Edit activity date warning broken
Coleman Watts [Sat, 11 Jan 2014 04:32:58 +0000 (20:32 -0800)]
CRM-14065 - Activity Form - Fix activityStatus js function
Dave Greenberg [Fri, 10 Jan 2014 20:29:26 +0000 (12:29 -0800)]
Merge pull request #2321 from lcdservices/CRM-14062
CRM-14062 support passing name to group API
Kurund Jalmi [Fri, 10 Jan 2014 20:06:23 +0000 (12:06 -0800)]
Merge pull request #2320 from kurund/CRM-14052
delete tags that belongs to tagset, CRM-14052
kurund [Fri, 10 Jan 2014 20:06:03 +0000 (12:06 -0800)]
added more comments for the code, CRM-14052
----------------------------------------
* CRM-14052: Tagset fixes
http://issues.civicrm.org/jira/browse/CRM-14052
kurund [Fri, 10 Jan 2014 20:04:44 +0000 (12:04 -0800)]
added more comments for the code, CRM-14052
----------------------------------------
* CRM-14052: Tagset fixes
http://issues.civicrm.org/jira/browse/CRM-14052
kurund [Fri, 10 Jan 2014 19:48:05 +0000 (11:48 -0800)]
few more fixes for tagset delete logic, CRM-14052
----------------------------------------
* CRM-14052: Tagset fixes
http://issues.civicrm.org/jira/browse/CRM-14052
Brian Shaughnessy [Fri, 10 Jan 2014 19:37:44 +0000 (14:37 -0500)]
CRM-14062 rework group name param check so we still allow appending ID via UI
pratik-joshi [Fri, 10 Jan 2014 08:41:56 +0000 (00:41 -0800)]
Merge pull request #2323 from NileemaJadhav/CRM-14056
-- CRM-14056 Fix for Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
Nileema [Fri, 10 Jan 2014 07:10:47 +0000 (12:40 +0530)]
-- CRM-14056 Added comment for dashboard schema upgrade
----------------------------------------
* CRM-14056: Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
http://issues.civicrm.org/jira/browse/CRM-14056
Coleman Watts [Fri, 10 Jan 2014 06:13:57 +0000 (22:13 -0800)]
CRM-14065 - Activity Form - Consolodate misplaced/duplicate js code
Nileema [Fri, 10 Jan 2014 06:00:00 +0000 (11:30 +0530)]
-- CRM-14056 Fix for Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
----------------------------------------
* CRM-14056: Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
http://issues.civicrm.org/jira/browse/CRM-14056
Kurund Jalmi [Thu, 9 Jan 2014 23:28:53 +0000 (15:28 -0800)]
Merge pull request #2318 from kenahoo/patch-1
Fix the require_once() example, fold a long line
colemanw [Thu, 9 Jan 2014 22:17:12 +0000 (14:17 -0800)]
Merge pull request #2322 from colemanw/ajaxSearch
Ajax search work
kurund [Thu, 9 Jan 2014 22:10:49 +0000 (14:10 -0800)]
more fixes for delete of tags in a tagset
kurund [Thu, 9 Jan 2014 22:06:37 +0000 (14:06 -0800)]
more fixes for delete of tags in a tagset
Coleman Watts [Thu, 9 Jan 2014 20:26:35 +0000 (12:26 -0800)]
CRM-13863 - Cleanup note comment ajax
Brian Shaughnessy [Thu, 9 Jan 2014 21:00:21 +0000 (16:00 -0500)]
CRM-14062 all passing name to group API
kurund [Thu, 9 Jan 2014 20:17:02 +0000 (12:17 -0800)]
delete tags that belongs to tagset, CRM-14052
----------------------------------------
* CRM-14052: Tagset fixes
http://issues.civicrm.org/jira/browse/CRM-14052
Coleman Watts [Thu, 9 Jan 2014 20:11:15 +0000 (12:11 -0800)]
CRM-13863 - Improve activity popup behavior
Ken Williams [Thu, 9 Jan 2014 13:32:32 +0000 (07:32 -0600)]
Fix the require_once() example, fold a long line
Tim Otten [Thu, 9 Jan 2014 09:12:35 +0000 (01:12 -0800)]
Merge pull request #2317 from totten/master-runconcat-fix
CRM_Core_CodeGen_Util_Template - Fix warning
Tim Otten [Thu, 9 Jan 2014 09:10:12 +0000 (01:10 -0800)]
CRM_Core_CodeGen_Util_Template - Fix warning
Example warning: "PHP Warning: unlink(../sql/civicrm_data.da_DK.mysql): No such file or directory in /home/webeditor/jenkins-node/workspace/buildkit-demos.civicrm.org/build/d7-sandbox/sites/all/modules/civicrm/CRM/Core/CodeGen/Util/Template.php on line 56"
Yashodha Chaku [Thu, 9 Jan 2014 07:29:21 +0000 (23:29 -0800)]
Merge pull request #2258 from NileemaJadhav/CRM-13889
-- CRM-13889 APIs for Dashboard, DashboardContact and new hook hook_civicrm_dashboard_defaults
Coleman Watts [Thu, 9 Jan 2014 03:21:58 +0000 (19:21 -0800)]
CRM-12872 - Remove print button from contact search results
Coleman Watts [Thu, 9 Jan 2014 02:47:06 +0000 (18:47 -0800)]
Contact_Task cleanup to use constants
Coleman Watts [Thu, 9 Jan 2014 02:16:42 +0000 (18:16 -0800)]
CRM-12872 - Fine-tune popup links on search forms
Dave Greenberg [Thu, 9 Jan 2014 01:02:46 +0000 (17:02 -0800)]
Merge pull request #2316 from davecivicrm/CRM-14016
CRM-14016 - Fix fatal error in Save Copy due to NULL instanceID.
Dave Greenberg [Thu, 9 Jan 2014 01:01:47 +0000 (17:01 -0800)]
CRM-14016 - Use elseif instead of else if
----------------------------------------
* CRM-14016: remove report instance from navigation via report settings
http://issues.civicrm.org/jira/browse/CRM-14016
Dave Greenberg [Thu, 9 Jan 2014 00:58:27 +0000 (16:58 -0800)]
CRM-14016 - Fix fatal error in Save Copy due to NULL instanceID.
----------------------------------------
* CRM-14016: remove report instance from navigation via report settings
http://issues.civicrm.org/jira/browse/CRM-14016
Coleman Watts [Wed, 8 Jan 2014 23:27:06 +0000 (15:27 -0800)]
CRM-12872 - Add livePage js to search forms
colemanw [Wed, 8 Jan 2014 22:44:19 +0000 (14:44 -0800)]
Merge pull request #2298 from kurund/tagset-fixes
CRM-14052: Tagset fixes
Coleman Watts [Wed, 8 Jan 2014 22:09:40 +0000 (14:09 -0800)]
CRM-12872 - Ajax pager fixes
Dave Greenberg [Wed, 8 Jan 2014 20:42:44 +0000 (12:42 -0800)]
Merge pull request #2236 from eileenmcnaughton/CRM-14008
CRM-14008 alter update greeting to update blanks as well as null
Kurund Jalmi [Wed, 8 Jan 2014 20:31:07 +0000 (12:31 -0800)]
Merge pull request #2288 from eileenmcnaughton/CRM-14043
CRM-14043 - cid=0 contribution form giving contribution to logged in use...
Dave Greenberg [Wed, 8 Jan 2014 20:29:11 +0000 (12:29 -0800)]
Merge pull request #2315 from davecivicrm/CRM-14034
CRM-14034 - Fix soft credit form rule to handle editing contributions us...
Dave Greenberg [Wed, 8 Jan 2014 20:28:41 +0000 (12:28 -0800)]
CRM-14034 - additional fix.
----------------------------------------
* CRM-14034: Editing a contribution from a PCP gets an error saying "soft credit amount cannot be more than the total amount."
http://issues.civicrm.org/jira/browse/CRM-14034
Dave Greenberg [Wed, 8 Jan 2014 20:27:51 +0000 (12:27 -0800)]
CRM-14034 - additional fix.
----------------------------------------
* CRM-14034: Editing a contribution from a PCP gets an error saying "soft credit amount cannot be more than the total amount."
http://issues.civicrm.org/jira/browse/CRM-14034
Dave Greenberg [Wed, 8 Jan 2014 20:27:03 +0000 (12:27 -0800)]
CRM-14034 - additional fix.
----------------------------------------
* CRM-14034: Editing a contribution from a PCP gets an error saying "soft credit amount cannot be more than the total amount."
http://issues.civicrm.org/jira/browse/CRM-14034
Dave Greenberg [Wed, 8 Jan 2014 20:16:56 +0000 (12:16 -0800)]
CRM-14034 - Fix soft credit form rule to handle editing contributions using a price set AND with linked soft credit(s).
----------------------------------------
* CRM-14034: Editing a contribution from a PCP gets an error saying "soft credit amount cannot be more than the total amount."
http://issues.civicrm.org/jira/browse/CRM-14034
kurund [Wed, 8 Jan 2014 20:05:03 +0000 (12:05 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-08-12-03-28
Conflicts:
CRM/Contribute/Page/Tab.php
Kurund Jalmi [Wed, 8 Jan 2014 19:59:24 +0000 (11:59 -0800)]
Merge pull request #2297 from davecivicrm/CRM-14051
CRM-14501 - Fix CRM_Contact_BAO_Relationship::getPermissionedContacts so...
Kurund Jalmi [Wed, 8 Jan 2014 19:56:40 +0000 (11:56 -0800)]
Merge pull request #2292 from davecivicrm/CRM-14047
CRM-14047 - add clarification text to Total Fee(s) display
Kurund Jalmi [Wed, 8 Jan 2014 19:56:03 +0000 (11:56 -0800)]
Merge pull request #2264 from dlobo/CRM-13606
CRM-13606 - Include / Exclude custom Search does not work properly
Kurund Jalmi [Wed, 8 Jan 2014 19:47:25 +0000 (11:47 -0800)]
Merge pull request #2299 from kurund/CRM-12506
fix the broken link to view all the contributions for a contact, CRM-125...
Kurund Jalmi [Wed, 8 Jan 2014 19:45:55 +0000 (11:45 -0800)]
Merge pull request #2303 from monishdeb/CRM-13833
CRM-13833 related fix
kurund [Wed, 8 Jan 2014 19:38:31 +0000 (11:38 -0800)]
fixes for entity delete function, CRM-14052
----------------------------------------
* CRM-14052: Tagset fixes
http://issues.civicrm.org/jira/browse/CRM-14052
Kurund Jalmi [Wed, 8 Jan 2014 19:18:20 +0000 (11:18 -0800)]
Merge pull request #2313 from mgbdev/CRM-13926
CRM-13926 new changess
mgbdev [Wed, 8 Jan 2014 13:34:08 +0000 (19:04 +0530)]
CRM-13926 new changess
dlobo [Wed, 8 Jan 2014 08:23:29 +0000 (00:23 -0800)]
Merge pull request #2294 from pratik-joshi/CRM-14036_fix
CRM-14036_fix
dlobo [Wed, 8 Jan 2014 08:20:42 +0000 (00:20 -0800)]
Merge pull request #2302 from monishdeb/CRM-14037
CRM-14037 fix - Class 'CRM_Activity_BAO_Contact' not found /civicrm/CRM/Activity/BAO/Activity.php DLTK Problem
dlobo [Wed, 8 Jan 2014 08:08:47 +0000 (00:08 -0800)]
Merge pull request #2263 from kurund/CRM-12753
CRM-12753, advanced search, change log fixes
colemanw [Wed, 8 Jan 2014 06:20:52 +0000 (22:20 -0800)]
Merge pull request #2308 from civicrm/4.4
Merge branch 4.4 into master
colemanw [Wed, 8 Jan 2014 06:13:03 +0000 (22:13 -0800)]
Merge pull request #2307 from colemanw/ajaxForms
Ajax form improvements
Coleman Watts [Wed, 8 Jan 2014 03:13:22 +0000 (19:13 -0800)]
CRM-12872 - Ajax-enable pager rowCount
Tim Otten [Wed, 8 Jan 2014 05:18:14 +0000 (21:18 -0800)]
Merge pull request #2306 from totten/master-hook-jimport
CRM_Utils_Hook_Joomla - Fix error loading JPluginHelper in Joomla 3.2
Tim Otten [Wed, 8 Jan 2014 05:13:35 +0000 (21:13 -0800)]
CRM/Core/CodeGen/Util/Template - Fix comment alignment in generated SQL
The missing newlines were causing SQL loading to crash in Joomla.
Coleman Watts [Wed, 8 Jan 2014 02:06:50 +0000 (18:06 -0800)]
CRM-12872 - Ajax-enable pager links
Tim Otten [Wed, 8 Jan 2014 01:55:32 +0000 (17:55 -0800)]
CRM_Utils_Hook_Joomla - Fix error loading JPluginHelper in Joomla 3.2
kurund [Wed, 8 Jan 2014 00:42:33 +0000 (16:42 -0800)]
fixes to case view tagset and tags CRM-14052
----------------------------------------
* CRM-14052: Tagset fixes
http://issues.civicrm.org/jira/browse/CRM-14052
Dave Greenberg [Wed, 8 Jan 2014 00:37:38 +0000 (16:37 -0800)]
Merge pull request #2243 from eileenmcnaughton/CRM-14021
CRM-14021 respect for .extra.hlp files & for alterations in help page vi...
Dave Greenberg [Wed, 8 Jan 2014 00:27:15 +0000 (16:27 -0800)]
Merge pull request #2305 from davecivicrm/CRM-12753a
CRM-12753 - Add Created date to contact view footer.
Dave Greenberg [Wed, 8 Jan 2014 00:21:56 +0000 (16:21 -0800)]
CRM-12753 - Add Created date to contact view footer.
----------------------------------------
* CRM-12753: Searching for contacts by date created
http://issues.civicrm.org/jira/browse/CRM-12753
Coleman Watts [Tue, 7 Jan 2014 22:13:38 +0000 (14:13 -0800)]
CRM-12872 - Add ui-spinner to page num input
colemanw [Tue, 7 Jan 2014 22:09:30 +0000 (14:09 -0800)]
Merge pull request #2304 from colemanw/thankyou_update
CRM-14054 - Contribution Thank You Letters - Set 'update thank-you date' to checked
Coleman Watts [Tue, 7 Jan 2014 22:04:50 +0000 (14:04 -0800)]
CRM-14054 - Contribution Thank You Letters - Set 'update thank-you date' to checked
monishdeb [Tue, 7 Jan 2014 07:19:40 +0000 (12:49 +0530)]
CRM-13833 fix - Implement Soft Credit Types
http://issues.civicrm.org/jira/browse/CRM-13833
Coleman Watts [Tue, 7 Jan 2014 04:10:25 +0000 (20:10 -0800)]
CRM-13863 - Ajax improvements for changelog tab.
Dave Greenberg [Tue, 7 Jan 2014 02:37:11 +0000 (18:37 -0800)]
Merge pull request #2301 from davecivicrm/CRM-13995a
CRM-13995 - Add is_object check to prevent notices.
Dave Greenberg [Tue, 7 Jan 2014 02:35:59 +0000 (18:35 -0800)]
CRM-13995 - Add is_object check to prevent notices.
----------------------------------------
* CRM-13995: contact export when merging households: some household fields missing
http://issues.civicrm.org/jira/browse/CRM-13995
Dave Greenberg [Tue, 7 Jan 2014 01:52:26 +0000 (17:52 -0800)]
Merge pull request #2300 from davecivicrm/CRM-13995
CRM -13995 - Additional change needed to get Country column exported for merge into h...
Dave Greenberg [Tue, 7 Jan 2014 01:51:04 +0000 (17:51 -0800)]
Additional change needed to get Country column exported for merge into household.
Dave Greenberg [Tue, 7 Jan 2014 01:48:43 +0000 (17:48 -0800)]
Merge pull request #2223 from lcdservices/CRM-13995
CRM-13995 fix export when merging households
kurund [Tue, 7 Jan 2014 01:35:14 +0000 (17:35 -0800)]
do not create/delete tags via tagset unless explicit save, CRM-14052
----------------------------------------
* CRM-14052: Tagset fixes
http://issues.civicrm.org/jira/browse/CRM-14052
Coleman Watts [Tue, 7 Jan 2014 01:31:04 +0000 (17:31 -0800)]
CRM-13863 - Ajax improvements for relationship tab.
Coleman Watts [Tue, 7 Jan 2014 00:56:07 +0000 (16:56 -0800)]
CRM-10693 - crmSnippet - restore original content on destroy
kurund [Tue, 7 Jan 2014 00:55:24 +0000 (16:55 -0800)]
fix the broken link to view all the contributions for a contact, CRM-12506
----------------------------------------
* CRM-12506: Contact Contribution tab will not show more than 50 contributions
http://issues.civicrm.org/jira/browse/CRM-12506
Dave Greenberg [Tue, 7 Jan 2014 00:55:00 +0000 (16:55 -0800)]
Update Main.php
Fix form rule error for number of pledge installments.
Dave Greenberg [Mon, 6 Jan 2014 23:09:48 +0000 (15:09 -0800)]
Merge pull request #2296 from lcdservices/CRM-14049
CRM-14049 allow on-hold email when retrieving details and pass contactId...
kurund [Mon, 6 Jan 2014 22:59:34 +0000 (14:59 -0800)]
worked on #2 fixes, CRM-14052
----------------------------------------
* CRM-14052: Tagset fixes
http://issues.civicrm.org/jira/browse/CRM-14052
kurund [Mon, 6 Jan 2014 22:17:07 +0000 (14:17 -0800)]
fixes #1 and #2 for CRM-14052
----------------------------------------
* CRM-14052: Tagset fixes
http://issues.civicrm.org/jira/browse/CRM-14052
Dave Greenberg [Mon, 6 Jan 2014 22:15:54 +0000 (14:15 -0800)]
CRM-14501 - Fix CRM_Contact_BAO_Relationship::getPermissionedContacts so it can handle a list of one or more relationshipTypeIDs.
----------------------------------------
* CRM-14501:
http://issues.civicrm.org/jira/browse/CRM-14501
Brian Shaughnessy [Mon, 6 Jan 2014 21:32:27 +0000 (16:32 -0500)]
CRM-14049 allow on-hold email when retrieving details and pass contactId if exists
colemanw [Mon, 6 Jan 2014 21:27:41 +0000 (13:27 -0800)]
Merge pull request #2295 from colemanw/master
AJAX fixes
Coleman Watts [Thu, 2 Jan 2014 22:13:45 +0000 (14:13 -0800)]
CRM-13863 - Contact summary popup fixes
Coleman Watts [Thu, 2 Jan 2014 21:36:31 +0000 (13:36 -0800)]
CRM-13863 - Fix relationship form to work in popup
colemanw [Mon, 6 Jan 2014 20:37:41 +0000 (12:37 -0800)]
Merge pull request #2291 from colemanw/resources
Coleman's giant js/ajax PR
Kurund Jalmi [Mon, 6 Jan 2014 19:39:49 +0000 (11:39 -0800)]
Merge pull request #2293 from kurund/notice-fixes
strict warning fixes
kurund [Mon, 6 Jan 2014 19:39:04 +0000 (11:39 -0800)]
strict warning fixes
Pratik Joshi [Mon, 6 Jan 2014 19:29:03 +0000 (00:59 +0530)]
CRM-14036_fix
Coleman Watts [Mon, 6 Jan 2014 04:55:41 +0000 (20:55 -0800)]
CRM-13863 - Ajax event tabs improvements - update 'disabled' tab class, etc.
projects / civicrm-core.git / log