colemanw [Thu, 7 Jan 2016 01:00:54 +0000 (20:00 -0500)]
Merge pull request #7551 from totten/master-select
CRM_Utils_SQL_Select - Fix dedupe behavior for `select`, `groupBy`, `having`, `orderBy`.
CiviCRM [Wed, 6 Jan 2016 22:13:30 +0000 (14:13 -0800)]
CRM_Utils_SQL_Select - Fix dedupe behavior for `select`, `groupBy`, `having`, `orderBy`.
The selected columns should not be deduped at all -- when using `insertInto()`, the selected
columns need to line up with the insertion columns, and it's perfectly reasonably to re-use
the same value in multipl columns.
For th others, it's semantically OK to dedupe, but we should dedupe based on
the evaluated query expression rather than the general formula.
Dave Greenberg [Wed, 6 Jan 2016 17:42:15 +0000 (09:42 -0800)]
Merge pull request #7546 from eileenmcnaughton/CRM-16259
Crm 16259
colemanw [Wed, 6 Jan 2016 14:44:20 +0000 (09:44 -0500)]
Merge pull request #7547 from wdecraene/CRM-17776
Use names instead of labels to build form.
CiviCRM [Wed, 6 Jan 2016 11:12:57 +0000 (03:12 -0800)]
Update version to 4.7.beta7
Wim De Craene [Wed, 6 Jan 2016 09:58:08 +0000 (10:58 +0100)]
Use names instead of labels to build form.
eileenmcnaughton [Wed, 6 Jan 2016 08:23:51 +0000 (08:23 +0000)]
e-notice fix for test
Dave Greenberg [Fri, 25 Dec 2015 00:44:23 +0000 (16:44 -0800)]
CRM-16259 - Addtional fixes from Eileen to deal with failure of new unit test.
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Dave Greenberg [Tue, 22 Dec 2015 18:12:51 +0000 (10:12 -0800)]
CRM-16259 Add recordPartialPayment function and test.
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Kurund Jalmi [Wed, 6 Jan 2016 06:47:45 +0000 (12:17 +0530)]
Merge pull request #6421 from lcdservices/CRM-16968
CRM-16968 allow user creation on profile edit forms
Eileen McNaughton [Wed, 6 Jan 2016 03:47:08 +0000 (16:47 +1300)]
Merge pull request #7491 from johanv/CRM-17741-permissions_relationship_type
CRM-17741 - Permissions for RelationshipType.get API.
Tim Otten [Wed, 6 Jan 2016 00:10:14 +0000 (16:10 -0800)]
Merge pull request #7538 from totten/master-post-install
CRM-16860 - SystemInstallEvent - Fire event on first page run
Dave Greenberg [Tue, 5 Jan 2016 20:13:51 +0000 (12:13 -0800)]
Merge pull request #7457 from eileenmcnaughton/CRM-17718
CRM-17718 update repeattransaction & IPNs to prefer contribution recur data
colemanw [Tue, 5 Jan 2016 14:09:53 +0000 (09:09 -0500)]
Merge pull request #7537 from colemanw/CRM-14106
CRM-14106 - Swap CRM_Utils_Array::value for empty() when cast to boolean
Kurund Jalmi [Tue, 5 Jan 2016 14:05:36 +0000 (19:35 +0530)]
Merge pull request #7542 from jitendrapurohit/webtestmaster
webtest fixes
jitendrapurohit [Tue, 5 Jan 2016 13:21:30 +0000 (18:51 +0530)]
webtest fixes
Kurund Jalmi [Tue, 5 Jan 2016 10:48:39 +0000 (16:18 +0530)]
Merge pull request #7540 from scottpashley/update-readme
Changed development instructions link to go to updated wiki page
Scott Pashley [Tue, 5 Jan 2016 10:32:55 +0000 (10:32 +0000)]
Changed development instructions link to go to updated wiki page
Yashodha Chaku [Tue, 5 Jan 2016 06:57:32 +0000 (12:27 +0530)]
Merge pull request #7532 from eileenmcnaughton/lybunt
CRM-17680 remove custom fields from Lybunt for now since they turn ou…
Monish Deb [Tue, 5 Jan 2016 05:43:39 +0000 (11:13 +0530)]
Merge pull request #7529 from rohankatkar/Webtests_Fix_master
Webtests Fixes
CiviCRM [Tue, 5 Jan 2016 03:21:15 +0000 (19:21 -0800)]
CRM-16860 - SystemInstallEvent - Fire event on first page run
Example: This is a pre-requisite for tracking merge-friendly upgrade
tracking; during the initial installation, we need to flag any pre-existing
upgrades to avoid subsequent execution.
Coleman Watts [Tue, 5 Jan 2016 03:10:14 +0000 (22:10 -0500)]
CRM-14106 - Swap CRM_Utils_Array::value for empty() when cast to boolean
CiviCRM [Tue, 5 Jan 2016 01:46:02 +0000 (17:46 -0800)]
Core.setting.php - Declare `installed` setting
Eileen McNaughton [Mon, 4 Jan 2016 22:24:20 +0000 (11:24 +1300)]
Merge pull request #7533 from eileenmcnaughton/index
CRM-17752 add index to civicrm_financial_trxn.trxn_id
eileen [Mon, 4 Jan 2016 21:40:11 +0000 (10:40 +1300)]
CRM-17752 add index to civicrm_financial_trxn.trxn_id
https://issues.civicrm.org/jira/browse/CRM-17752
colemanw [Mon, 4 Jan 2016 21:09:34 +0000 (16:09 -0500)]
Merge pull request #7522 from colemanw/case_api
CRM-17645 - More consistent return property handling for case api
colemanw [Mon, 4 Jan 2016 20:55:35 +0000 (15:55 -0500)]
Merge pull request #7531 from JKingsnorth/CRM-17261
CRM-17261: Remove broken IDs from non-location elements on merge screen
eileen [Mon, 7 Dec 2015 09:42:56 +0000 (22:42 +1300)]
CRM-17680 remove custom fields from Lybunt for now since they turn out not to work
colemanw [Mon, 4 Jan 2016 20:27:06 +0000 (15:27 -0500)]
Merge pull request #7530 from JKingsnorth/CRM-17745
CRM-17745: Make maximum additional participants configurable
Eileen McNaughton [Mon, 4 Jan 2016 20:23:23 +0000 (09:23 +1300)]
Merge pull request #7470 from eileenmcnaughton/minor-tidy
Minor tidy up - pass through 'cancel' rather than leave as unintuitiv…
Eileen McNaughton [Mon, 4 Jan 2016 20:17:19 +0000 (09:17 +1300)]
Merge pull request #7501 from eileenmcnaughton/CRM-17751
CRM-17751 add api and form support for setting the trxn_id for a refund payment
Eileen McNaughton [Mon, 4 Jan 2016 20:16:08 +0000 (09:16 +1300)]
Merge pull request #7519 from eileenmcnaughton/CRM-17762
CRM-17762 fix pledge edit for to not needlessly delete schedule data
Tim Otten [Mon, 4 Jan 2016 19:46:47 +0000 (11:46 -0800)]
Merge pull request #7523 from lcdservices/CRM-17763
Crm 17763
JKingsnorth [Mon, 4 Jan 2016 15:06:36 +0000 (15:06 +0000)]
CRM-17261: Remove broken IDs from non-location elements
JKingsnorth [Mon, 4 Jan 2016 14:56:22 +0000 (14:56 +0000)]
Fix version number
JKingsnorth [Mon, 4 Jan 2016 13:43:22 +0000 (13:43 +0000)]
Style fixes
JKingsnorth [Mon, 4 Jan 2016 13:39:00 +0000 (13:39 +0000)]
CRM-17745 Add SQL updates to 4.7b6
JKingsnorth [Mon, 4 Jan 2016 13:34:59 +0000 (13:34 +0000)]
Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-17745
JKingsnorth [Mon, 4 Jan 2016 13:30:28 +0000 (13:30 +0000)]
Remove 4.8 SQL updates
Web Access [Mon, 4 Jan 2016 13:21:30 +0000 (18:51 +0530)]
Webtests Fixes
Brian Shaughnessy [Mon, 4 Jan 2016 11:27:52 +0000 (06:27 -0500)]
CRM-17763 postMailing hook -- use mailing ID as only param
JKingsnorth [Mon, 4 Jan 2016 10:59:24 +0000 (10:59 +0000)]
Add webtest for maximum participants configurable per event
Monish Deb [Mon, 4 Jan 2016 06:34:22 +0000 (12:04 +0530)]
Merge pull request #7518 from jitendrapurohit/CRM-17723
CRM-17723 -- Inherited Membership not created from Online Contribution Page
Tim Otten [Mon, 4 Jan 2016 02:37:56 +0000 (18:37 -0800)]
Merge pull request #7526 from totten/master-system-get
System.get API - Report on OS, httpd, multilanguage, multidomain, sapi
CiviCRM [Mon, 4 Jan 2016 01:42:45 +0000 (17:42 -0800)]
System.get API - Return whitelisted settings
CiviCRM [Sun, 3 Jan 2016 23:46:13 +0000 (15:46 -0800)]
System.get API - Report on OS, httpd, multilanguage, multidomain, sapi
colemanw [Sat, 2 Jan 2016 15:27:01 +0000 (10:27 -0500)]
Merge pull request #7525 from eileenmcnaughton/CRM-17764
CRM-17764 add pledge block region to main contribution page
eileenmcnaugton [Sat, 2 Jan 2016 07:03:54 +0000 (20:03 +1300)]
CRM-17764 add pledge block region to main contribution page
Coleman Watts [Sat, 2 Jan 2016 02:32:36 +0000 (21:32 -0500)]
Free dao memory during api basic get
Coleman Watts [Fri, 1 Jan 2016 23:02:36 +0000 (18:02 -0500)]
Case api test fixes
Saurabh Batra [Wed, 2 Dec 2015 09:59:33 +0000 (15:29 +0530)]
Include test (failing) to ensure api filters by status id.
Conflicts:
api/v3/Case.php
Coleman Watts [Fri, 1 Jan 2016 03:52:07 +0000 (22:52 -0500)]
CRM-17645 - More consistent return property handling for case api
Tim Otten [Fri, 1 Jan 2016 22:58:25 +0000 (14:58 -0800)]
Merge pull request #7524 from totten/master-datetest-jan
crmMailingRadioDateSpec.js - Fix handling of January dates
colemanw [Fri, 1 Jan 2016 22:29:28 +0000 (17:29 -0500)]
Merge pull request #7505 from konadave/flexiblejobs
CRM-17669 and CRM-17686, flexible scheduled jobs
CiviCRM [Fri, 1 Jan 2016 22:25:52 +0000 (14:25 -0800)]
crmMailingRadioDateSpec.js - Fix handling of January dates
Brian Shaughnessy [Fri, 1 Jan 2016 16:29:15 +0000 (11:29 -0500)]
CRM-17763 restore postEmailSend hook and create new postMailing hook
Coleman Watts [Fri, 1 Jan 2016 03:51:03 +0000 (22:51 -0500)]
No, this is not a "simple function"
Coleman Watts [Fri, 1 Jan 2016 03:45:47 +0000 (22:45 -0500)]
Fix api basic get return properties
Api basic get was crashing when a non-existant field was in the return properties.
But there are legitimate reasons for this e.g. apis with the ability to return extra info when requested via magic return params.
Also fixes handling of field aliases in the return properties.
colemanw [Fri, 1 Jan 2016 00:46:15 +0000 (19:46 -0500)]
Merge pull request #7517 from colemanw/caseApi
CRM-17645 - Standardize all case api select operations
David Reedy Jr [Thu, 31 Dec 2015 23:27:15 +0000 (17:27 -0600)]
CRM-17686 move from beta5 to beta6
David Reedy Jr [Thu, 31 Dec 2015 15:50:30 +0000 (09:50 -0600)]
CRM-17686 fix next_shceduled_run xml
David Reedy Jr [Tue, 29 Dec 2015 23:44:53 +0000 (17:44 -0600)]
CRM-17686 extension disable fix, tpl improvement
David Reedy Jr [Tue, 29 Dec 2015 22:42:07 +0000 (16:42 -0600)]
CRM-17686 switch to datepicker
David Reedy Jr [Tue, 29 Dec 2015 14:03:43 +0000 (08:03 -0600)]
CRM-17686 fix disabling of extension on upgrade
David Reedy Jr [Mon, 28 Dec 2015 23:50:39 +0000 (17:50 -0600)]
CRM-17686 disable flexible jobs extension...
...when upgrading.
David Reedy Jr [Mon, 28 Dec 2015 23:49:10 +0000 (17:49 -0600)]
CRM-17686 change database column name
David Reedy Jr [Mon, 28 Dec 2015 18:22:20 +0000 (12:22 -0600)]
CRM-17669 Add new run frequencies to scheduled...
jobs. Also removes run frequencies added in CRM-16500 as they are no longer needed.
David Reedy Jr [Mon, 28 Dec 2015 18:20:09 +0000 (12:20 -0600)]
CRM-17686 Add field to scheduled job form...
...to specify first/next run
Kurund Jalmi [Thu, 31 Dec 2015 20:50:33 +0000 (02:20 +0530)]
Merge pull request #7520 from rohankatkar/Tests4.7fixes
Webtets Fixes
Brian Shaughnessy [Thu, 31 Dec 2015 19:33:42 +0000 (14:33 -0500)]
CRM-17763 trigger postEmailSend hook in civimail
Web Access [Thu, 31 Dec 2015 13:13:18 +0000 (18:43 +0530)]
Webtets Fixes
jitendrapurohit [Thu, 31 Dec 2015 10:44:49 +0000 (16:14 +0530)]
further fixes for webtest
eileenmcnaugton [Thu, 31 Dec 2015 08:56:29 +0000 (21:56 +1300)]
CRM-17762 fix pledge edit for to not needlessly delete schedule data
This prevents edited schedule data being deleted when unrelated data is edited (e.g campaign, email receipt)
jitendrapurohit [Thu, 31 Dec 2015 08:37:02 +0000 (14:07 +0530)]
added doc
jitendrapurohit [Thu, 31 Dec 2015 07:29:43 +0000 (12:59 +0530)]
CRM-17723 -- Inherited Membership not created from Online Contribution Page
Coleman Watts [Thu, 31 Dec 2015 04:40:11 +0000 (23:40 -0500)]
CRM-17645 - Standardize all case api select operations
Coleman Watts [Wed, 30 Dec 2015 22:03:19 +0000 (17:03 -0500)]
API Explorer fix
colemanw [Wed, 30 Dec 2015 20:34:40 +0000 (15:34 -0500)]
Merge pull request #7516 from colemanw/Better
Better errors for core form actions
Coleman Watts [Wed, 30 Dec 2015 18:54:58 +0000 (13:54 -0500)]
Better errors for core form actions
Kurund Jalmi [Wed, 30 Dec 2015 14:50:33 +0000 (20:20 +0530)]
Merge pull request #7515 from rohankatkar/TestFixes
Tests Fixes
Web Access [Wed, 30 Dec 2015 13:02:13 +0000 (18:32 +0530)]
Tests Fixes
CiviCRM [Wed, 30 Dec 2015 10:32:43 +0000 (02:32 -0800)]
Update version to 4.7.beta6
Yashodha Chaku [Wed, 30 Dec 2015 05:04:16 +0000 (10:34 +0530)]
Merge pull request #7514 from colemanw/CRM-17758
CRM-17758 - Fix fatal error when rendering case tab
Coleman Watts [Wed, 30 Dec 2015 03:27:16 +0000 (22:27 -0500)]
Improve open case form
Coleman Watts [Wed, 30 Dec 2015 03:27:00 +0000 (22:27 -0500)]
More accurate message for addField error
Coleman Watts [Wed, 30 Dec 2015 03:26:26 +0000 (22:26 -0500)]
CRM-17758 - Fix fatal error when rendering case tab
colemanw [Wed, 30 Dec 2015 02:36:40 +0000 (21:36 -0500)]
Merge pull request #7513 from colemanw/CRM-17757
CRM-17757 - Fix metadata for CRM_Core_Form::addField
eileen [Sun, 27 Dec 2015 09:18:37 +0000 (22:18 +1300)]
CRM-17751 add refund trxn to forms
Change-Id: I8f4ad17cb2d7f9e33d853bbfc13d36fe5bacd572
Enotice fix
Change-Id: Ibea8a93291ad1963f108f5b80d7d55902ab61f66
eileen [Sun, 27 Dec 2015 03:39:34 +0000 (16:39 +1300)]
CRM-17751 add api support for setting the trxn_id for a refund
The civicrm_financial_trxn.trxn_id is set to ['refund_trxn_id'] when it is passed in.
See the tests for detail on expectations
Change-Id: Id24a9af646dde23138ac7888314f7438c4065469
add missing commas
Change-Id: I5ac41d28b17e7149b94742b26e3bc65479e1ce88
eileen [Tue, 29 Dec 2015 04:59:38 +0000 (17:59 +1300)]
Add cleanup for option groups to quick cleanup
Change-Id: Iaa10e26dbbe54f7af228a022d74b48f9107528e8
Eileen McNaughton [Tue, 29 Dec 2015 23:48:07 +0000 (12:48 +1300)]
Merge pull request #7511 from eileenmcnaughton/tests
Add cleanup for option groups to quick cleanup
Coleman Watts [Tue, 29 Dec 2015 23:09:24 +0000 (18:09 -0500)]
CRM-17757 - Fix metadata for CRM_Core_Form::addField
colemanw [Tue, 29 Dec 2015 22:37:43 +0000 (17:37 -0500)]
Merge pull request #7512 from colemanw/ext
Extension api cleanup
Coleman Watts [Tue, 29 Dec 2015 22:01:04 +0000 (17:01 -0500)]
Extension api cleanup
eileen [Tue, 29 Dec 2015 04:59:38 +0000 (17:59 +1300)]
Add cleanup for option groups to quick cleanup
Change-Id: Iaa10e26dbbe54f7af228a022d74b48f9107528e8
Eileen McNaughton [Tue, 29 Dec 2015 20:29:55 +0000 (09:29 +1300)]
Merge pull request #7510 from colemanw/ext
Add getfield specs to extension api
Monish Deb [Tue, 29 Dec 2015 18:53:35 +0000 (00:23 +0530)]
Merge pull request #7507 from jitendrapurohit/CRM-17668
CRM-17668 - logging revert: boolean breaks if reverting to null
Coleman Watts [Tue, 29 Dec 2015 15:09:30 +0000 (10:09 -0500)]
Add getfield specs to extension api
Monish Deb [Tue, 29 Dec 2015 15:04:34 +0000 (20:34 +0530)]
Merge pull request #7509 from monishdeb/unitTestFixes
Unit test fixes 4.7beta4
monishdeb [Tue, 29 Dec 2015 14:18:39 +0000 (19:48 +0530)]
unit test fixes 4.7beta4
projects / civicrm-core.git / log