systopia [Thu, 13 Oct 2016 10:48:20 +0000 (11:48 +0100)]
implementing @eileen's suggestions:
- style
- extra test
- documentation
- FIXME remarks
systopia [Wed, 12 Oct 2016 21:51:26 +0000 (22:51 +0100)]
obeying master jenkins
obeying master jenkins
systopia [Wed, 12 Oct 2016 20:47:32 +0000 (21:47 +0100)]
using new Permission::allowList to fix CRM-12645
systopia [Wed, 12 Oct 2016 20:21:08 +0000 (21:21 +0100)]
finished unit tests
systopia [Wed, 12 Oct 2016 20:19:50 +0000 (21:19 +0100)]
fixed bug in the original function
systopia [Wed, 12 Oct 2016 20:19:12 +0000 (21:19 +0100)]
fixed: EDIT implies VIEW
systopia [Wed, 12 Oct 2016 13:02:06 +0000 (14:02 +0100)]
unit tests for new list permission functions (wip)
systopia [Wed, 12 Oct 2016 11:28:01 +0000 (12:28 +0100)]
unit tests for new list permission functions (wip)
systopia [Wed, 12 Oct 2016 11:27:42 +0000 (12:27 +0100)]
adding new list permission functions (wip)
systopia [Tue, 11 Oct 2016 23:55:16 +0000 (00:55 +0100)]
started unit tests for new list permission functions
systopia [Tue, 11 Oct 2016 23:54:54 +0000 (00:54 +0100)]
cleanup and documentation
systopia [Tue, 11 Oct 2016 23:53:17 +0000 (00:53 +0100)]
added check for 'view/edit my contact'
systopia [Tue, 11 Oct 2016 23:51:28 +0000 (00:51 +0100)]
added new list permission functions
Eileen McNaughton [Mon, 24 Oct 2016 01:32:08 +0000 (14:32 +1300)]
Merge pull request #9312 from cividesk/CRM-3795-4.7
CRM-3795: Full fix
Eileen McNaughton [Mon, 24 Oct 2016 01:28:44 +0000 (14:28 +1300)]
Merge pull request #9302 from systopia/CRM-19639-2
CRM-19539 proposed fix (version 2)
Eileen McNaughton [Mon, 24 Oct 2016 00:45:44 +0000 (13:45 +1300)]
Merge pull request #9308 from fuzionnz/case_api_case_id
CRM-19552: If no case_id provided to Case API, use the provided ID.
Nicolas Ganivet [Sun, 23 Oct 2016 21:30:34 +0000 (15:30 -0600)]
Style issues.
Nicolas Ganivet [Sun, 23 Oct 2016 21:24:35 +0000 (15:24 -0600)]
Full fix: Bcc addresses no longer shown to recipients when PEAR mailer is not Mail_mail.
Tim Otten [Fri, 21 Oct 2016 19:51:02 +0000 (12:51 -0700)]
Merge pull request #8944 from totten/master-givi
bin/givi - Add backdrop support
Monish Deb [Fri, 21 Oct 2016 11:21:55 +0000 (16:51 +0530)]
Merge pull request #9303 from tschuettler/CRM-19550
CRM-19550: CRM_Event_Form_Participant - Fix duplicate event registra…
Chris Burgess [Fri, 21 Oct 2016 03:41:06 +0000 (16:41 +1300)]
If no case_id provided to Case API, use the provided ID.
CRM-19552
Tim Otten [Thu, 20 Oct 2016 19:36:02 +0000 (12:36 -0700)]
Merge pull request #9268 from seamuslee001/CRM-19463
CRM-19463 Get E2E tests working on php7
colemanw [Thu, 20 Oct 2016 14:42:00 +0000 (10:42 -0400)]
Merge pull request #9211 from JMAConsulting/CRM-19485
[ready-for-core-team-review]CRM-19485, Fixed selector issue on Batch Transaction form
Pradeep Nayak [Thu, 20 Oct 2016 13:10:58 +0000 (18:40 +0530)]
CRM-19485, removed async method since its depricated and called function for toggling in success
----------------------------------------
* CRM-19485: Selector issue on Batch trxn assignment page
https://issues.civicrm.org/jira/browse/CRM-19485
Thomas Schüttler [Thu, 20 Oct 2016 13:09:55 +0000 (15:09 +0200)]
CRM-19550 - CRM_Event_Form_Participant - Fix duplicate event registrations for standalone form
Pradeep Nayak [Tue, 11 Oct 2016 15:25:25 +0000 (20:55 +0530)]
CRM-19485, Fixed selector issue on Batch Transaction form
----------------------------------------
* CRM-19485: Selector issue on Batch trxn assignment page
https://issues.civicrm.org/jira/browse/CRM-19485
Monish Deb [Thu, 20 Oct 2016 12:15:05 +0000 (17:45 +0530)]
Merge pull request #9296 from michaelmcandrew/grant-api-contact-required
CRM-19543: contact_id should be marked as required on grant api
systopia [Wed, 19 Oct 2016 07:58:36 +0000 (09:58 +0200)]
fix CRM-19539 (adjusted call signature)
Monish Deb [Thu, 20 Oct 2016 05:41:14 +0000 (11:11 +0530)]
Merge pull request #9297 from monishdeb/CRM-19541
CRM-19541: Custom Date Range saved search doesn't sets default values to the input
Seamus Lee [Wed, 19 Oct 2016 23:35:12 +0000 (10:35 +1100)]
Ensure that only strings get encoded
Seamus Lee [Mon, 17 Oct 2016 00:15:34 +0000 (11:15 +1100)]
get php to detect encoding
Seamus Lee [Sun, 16 Oct 2016 23:44:17 +0000 (10:44 +1100)]
Add in docblock of new function
Seamus Lee [Sun, 16 Oct 2016 01:44:04 +0000 (12:44 +1100)]
CRM-19463 Proper fix to get E2E tests passing ensure that arrays are utf-8 encoded
Seamus Lee [Sun, 16 Oct 2016 01:44:04 +0000 (12:44 +1100)]
CRM-19463 Get E2E tests working on php7
Tim Otten [Wed, 19 Oct 2016 22:01:57 +0000 (15:01 -0700)]
bin/givi - Update to satisfy civilint
Monish Deb [Wed, 19 Oct 2016 19:11:01 +0000 (00:41 +0530)]
Merge pull request #9295 from JMAConsulting/CRM-19540
CRM-19540 Bypassed auto name creation when specified in params
colemanw [Wed, 19 Oct 2016 17:49:51 +0000 (13:49 -0400)]
Merge pull request #9291 from colemanw/CRM-19535
CRM-19535 - Conditionally add is_active param to entityRef
Michael McAndrew [Wed, 19 Oct 2016 14:13:10 +0000 (15:13 +0100)]
two more fields that should be required by the grant api
Edsel [Wed, 19 Oct 2016 13:58:53 +0000 (19:28 +0530)]
CRM-19540 Fixed API test failures
----------------------------------------
* CRM-19540: UFGroup API does not respect name parameter
https://issues.civicrm.org/jira/browse/CRM-19540
deb.monish [Wed, 19 Oct 2016 13:01:25 +0000 (18:31 +0530)]
CRM-19541: Custom Date Range saved search doesn't sets default values to the input
Monish Deb [Wed, 19 Oct 2016 11:52:20 +0000 (17:22 +0530)]
Merge pull request #9284 from monishdeb/CRM-19513
CRM-19513: Saved search is incorrectly using IN rather than BETWEEN f…
Edsel [Wed, 19 Oct 2016 09:51:47 +0000 (15:21 +0530)]
CRM-19540 Bypassed auto name creation when specified in params
----------------------------------------
* CRM-19540: UFGroup API does not respect name parameter
https://issues.civicrm.org/jira/browse/CRM-19540
Monish Deb [Wed, 19 Oct 2016 09:06:12 +0000 (14:36 +0530)]
Merge pull request #9288 from jmcclelland/CRM-19536
CRM-19536 - ensure type is defined for campaign_id
Monish Deb [Wed, 19 Oct 2016 04:51:33 +0000 (10:21 +0530)]
Merge pull request #9292 from jitendrapurohit/removedebug
remove accidental debug stmt
jitendrapurohit [Wed, 19 Oct 2016 04:49:22 +0000 (10:19 +0530)]
remove accidental debug stmt
colemanw [Wed, 19 Oct 2016 04:19:18 +0000 (00:19 -0400)]
Merge pull request #9289 from colemanw/CRM-18953
CRM-18953 - Better cleanup of news widget markup
colemanw [Wed, 19 Oct 2016 00:53:16 +0000 (20:53 -0400)]
Merge pull request #9285 from agh1/CRM-19533
CRM-19533 System check: check for writable directories
colemanw [Wed, 19 Oct 2016 00:47:35 +0000 (20:47 -0400)]
Merge pull request #9283 from jitendrapurohit/CRM-19529
CRM-19529 - PHP7-Upcoming/Recent Case Activities results into 'Networ…
Coleman Watts [Wed, 19 Oct 2016 00:19:51 +0000 (20:19 -0400)]
CRM-19535 - Conditionally add is_active param to entityRef
Coleman Watts [Wed, 19 Oct 2016 00:13:55 +0000 (20:13 -0400)]
CRM-18953 - Better cleanup of news widget markup
colemanw [Tue, 18 Oct 2016 23:39:48 +0000 (19:39 -0400)]
Merge pull request #9287 from francescbassas/patch-9
CRM-19313 - Can't assign custom group to relationships with two conta…
Jamie McClelland [Tue, 18 Oct 2016 20:41:50 +0000 (16:41 -0400)]
CRM-19536 - ensure type is defined for campaign_id
colemanw [Tue, 18 Oct 2016 19:51:31 +0000 (15:51 -0400)]
Merge pull request #9282 from francescbassas/patch-8
CRM-19528 Internationalise "Select Code" on contributions page widget…
francescbassas [Tue, 18 Oct 2016 19:16:22 +0000 (21:16 +0200)]
CRM-19313 - Can't assign custom group to relationships with two contact subtypes involved
Andrew Hunt [Tue, 18 Oct 2016 18:43:00 +0000 (14:43 -0400)]
CRM-19533 System check: check for writable directories
Michael McAndrew [Tue, 18 Oct 2016 13:50:51 +0000 (14:50 +0100)]
contact_id should be marked as required on grant api
deb.monish [Tue, 18 Oct 2016 13:31:56 +0000 (19:01 +0530)]
CRM-19513: Saved search is incorrectly using IN rather than BETWEEN for custom fields for civicrm group cache
jitendrapurohit [Tue, 18 Oct 2016 09:46:11 +0000 (15:16 +0530)]
CRM-19529 - PHP7-Upcoming/Recent Case Activities results into 'Network Error'
francescbassas [Tue, 18 Oct 2016 08:44:28 +0000 (10:44 +0200)]
CRM-19528 Internationalise "Select Code" on contributions page widget tab
Monish Deb [Tue, 18 Oct 2016 07:13:27 +0000 (12:43 +0530)]
Merge pull request #9011 from jernic/jernic-patch-1
Select correct activity if more than one in upcoming or recent period
colemanw [Tue, 18 Oct 2016 00:30:18 +0000 (20:30 -0400)]
Merge pull request #9280 from colemanw/CRM-19512
CRM-19512 - Return en_US by default from getLocale
Coleman Watts [Mon, 17 Oct 2016 23:40:01 +0000 (19:40 -0400)]
CRM-19512 - Return en_US by default from getLocale
Yashodha Chaku [Mon, 17 Oct 2016 10:00:38 +0000 (15:30 +0530)]
Merge pull request #9274 from yashodha/CRM-19511
CRM-19511: Disabled fields still visible in Import Multi-value Custom…
Yashodha Chaku [Mon, 17 Oct 2016 08:43:47 +0000 (14:13 +0530)]
Merge pull request #9269 from fuzionnz/trivia-
20161017a
Comment clarification.
Yashodha Chaku [Mon, 17 Oct 2016 07:39:33 +0000 (13:09 +0530)]
CRM-19511: Disabled fields still visible in Import Multi-value Custom Data
Chris Burgess [Sun, 16 Oct 2016 20:28:24 +0000 (09:28 +1300)]
Comment clarification.
"call a task" => "add a task", since we do not directly call runSQL method.
Eileen McNaughton [Fri, 14 Oct 2016 22:37:51 +0000 (23:37 +0100)]
Merge pull request #9266 from JohnFF/CRM-17616
Crm 17616
Eileen McNaughton [Fri, 14 Oct 2016 21:59:07 +0000 (22:59 +0100)]
Merge pull request #9253 from seamuslee001/CRM-19490
CRM-19490 Add in a shortdate format setting and ensure that date fiel…
John Kirk [Fri, 14 Oct 2016 21:42:41 +0000 (22:42 +0100)]
Removed the magic number 500.
Eileen McNaughton [Fri, 14 Oct 2016 21:20:39 +0000 (22:20 +0100)]
Merge pull request #8707 from lcdservices/CRM-19079
CRM-19079 condition profile edit permission check
Samuel Vanhove [Thu, 16 Jun 2016 21:30:55 +0000 (17:30 -0400)]
CRM-17616 - Moving to an arbitrary search page result could lead to incomplete results
Eileen McNaughton [Fri, 14 Oct 2016 20:56:36 +0000 (21:56 +0100)]
Merge pull request #9259 from sqweets/customRelationshipsExport
CRM-19471 - Custom relationships for custom contact types not availab…
Eileen McNaughton [Fri, 14 Oct 2016 20:55:07 +0000 (21:55 +0100)]
Merge pull request #8751 from eileenmcnaughton/groupOrg
CRM-19122 Group Organization & parent default code should be the same
Monish Deb [Fri, 14 Oct 2016 20:30:14 +0000 (02:00 +0530)]
Merge pull request #9066 from seamuslee001/CRM-19380
CRM-19380 allow for multiple from email addresses but only one per do…
Eileen McNaughton [Fri, 14 Oct 2016 17:55:56 +0000 (18:55 +0100)]
Merge pull request #9187 from sqweets/ExportHeadersRelationships
CRM-19472 - Export headers for relationships are in machine name format
Eileen McNaughton [Fri, 14 Oct 2016 17:46:40 +0000 (18:46 +0100)]
Merge pull request #8466 from totten/master-path-warning
CRM_Utils_Check - Suggest using `[cms.root]`, etal
Eileen McNaughton [Fri, 14 Oct 2016 17:39:15 +0000 (18:39 +0100)]
Merge pull request #9262 from colemanw/caseApi
Remove phony fk info from case api
Tim Otten [Fri, 14 Oct 2016 17:21:20 +0000 (18:21 +0100)]
Set version to 4.7.14
Tim Otten [Fri, 14 Oct 2016 17:12:22 +0000 (18:12 +0100)]
CRM_UpgradeIncremental_php_FourSeven - Typo
Tim Otten [Fri, 14 Oct 2016 17:09:41 +0000 (18:09 +0100)]
Merge pull request #9260 from totten/master-error-mysql
CRM-19505 - CRM_Core_Error::handle() - Fix detection of mysql driver
Tim Otten [Fri, 14 Oct 2016 16:47:52 +0000 (17:47 +0100)]
Merge pull request #9261 from totten/master-flaky-crm19133
CRM_Contact_BAO_ContactType_ContactTest.testCRM19133 - Fix flaky test
Tim Otten [Fri, 14 Oct 2016 16:28:26 +0000 (17:28 +0100)]
Merge pull request #9258 from eileenmcnaughton/group_fix
CRM-19311 limit hidden groups to those passed in if is set
Eileen McNaughton [Fri, 14 Oct 2016 16:22:32 +0000 (17:22 +0100)]
Merge pull request #9249 from samuelsov/CRM-19093
CRM-19093 - i18n executeQuery regex pb
Coleman Watts [Fri, 14 Oct 2016 15:30:16 +0000 (11:30 -0400)]
Remove phony fk info from case api
Tim Otten [Fri, 14 Oct 2016 15:12:45 +0000 (16:12 +0100)]
CRM_Contact_BAO_ContactType_ContactTest.testCRM19133 - Fix flaky test
This test seems to involve creation of a custom-data group with a randomly
generated name. The random name sometimes begins with a number, which leads
to awkward SQL queries like:
```
INSERT INTO civicrm_value_15e5f1d45a5896753463467e8c380144_1 ( 15e5f1d45a5896753463467e8c380144_1,entity_id ) VALUES (...)
```
This patch updates `CRM_Core_BAO_CustomValueTable` to perform proper escaping on the column name.
Ellen Hendricks [Fri, 14 Oct 2016 14:51:41 +0000 (09:51 -0500)]
CRM-19471 - Custom relationships for custom contact types not available during export
----------------------------------------
* CRM-19471: Custom relationships for custom contact types not available during export
https://issues.civicrm.org/jira/browse/CRM-19471
Samuel Vanhove [Fri, 14 Oct 2016 14:41:00 +0000 (10:41 -0400)]
CRM-19093 adding comments
Ellen Hendricks [Fri, 14 Oct 2016 14:40:33 +0000 (09:40 -0500)]
CRM-19472 Moved call to manipulateHeadeRows to right after the are built
----------------------------------------
* CRM-19472: Export headers for relationships are in "machine name" format
https://issues.civicrm.org/jira/browse/CRM-19472
Tim Otten [Fri, 14 Oct 2016 14:17:20 +0000 (15:17 +0100)]
CRM-19505 - CRM_Core_Error::handle() - Fix detection of mysql driver
The check `preg_match('/^mysql:/', $_DB_DATAOBJECT['CONFIG']['database'])`
assumes that the admin is manually changing `CIVICRM_DSN` to indicate
preferred driver. Since we determine the driver automatically in 4.7.12+,
this check doesn't work.
This new check determines what driver is actually in use.
eileen [Fri, 14 Oct 2016 14:05:51 +0000 (15:05 +0100)]
CRM-19311 limit hidden groups to those passed in if is set
Monish Deb [Fri, 14 Oct 2016 12:55:01 +0000 (18:25 +0530)]
Merge pull request #9239 from jitendrapurohit/CRM-19443
CRM-19443 - Fix date tokens in Print/Merge Task
Tim Otten [Fri, 14 Oct 2016 12:18:25 +0000 (13:18 +0100)]
Merge pull request #9013 from ggargani/CRM-18199
CRM-18199 CRM_Utils_File::sourceSQLFile too greedy
Monish Deb [Fri, 14 Oct 2016 12:08:54 +0000 (17:38 +0530)]
Merge pull request #9256 from eileenmcnaughton/CRM-19311
CRM-19311 extend group permission to include own hidden groups
eileen [Fri, 14 Oct 2016 11:09:45 +0000 (12:09 +0100)]
CRM-19311 extend group permission to include own hidden groups
Eileen McNaughton [Fri, 14 Oct 2016 11:02:27 +0000 (12:02 +0100)]
Merge pull request #9048 from JMAConsulting/CRM-19310
CRM-19310: removed upgrade code that inserts the financial accounts f…
Eileen McNaughton [Fri, 14 Oct 2016 09:34:17 +0000 (10:34 +0100)]
Merge pull request #9203 from colemanw/CRM-19448
CRM-19448 - Enable api joins across entity_table/entity_id fields
Eileen McNaughton [Fri, 14 Oct 2016 09:26:19 +0000 (10:26 +0100)]
Merge pull request #9254 from eileenmcnaughton/stoob
CRM-19478 handle wierd contribution page id
Eileen McNaughton [Fri, 14 Oct 2016 08:47:20 +0000 (09:47 +0100)]
Merge pull request #9228 from colemanw/CRM-17785
CRM-17785 - js cleanup on contribution forms
Eileen McNaughton [Fri, 14 Oct 2016 08:41:03 +0000 (09:41 +0100)]
Merge pull request #9244 from davejenx/CRM-19148-merge-on-hold-test
CRM-19148 - added test testBatchMergeEmailOnHold.
Eileen McNaughton [Fri, 14 Oct 2016 08:40:29 +0000 (09:40 +0100)]
Merge pull request #9252 from monishdeb/CRM-19502
CRM-19502: Export of contacts generating asort/foreach warnings