colemanw [Tue, 21 Jan 2014 04:24:28 +0000 (20:24 -0800)]
Merge pull request #2386 from colemanw/tokenFix
CRM-14095 - Fix bug where email token hook not called if no core tokens present
Coleman Watts [Tue, 21 Jan 2014 01:00:43 +0000 (17:00 -0800)]
CRM-14095 - Fix bug where email token hook not called if no core tokens present
Kurund Jalmi [Tue, 21 Jan 2014 01:50:56 +0000 (17:50 -0800)]
Merge pull request #2367 from kurund/CRM-14082
preserve sorting for task actions, CRM-14082
Tim Otten [Mon, 20 Jan 2014 22:37:48 +0000 (14:37 -0800)]
Merge pull request #2382 from eileenmcnaughton/failing-test
Failing test
Eileen McNaughton [Mon, 20 Jan 2014 19:07:49 +0000 (08:07 +1300)]
Additional test on return.address_name
Eileen McNaughton [Mon, 20 Jan 2014 11:55:20 +0000 (00:55 +1300)]
fix failing profile api test by preventing double-adding of same alias
Eileen McNaughton [Mon, 20 Jan 2014 11:28:02 +0000 (00:28 +1300)]
updated examples
Tim Otten [Mon, 20 Jan 2014 11:27:04 +0000 (03:27 -0800)]
Merge pull request #2381 from totten/4.4-absence-data-helpers
HR-226 - Add misc helpers
Tim Otten [Mon, 20 Jan 2014 11:22:10 +0000 (03:22 -0800)]
crm.backbone.js - Dial-down the delay on propagating changes from crmCriteriaModel to the collection
Eileen McNaughton [Mon, 20 Jan 2014 10:44:46 +0000 (23:44 +1300)]
fix failing test, check contribution creating with default date of now
Tim Otten [Mon, 20 Jan 2014 01:00:13 +0000 (17:00 -0800)]
Merge pull request #2378 from totten/4.4-absence-data-helpers
HR-238 - Helpers
Tim Otten [Mon, 20 Jan 2014 00:30:41 +0000 (16:30 -0800)]
crm.backbone.js - Allow collections to fetch records with alternative API actions
Tim Otten [Mon, 20 Jan 2014 00:29:58 +0000 (16:29 -0800)]
CRM_Utils_Array::product() - Helper to generate Cartesian products
Tim Otten [Sun, 19 Jan 2014 00:57:48 +0000 (16:57 -0800)]
Merge pull request #2374 from totten/4.4-entitytype
--HR-224 Reinitialize entity cache during installation
Nileema [Fri, 17 Jan 2014 14:35:08 +0000 (20:05 +0530)]
--HR-224 Reinitialize entity cache during installation
Dave Greenberg [Fri, 17 Jan 2014 20:02:49 +0000 (12:02 -0800)]
Merge pull request #2369 from davecivicrm/CRM-13998
CRM-13998 - upgrade checks for missing report_instance columns.
Dave Greenberg [Fri, 17 Jan 2014 19:59:01 +0000 (11:59 -0800)]
CRM-13998 - upgrade checks for missing report_instance columns.
----------------------------------------
* CRM-13998: Upgrade is missing alter statements for civicrm_report_instance
http://issues.civicrm.org/jira/browse/CRM-13998
colemanw [Fri, 17 Jan 2014 18:15:14 +0000 (10:15 -0800)]
Merge pull request #2360 from davecivicrm/CRM-14081
CRM-14081 - Alternate approach preserves useful focus behavior by defaul...
kurund [Fri, 17 Jan 2014 18:14:21 +0000 (10:14 -0800)]
preserve sorting for task actions, CRM-14082
----------------------------------------
* CRM-14082: Sort order is no longer honored by search actions
http://issues.civicrm.org/jira/browse/CRM-14082
Dave Greenberg [Fri, 17 Jan 2014 18:02:10 +0000 (10:02 -0800)]
Merge pull request #2365 from eileenmcnaughton/CRM-14080
CRM-14080 default to now
Tim Otten [Fri, 17 Jan 2014 06:20:04 +0000 (22:20 -0800)]
Merge pull request #2362 from totten/4.4-sync-redirect
CRM-14086 - CMSUser::synchronize - Allow execution of sync routine without redirect
deepak-srivastava [Fri, 17 Jan 2014 06:08:00 +0000 (22:08 -0800)]
Merge pull request #2289 from eileenmcnaughton/CRM-13918
CRM-13918 report_template.getrows api - add limit & offset per Deepak's comments
Tim Otten [Fri, 17 Jan 2014 05:42:00 +0000 (21:42 -0800)]
CRM-14086 - CMSUser::synchronize - Allow execution of sync routine without an HTTP redirect
Dave Greenberg [Fri, 17 Jan 2014 02:45:02 +0000 (18:45 -0800)]
CRM-14081 - Alternate approach preserves useful focus behavior by default and eliminates for soft credit block via new focus param for NewContact.tpl.
----------------------------------------
* CRM-14081: Create Contribution screen initially scrolls to and puts cursor in "Soft Credit" field
http://issues.civicrm.org/jira/browse/CRM-14081
Tim Otten [Fri, 17 Jan 2014 02:35:51 +0000 (18:35 -0800)]
Merge pull request #2359 from totten/4.4-dashboardcontactapi
CRM-13889 - api/v3/DashboardContact - Remove exemption for SyntaxConform...
Tim Otten [Fri, 17 Jan 2014 02:10:21 +0000 (18:10 -0800)]
CRM-13889 - api/v3/DashboardContact - Remove exemption for SyntaxConformanceTest. Fix bugs.
colemanw [Thu, 16 Jan 2014 17:57:07 +0000 (09:57 -0800)]
Merge pull request #2356 from colemanw/4.4
CRM-14028 - Workaround the number 0 == empty() php bug
Coleman Watts [Thu, 16 Jan 2014 17:56:28 +0000 (09:56 -0800)]
CRM-14028 - Workaround the number 0 == empty() php bug
colemanw [Thu, 16 Jan 2014 17:29:53 +0000 (09:29 -0800)]
Merge pull request #2350 from eileenmcnaughton/CRM-14012
CRM-14012 - Contribution total values incorrect for permissioned users i...
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
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
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
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 ...
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 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
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
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 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
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 [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
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
Brian Shaughnessy [Thu, 9 Jan 2014 17:08:33 +0000 (12:08 -0500)]
CRM-13252 exit nested api if getfields/getoptions action
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
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
colemanw [Wed, 8 Jan 2014 22:44:19 +0000 (14:44 -0800)]
Merge pull request #2298 from kurund/tagset-fixes
CRM-14052: Tagset 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
projects / civicrm-core.git / log