Pratik Joshi [Mon, 30 Dec 2013 07:30:15 +0000 (13:00 +0530)]
CRM-13964 : commenting code
Pratik Joshi [Mon, 30 Dec 2013 07:22:28 +0000 (12:52 +0530)]
CRM-13964 : minor query fix in bao function for fetching balance amount
Pratik Joshi [Tue, 24 Dec 2013 14:04:42 +0000 (19:34 +0530)]
CRM-13964 : post process handling and improvement
Pratik Joshi [Mon, 23 Dec 2013 15:31:20 +0000 (21:01 +0530)]
CRM-13964 : post process working
Pratik Joshi [Fri, 20 Dec 2013 12:30:36 +0000 (18:00 +0530)]
CRM-13964 : JQUERY part and new status creation
colemanw [Thu, 16 Jan 2014 01:03:24 +0000 (17:03 -0800)]
Merge pull request #2352 from colemanw/4.4
Fix search builder participant/member options
Tim Otten [Thu, 16 Jan 2014 00:11:13 +0000 (16:11 -0800)]
Merge pull request #2354 from totten/4.4-dashboard-api
CRM-13889 - CRM_Core_BAO_Dashboard - Fix test failure.
Tim Otten [Thu, 16 Jan 2014 00:01:39 +0000 (16:01 -0800)]
CRM-13889 - Autoformat
Tim Otten [Wed, 15 Jan 2014 23:58:24 +0000 (15:58 -0800)]
CRM-13889 - CRM_Core_BAO_Dashboard - Fix test failure. Report error better.
Note: It looks like there was a merge error because some of the relevant
code was badly duplicated.
Coleman Watts [Wed, 15 Jan 2014 23:23:18 +0000 (15:23 -0800)]
CRM-13810 - Fix search builder member_campaign options
Tim Otten [Wed, 15 Jan 2014 23:20:43 +0000 (15:20 -0800)]
Merge pull request #2353 from totten/master-cache-codegen2
GenCode - Ignore cache/digest if some key files are missing
Tim Otten [Wed, 15 Jan 2014 23:17:59 +0000 (15:17 -0800)]
GenCode - Ignore cache/digest if some key files are missing
Coleman Watts [Wed, 15 Jan 2014 23:14:57 +0000 (15:14 -0800)]
Fix search builder participant options
colemanw [Wed, 15 Jan 2014 23:14:07 +0000 (15:14 -0800)]
Merge pull request #2351 from kurund/CRM-13996
CRM-13996, fixes sorting for search views
kurund [Wed, 15 Jan 2014 23:10:07 +0000 (15:10 -0800)]
CRM-13996, fixes sorting for search views
----------------------------------------
* CRM-13996: Advanced Search; Sorting of Results displayed in a custom profile fails and Advanced Search must be reset
http://issues.civicrm.org/jira/browse/CRM-13996
dlobo [Wed, 15 Jan 2014 23:01:51 +0000 (15:01 -0800)]
Merge pull request #2349 from eileenmcnaughton/CRM-14080
CRM-14080 default to now
Eileen McNaughton [Wed, 15 Jan 2014 22:52:46 +0000 (11:52 +1300)]
CRM-14012 - Contribution total values incorrect for permissioned users in search summary panel
----------------------------------------
* CRM-14012: Contribution total values incorrect on Find Contributions page for permissioned users
http://issues.civicrm.org/jira/browse/CRM-14012
Dave Greenberg [Wed, 15 Jan 2014 22:44:42 +0000 (14:44 -0800)]
Merge pull request #2348 from dlobo/CRM-13278
CRM-13278 - Select fields for export "- related contact info -" fields are not sorted properly
Eileen McNaughton [Wed, 15 Jan 2014 22:43:25 +0000 (11:43 +1300)]
CRM-14080 default to now
----------------------------------------
* CRM-14080: Have noticed there is no default on received_date on contribution.create - should default to now
http://issues.civicrm.org/jira/browse/CRM-14080
Donald A. Lobo [Wed, 15 Jan 2014 22:23:59 +0000 (14:23 -0800)]
CRM-13278 - Select fields for export "- related contact info -" fields are not sorted properly
http://issues.civicrm.org/jira/browse/CRM-13278
dlobo [Wed, 15 Jan 2014 22:23:11 +0000 (14:23 -0800)]
Merge pull request #2347 from lcdservices/CRM-14062
CRM-14062 update api tests
Brian Shaughnessy [Wed, 15 Jan 2014 22:16:58 +0000 (17:16 -0500)]
CRM-14062 update api tests
Dave Greenberg [Wed, 15 Jan 2014 21:59:58 +0000 (13:59 -0800)]
Merge pull request #2332 from colemanw/CRM-13996
CRM-13996 - Search views - hack to fix prefix, gender, suffix
Dave Greenberg [Wed, 15 Jan 2014 21:56:26 +0000 (13:56 -0800)]
Merge pull request #2341 from colemanw/campaign_id
CRM-13810 - Display campaign name on search builder
dlobo [Wed, 15 Jan 2014 21:45:57 +0000 (13:45 -0800)]
Merge pull request #2319 from lcdservices/CRM-13252
CRM-13252 exit nested api if getfields/getoptions action
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.
dlobo [Wed, 15 Jan 2014 18:29:32 +0000 (10:29 -0800)]
Merge pull request #2346 from jmcclelland/county-field-should-populate-with-counties
CRM-14077 - contact/address - county field should populate with counties...
Jamie McClelland [Wed, 15 Jan 2014 16:34:12 +0000 (11:34 -0500)]
CRM-14077 - contact/address - county field should populate with counties not countries
----------------------------------------
* CRM-14077: County drop down is populated with countries instead
http://issues.civicrm.org/jira/browse/CRM-14077
Kurund Jalmi [Wed, 15 Jan 2014 06:11:03 +0000 (22:11 -0800)]
Merge pull request #2335 from yashodha/CRM-14066
CRM-14066: fix zero amount for discounted option
colemanw [Wed, 15 Jan 2014 05:48:55 +0000 (21:48 -0800)]
Merge pull request #2343 from colemanw/locationTypeExport
CRM-14076 - Export - fix label to work as the query object expects
Coleman Watts [Wed, 15 Jan 2014 05:47:23 +0000 (21:47 -0800)]
CRM-14076 - Export - fix label to work as the query object expects
pratik-joshi [Wed, 15 Jan 2014 04:44:40 +0000 (20:44 -0800)]
Merge pull request #2325 from mepps/joomla-css-fix
Stopped .crm-container fieldset label from floating left in Joomla edit ...
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
Coleman Watts [Wed, 15 Jan 2014 04:09:08 +0000 (20:09 -0800)]
CRM-13810 - Display campaign name on search builder
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.
Tim Otten [Wed, 15 Jan 2014 01:12:32 +0000 (17:12 -0800)]
Merge pull request #2339 from totten/4.4-test-mysqlport
tests/phpunit - Fix for running with MySQL on alternative port
Tim Otten [Sat, 4 Jan 2014 02:24:04 +0000 (18:24 -0800)]
tests/phpunit - Fix for running with MySQL on alternative port
Dave Greenberg [Tue, 14 Jan 2014 23:07:59 +0000 (15:07 -0800)]
Merge pull request #2330 from colemanw/CRM-14059
CRM-14059 - Contribution form - Fix onbehalf profile ajax load
Kurund Jalmi [Tue, 14 Jan 2014 22:57:01 +0000 (14:57 -0800)]
Merge pull request #2338 from kurund/CRM-14064
fixes for CRM-14064
kurund [Tue, 14 Jan 2014 22:55:44 +0000 (14:55 -0800)]
fixes for CRM-14064
----------------------------------------
* CRM-14064: Uploading content for mailing results in empty message text and subject line
http://issues.civicrm.org/jira/browse/CRM-14064
Maggie [Tue, 14 Jan 2014 14:35:44 +0000 (09:35 -0500)]
Removed repeated line
Maggie [Tue, 14 Jan 2014 14:33:29 +0000 (09:33 -0500)]
Remade change of adding float:none
Nileema [Tue, 14 Jan 2014 11:29:52 +0000 (16:59 +0530)]
-- HR-235 Import multi-value custom data
deepak-srivastava [Tue, 14 Jan 2014 11:05:32 +0000 (03:05 -0800)]
Merge pull request #2336 from deepak-srivastava/CRM-14057
CRM-14057 - contact logging detail report may have missing/wrong altered...
Deepak Srivastava [Tue, 14 Jan 2014 11:00:50 +0000 (16:30 +0530)]
CRM-14057 - contact logging detail report may have missing/wrong altered and altered by name
----------------------------------------
* CRM-14057: contact logging detail report may have missing/wrong altered and altered by name
http://issues.civicrm.org/jira/browse/CRM-14057
yashodha [Tue, 14 Jan 2014 09:46:46 +0000 (15:16 +0530)]
CRM-14066: fix zero amount for discounted option
Kurund Jalmi [Tue, 14 Jan 2014 06:54:50 +0000 (22:54 -0800)]
Merge pull request #2324 from yashodha/4.4
CRM-13947: fix where clause condition
Tim Otten [Tue, 14 Jan 2014 06:54:44 +0000 (22:54 -0800)]
Merge pull request #2334 from totten/4.4-14046-undefvar
CRM-14046 - CRM_Extension_Manager - Fix undefined variable references
Tim Otten [Sun, 5 Jan 2014 00:16:13 +0000 (16:16 -0800)]
CRM-14046 - CRM_Extension_Manager - Fix undefined variable references
Tim Otten [Tue, 14 Jan 2014 06:48:41 +0000 (22:48 -0800)]
Merge pull request #2171 from lcdservices/CRM-13909
CRM-13909 also rebuild word replacement when clearing cache
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.
Coleman Watts [Tue, 14 Jan 2014 00:51:23 +0000 (16:51 -0800)]
CRM-13996 - Search views - hack to fix prefix, gender, suffix
Coleman Watts [Mon, 13 Jan 2014 23:31:55 +0000 (15:31 -0800)]
CRM-14059 - Contribution form - Fix onbehalf profile ajax load
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...
Dave Greenberg [Mon, 13 Jan 2014 20:29:50 +0000 (12:29 -0800)]
Merge pull request #2329 from davecivicrm/CRM-13726
CRM-13726 includes PR 1934 plus fix from https://github.com/eileenmcnaug...
Dave Greenberg [Mon, 13 Jan 2014 20:27:54 +0000 (12:27 -0800)]
CRM-13726 includes PR 1934 plus fix from https://github.com/eileenmcnaughton/civicrm-core/commit/
c1622a21afb8fa86f92be8dc90879ad5aed7e3f5
----------------------------------------
* CRM-13726: Only show 'billing addres is same as above' checkbox if there is an address above
http://issues.civicrm.org/jira/browse/CRM-13726
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
Maggie [Fri, 10 Jan 2014 21:58:32 +0000 (16:58 -0500)]
Stopped .crm-container fieldset label from floating left in Joomla edit default template view
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
yashodha [Fri, 10 Jan 2014 08:20:42 +0000 (13:50 +0530)]
CRM-13947: fix where clause condition
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
Brian Shaughnessy [Thu, 9 Jan 2014 17:08:33 +0000 (12:08 -0500)]
CRM-13252 exit nested api if getfields/getoptions action
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
yashodha [Thu, 9 Jan 2014 06:03:21 +0000 (11:33 +0530)]
CRM-13912: title fix for sms
yashodha [Thu, 9 Jan 2014 04:40:20 +0000 (10:10 +0530)]
CRM-13912: upgrade fix
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...