civicrm-core.git
8 years agoRefactor for std to support testing & replaying
eileen [Wed, 6 Jul 2016 09:07:08 +0000 (21:07 +1200)]
Refactor for std to support testing & replaying

8 years agoMerge pull request #8648 from seamuslee001/CRM-19038
Tim Otten [Thu, 7 Jul 2016 00:23:12 +0000 (17:23 -0700)]
Merge pull request #8648 from seamuslee001/CRM-19038

CRM-19038 NFC shift safeDropFK code to SchemaHandler Class from Upgra…

8 years agoMerge pull request #8641 from civicrm/4.7.9-rc
Yashodha Chaku [Wed, 6 Jul 2016 13:58:20 +0000 (19:28 +0530)]
Merge pull request #8641 from civicrm/4.7.9-rc

Merge 4.7.9-rc into master

8 years agoMerge pull request #8675 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 10:13:25 +0000 (22:13 +1200)]
Merge pull request #8675 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 08:25:01 +0000 (20:25 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8674 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 08:24:38 +0000 (20:24 +1200)]
Merge pull request #8674 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 06:35:18 +0000 (18:35 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8673 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 06:23:22 +0000 (18:23 +1200)]
Merge pull request #8673 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 05:05:19 +0000 (17:05 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8672 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 04:42:49 +0000 (16:42 +1200)]
Merge pull request #8672 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 04:03:55 +0000 (16:03 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years ago[ready-for-core-team-review]CRM-16189, added form fields on financial account form...
Pradeep Nayak [Wed, 6 Jul 2016 03:19:35 +0000 (08:49 +0530)]
[ready-for-core-team-review]CRM-16189, added form fields on financial account form (#8581)

* CRM-16189, added form fields on financial account form

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, updated code to change class and other changes

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, fixed jenkins error

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, updated JS

8 years ago[ready-for-core-team-review]CRM-16189, added function to calculate revenue amount...
Pradeep Nayak [Wed, 6 Jul 2016 03:18:39 +0000 (08:48 +0530)]
[ready-for-core-team-review]CRM-16189, added function to calculate revenue amount for membership (#8577)

* CRM-16189, added function to calculate revenue amount for membership

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, updated function

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, fixed Jenkins error

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years ago[ready-for-core-team-review]CRM-16189, Added checks to validate financial type to...
Pradeep Nayak [Wed, 6 Jul 2016 03:18:01 +0000 (08:48 +0530)]
[ready-for-core-team-review]CRM-16189, Added checks to validate financial type to have deferred r… (#8585)

* CRM-16189, Added checks to validate financial type to have deferred relationship

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, fixed notice error and code stylings

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, updated code to include error msg

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoMerge pull request #8671 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 01:52:46 +0000 (13:52 +1200)]
Merge pull request #8671 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 01:16:00 +0000 (13:16 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8670 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 01:15:22 +0000 (13:15 +1200)]
Merge pull request #8670 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 00:20:24 +0000 (12:20 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8669 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 00:19:01 +0000 (12:19 +1200)]
Merge pull request #8669 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Tue, 5 Jul 2016 23:09:46 +0000 (11:09 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8668 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Tue, 5 Jul 2016 23:41:26 +0000 (11:41 +1200)]
Merge pull request #8668 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Tue, 5 Jul 2016 23:04:47 +0000 (11:04 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8643 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Tue, 5 Jul 2016 23:04:24 +0000 (11:04 +1200)]
Merge pull request #8643 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Tue, 5 Jul 2016 22:29:28 +0000 (10:29 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

Change-Id: Ia4d74eeddff5ea159fbbb4eead9da6ec42028d00

8 years ago[ready-for-core-team-review]CRM-16189, added code to add recognition date on contribu...
Pradeep Nayak [Tue, 5 Jul 2016 21:48:33 +0000 (03:18 +0530)]
[ready-for-core-team-review]CRM-16189, added code to add recognition date on contribution form (#8588)

* CRM-16189, added code to add recognition date on contribution form

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, added webtest

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, changed the field from date picker to drop down and added validation rule

* --CRM-16189, updated function class

* CRM-16189, added Revenue recognition date on COntribution View form

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years ago[ready-for-core-team-review]CRM-16189, added function to get previous financial item...
Pradeep Nayak [Tue, 5 Jul 2016 21:46:32 +0000 (03:16 +0530)]
[ready-for-core-team-review]CRM-16189, added function to get previous financial item for line item (#8654)

* CRM-16189, added function to get previous financial item for line item

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Added unit test for getPreviousFinancialItem

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years ago[ready-for-core-team-review]CRM-16189, added function to retrieve all financial accou...
Pradeep Nayak [Tue, 5 Jul 2016 21:45:54 +0000 (03:15 +0530)]
[ready-for-core-team-review]CRM-16189, added function to retrieve all financial account with Defe… (#8655)

* CRM-16189, added function to retrieve all financial account with Deferred revenue relationship

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Added unit test for getAllDeferredFinancialAccount function

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Fixed jenkins errors

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoMerge pull request #8665 from yashodha/CRM-16189-remove_ts
colemanw [Tue, 5 Jul 2016 21:36:52 +0000 (17:36 -0400)]
Merge pull request #8665 from yashodha/CRM-16189-remove_ts

CRM-16189: remove ts from name for more instances

8 years ago[ready-for-core-team-review]CRM-16189, added Deferred Revenue report (#8656)
Pradeep Nayak [Tue, 5 Jul 2016 21:33:45 +0000 (03:03 +0530)]
[ready-for-core-team-review]CRM-16189, added Deferred Revenue report (#8656)

* CRM-16189, added Deferred Revenue report

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, fixed jenkin errors

* CRM-16189, added Install code

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, used financial trxn table to get other details

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, added transaction date

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Fixed jenkins error

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRm-16189 Removed whitespace at EOL

8 years agoMerge pull request #8658 from JMAConsulting/CRM-16189-33
colemanw [Tue, 5 Jul 2016 21:31:42 +0000 (17:31 -0400)]
Merge pull request #8658 from JMAConsulting/CRM-16189-33

[ready-for-core-team-review]CRM-16189, modified code to fix onselection of financial account rela…

8 years agoCRM-16189: remove ts from name for more instances
yashodha [Tue, 5 Jul 2016 06:14:36 +0000 (11:44 +0530)]
CRM-16189: remove ts from name for more instances

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years ago[ready-for-core-team-review]CRM-16189, added batch filter on contribution summary...
Pradeep Nayak [Tue, 5 Jul 2016 01:01:01 +0000 (06:31 +0530)]
[ready-for-core-team-review]CRM-16189, added batch filter on contribution summary report (#8598)

* CRM-16189, added batch filter on contribution summary report

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, changed code to use same function as of Detail report to list batches

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

Conflicts:

CRM/Batch/BAO/Batch.php

* --CRM-16189, order batch by title

* CRM-16189, generalized and improved code

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, generalized and improved code

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoMerge pull request #8587 from JMAConsulting/CRM-16189-18
colemanw [Mon, 4 Jul 2016 23:24:31 +0000 (19:24 -0400)]
Merge pull request #8587 from JMAConsulting/CRM-16189-18

[ready-for-core-team-review]CRM-16189, fixed code to view payments for contribution

8 years agoMerge pull request #8580 from JMAConsulting/CRM-16189-23
colemanw [Mon, 4 Jul 2016 16:30:04 +0000 (12:30 -0400)]
Merge pull request #8580 from JMAConsulting/CRM-16189-23

[ready-for-core-team-review]--CRM-16189, generalized code, removed hardcoded values, used function

8 years agoMerge pull request #8657 from JMAConsulting/CRM-16189-32
colemanw [Mon, 4 Jul 2016 15:09:04 +0000 (11:09 -0400)]
Merge pull request #8657 from JMAConsulting/CRM-16189-32

[ready-for-core-team-review]CRM-16189 Added payments view on contribution view form

8 years ago[ready-for-core-team-review]CRM-16189, added code to validate relationship before...
Pradeep Nayak [Mon, 4 Jul 2016 15:07:29 +0000 (20:37 +0530)]
[ready-for-core-team-review]CRM-16189, added code to validate relationship before creating entrie… (#8578)

* CRM-16189, added code to validate relationship before creating entries in civicrm_entity_financial_account

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, fixed CRM test

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, added return defination

8 years agoMerge pull request #8625 from futurefirst/4.7-crm-19012
Monish Deb [Mon, 4 Jul 2016 11:14:45 +0000 (16:44 +0530)]
Merge pull request #8625 from futurefirst/4.7-crm-19012

CRM-19012 - Fix log_user_id not being recorded for REST calls

8 years agoMerge pull request #8661 from GinkgoFJG/CRM-18347
Monish Deb [Mon, 4 Jul 2016 09:31:35 +0000 (15:01 +0530)]
Merge pull request #8661 from GinkgoFJG/CRM-18347

CRM-18347: Fix fatal error caused by unnecessary params to settings API in WP environments

8 years ago[ready-for-core-team-review]CRM-16189, added code to add settings for accrual (#8573)
Pradeep Nayak [Sat, 2 Jul 2016 20:05:36 +0000 (01:35 +0530)]
[ready-for-core-team-review]CRM-16189, added code to add settings for accrual (#8573)

* CRM-16189, added code to add settings for accrual

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, added webtest

* --CRM-16189, changd code to show message on pop up and to highlight error field

* CRM-16189, fixed indentation

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, changed class name

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, changed to JS function as per doc in https://wiki.civicrm.org/confluence/display/CRMDOC/Javascript+Reference

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, removed cuft code, used on jq function to trigger click function

* CRM-16189, updated code as per standards

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoCRM-18347: Blacklisted params accidentally passed by WordPress to the settings API.
Frank J. Gómez [Sat, 2 Jul 2016 14:53:31 +0000 (10:53 -0400)]
CRM-18347: Blacklisted params accidentally passed by WordPress to the settings API.

----------------------------------------
* CRM-18347: error message after clearing security release message
  https://issues.civicrm.org/jira/browse/CRM-18347

8 years agoRemoved unused variable.
Frank J. Gómez [Sat, 2 Jul 2016 14:37:06 +0000 (10:37 -0400)]
Removed unused variable.

8 years agoCRM-16189, modified code to fix onselection of financial account relationship
Pradeep Nayak [Sat, 2 Jul 2016 03:54:46 +0000 (09:24 +0530)]
CRM-16189, modified code to fix onselection of financial account relationship

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoCRM-16189 Added payments view to contribution view
Edsel [Wed, 29 Jun 2016 10:47:47 +0000 (16:17 +0530)]
CRM-16189 Added payments view to contribution view

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoMerge pull request #8651 from nielosz/add-regions-to-summary
colemanw [Fri, 1 Jul 2016 16:48:19 +0000 (12:48 -0400)]
Merge pull request #8651 from nielosz/add-regions-to-summary

CRM-19040: Add regions to gain more flexibilty for extension developers

8 years agoCRM-16189, added function to validate toggling of deferred revenue ch… (#8572)
Pradeep Nayak [Fri, 1 Jul 2016 16:41:26 +0000 (22:11 +0530)]
CRM-16189, added function to validate toggling of deferred revenue ch… (#8572)

* CRM-16189, added function to validate toggling of deferred revenue check box

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, added ts tag for status message

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Added unit test for validateTogglingDeferredRevenue

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

Conflicts:

tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php

* --CRM-16189, removed white space

* --CRM-16189, fixed CRM test

8 years agoMerge pull request #8574 from JMAConsulting/CRM-16189-14
Yashodha Chaku [Fri, 1 Jul 2016 15:20:24 +0000 (20:50 +0530)]
Merge pull request #8574 from JMAConsulting/CRM-16189-14

CRM-16189, fixed code to export reopen batches

8 years agoCRM-16189, modified code to use variable and assign it using the variable
Pradeep Nayak [Fri, 1 Jul 2016 14:07:18 +0000 (19:37 +0530)]
CRM-16189, modified code to use variable and assign it using the variable

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoCRM-16189, fixed code to export reopen batches
Pradeep Nayak [Wed, 15 Jun 2016 15:24:19 +0000 (20:54 +0530)]
CRM-16189, fixed code to export reopen batches

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoMerge pull request #8617 from cividesk/CRM-18997-4.7
Yashodha Chaku [Fri, 1 Jul 2016 11:06:11 +0000 (16:36 +0530)]
Merge pull request #8617 from cividesk/CRM-18997-4.7

CRM-18997 DB error, incorrect truncating multibyte string

8 years agoAdd regions to gain more flexibilty for extension developers
nielosz [Fri, 1 Jul 2016 08:47:31 +0000 (10:47 +0200)]
Add regions to gain more flexibilty for extension developers

8 years agoMerge pull request #8649 from jitendrapurohit/CRM-19014
Monish Deb [Fri, 1 Jul 2016 06:55:44 +0000 (12:25 +0530)]
Merge pull request #8649 from jitendrapurohit/CRM-19014

CRM-19014 - Avoid the fix to affect Activity Dashlet.

8 years agoMerge pull request #8650 from jitendrapurohit/CRM-18803
Monish Deb [Fri, 1 Jul 2016 06:35:42 +0000 (12:05 +0530)]
Merge pull request #8650 from jitendrapurohit/CRM-18803

CRM-18803 - CiviReports REGEXP incorrectly filters selected values

8 years agoCRM-18803 - CiviReports REGEXP incorrectly filters selected values
jitendrapurohit [Fri, 1 Jul 2016 05:50:12 +0000 (11:20 +0530)]
CRM-18803 - CiviReports REGEXP incorrectly filters selected values

8 years agoCRM-19014 - Avoid the fix to affect Activity Dashlet.
jitendrapurohit [Fri, 1 Jul 2016 05:01:56 +0000 (10:31 +0530)]
CRM-19014 - Avoid the fix to affect Activity Dashlet.

8 years agoMerge pull request #8627 from nielosz/contact-icons-to-activities-list
Monish Deb [Fri, 1 Jul 2016 04:52:01 +0000 (10:22 +0530)]
Merge pull request #8627 from nielosz/contact-icons-to-activities-list

CRM-19014: Add summery/overlay icons to contacts in activities list

8 years agoFix up Tests and add in return statements
Seamus Lee [Fri, 1 Jul 2016 02:44:56 +0000 (12:44 +1000)]
Fix up Tests and add in return statements

8 years agoCRM-19038 NFC shift safeDropFK code to SchemaHandler Class from Upgrade Code
Seamus Lee [Fri, 1 Jul 2016 02:30:46 +0000 (12:30 +1000)]
CRM-19038 NFC shift safeDropFK code to SchemaHandler Class from Upgrade Code

8 years agoStyle fix
nielosz [Thu, 30 Jun 2016 13:18:33 +0000 (15:18 +0200)]
Style fix

8 years agoupper case boolean flag
sunil [Thu, 30 Jun 2016 12:33:37 +0000 (18:03 +0530)]
upper case boolean flag

8 years agoadded testcase to verify utf-8 string
sunil [Thu, 30 Jun 2016 12:27:49 +0000 (17:57 +0530)]
added testcase to verify utf-8 string

8 years agoMerge pull request #8646 from yashodha/CRM-16189
Yashodha Chaku [Thu, 30 Jun 2016 10:38:56 +0000 (16:08 +0530)]
Merge pull request #8646 from yashodha/CRM-16189

CRM-16189: remove ts from name

8 years agoDont show overlay on dashlets which limit space
nielosz [Thu, 30 Jun 2016 09:38:30 +0000 (11:38 +0200)]
Dont show overlay on dashlets which limit space

8 years agoCRM-16189: remove ts from name
yashodha [Thu, 30 Jun 2016 07:27:42 +0000 (12:57 +0530)]
CRM-16189: remove ts from name

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoMerge pull request #8642 from jitendrapurohit/CRM-12252
Monish Deb [Wed, 29 Jun 2016 12:42:51 +0000 (18:12 +0530)]
Merge pull request #8642 from jitendrapurohit/CRM-12252

CRM-12252 - Minor fixes

8 years agoMerge pull request #8638 from eileenmcnaughton/notices
Yashodha Chaku [Wed, 29 Jun 2016 11:09:24 +0000 (16:39 +0530)]
Merge pull request #8638 from eileenmcnaughton/notices

CRM-14872 adjust notice fix

8 years agoCRM-12252 - Minor fixes
jitendrapurohit [Wed, 29 Jun 2016 11:07:34 +0000 (16:37 +0530)]
CRM-12252 - Minor fixes

8 years agoMerge pull request #8521 from seamuslee001/CRM-12252
Monish Deb [Wed, 29 Jun 2016 10:26:47 +0000 (15:56 +0530)]
Merge pull request #8521 from seamuslee001/CRM-12252

CRM-12252 Add in help_pre and help_post fields for price field options

8 years agoMerge pull request #8639 from monishdeb/CRM-18389
Kurund Jalmi [Wed, 29 Jun 2016 09:14:08 +0000 (14:44 +0530)]
Merge pull request #8639 from monishdeb/CRM-18389

CRM-18389: Cannot create recurring membership contribution

8 years agoMerge pull request #8602 from eileenmcnaughton/master
Eileen McNaughton [Wed, 29 Jun 2016 07:59:32 +0000 (19:59 +1200)]
Merge pull request #8602 from eileenmcnaughton/master

CRM-18435 handling for membership type etc fields

8 years agoFix up upgrade and get it to rebuild multilingual schema after adding base columns
Seamus Lee [Wed, 29 Jun 2016 06:23:16 +0000 (16:23 +1000)]
Fix up upgrade and get it to rebuild multilingual schema after adding base columns

8 years agoCRM-18389: Cannot create recurring membership contribution
deb.monish [Wed, 29 Jun 2016 05:59:27 +0000 (11:29 +0530)]
CRM-18389: Cannot create recurring membership contribution

8 years agoMerge pull request #8632 from monishdeb/CRM-19004
Monish Deb [Wed, 29 Jun 2016 05:45:29 +0000 (11:15 +0530)]
Merge pull request #8632 from monishdeb/CRM-19004

CRM-19004: Event/BAO/Query.php role search fails

8 years agoMove upgrade to 4.7.10 version and also test to see if it needs locale in table name...
Seamus Lee [Wed, 29 Jun 2016 04:52:20 +0000 (14:52 +1000)]
Move upgrade to 4.7.10 version and also test to see if it needs locale in table name as well

8 years agoRe-run regen.sh
Seamus Lee [Wed, 29 Jun 2016 04:42:54 +0000 (14:42 +1000)]
Re-run regen.sh

8 years agoAttempt to fix issue where doesn't save to multilingual db
Seamus Lee [Thu, 23 Jun 2016 07:30:26 +0000 (17:30 +1000)]
Attempt to fix issue where doesn't save to multilingual db

8 years agoFix function calling as per comment from Eileen :)
Seamus Lee [Thu, 23 Jun 2016 04:46:16 +0000 (14:46 +1000)]
Fix function calling as per comment from Eileen :)

8 years agoShift add table to php to make use of checking if field already exists
Seamus Lee [Wed, 29 Jun 2016 04:39:19 +0000 (14:39 +1000)]
Shift add table to php to make use of checking if field already exists

8 years agofinish adding description class to help pre and help post
Seamus Lee [Mon, 20 Jun 2016 23:56:23 +0000 (09:56 +1000)]
finish adding description class to help pre and help post

8 years ago Add in help pre and help post fields to price option form
Seamus Lee [Thu, 16 Jun 2016 23:16:21 +0000 (09:16 +1000)]
 Add in help pre and help post fields to price option form

8 years agoAdd in description class and add a class for the label seprator
Seamus Lee [Wed, 29 Jun 2016 04:38:11 +0000 (14:38 +1000)]
Add in description class and add a class for the label seprator

8 years agoAdd in mulyilingual handiling in upgrade script
Seamus Lee [Mon, 6 Jun 2016 01:55:15 +0000 (11:55 +1000)]
Add in mulyilingual handiling in upgrade script

8 years agoCRM-12252 Add in help_pre and help_post fields for price field options
Seamus Lee [Wed, 29 Jun 2016 04:37:14 +0000 (14:37 +1000)]
CRM-12252 Add in help_pre and help_post fields for price field options

8 years agoCRM-14872 adjust notice fix
eileen [Wed, 29 Jun 2016 03:55:55 +0000 (15:55 +1200)]
CRM-14872 adjust notice fix

8 years agoMerge pull request #8427 from eileenmcnaughton/event_cart
Eileen McNaughton [Tue, 28 Jun 2016 21:02:39 +0000 (09:02 +1200)]
Merge pull request #8427 from eileenmcnaughton/event_cart

Event cart   CRM-16481

8 years agoCRM-19004: Event/BAO/Query.php role search fails
deb.monish [Tue, 28 Jun 2016 11:13:20 +0000 (16:43 +0530)]
CRM-19004: Event/BAO/Query.php role search fails

8 years agoFix messed display with multiple contacts in one col
nielosz [Tue, 28 Jun 2016 13:36:38 +0000 (15:36 +0200)]
Fix messed display with multiple contacts in one col

8 years agoMerge pull request #8626 from jmcclelland/CRM-18713-simple
Yashodha Chaku [Tue, 28 Jun 2016 05:16:34 +0000 (10:46 +0530)]
Merge pull request #8626 from jmcclelland/CRM-18713-simple

CRM-18713 - simple fix, ensure mobile # is not overwritten by primary.

8 years agoCRM-18713 - simple fix, ensure mobile # is not overwritten by primary.
Jamie McClelland [Mon, 27 Jun 2016 17:53:17 +0000 (13:53 -0400)]
CRM-18713 - simple fix, ensure mobile # is not overwritten by primary.

8 years agoCRM-16189, added function to validate financial type (#8570)
Pradeep Nayak [Mon, 27 Jun 2016 14:54:33 +0000 (20:24 +0530)]
CRM-16189, added function to validate financial type (#8570)

* CRM-16189, added function to validate financial type

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

Conflicts:

CRM/Financial/BAO/FinancialAccount.php

* CRM-16189 Added unit test for ValidateFinancialType

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

Conflicts:

tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php

* CRM-16189, fixed stylings

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

Conflicts:

CRM/Financial/BAO/FinancialAccount.php

* --CRM-16189, updated code and removed unwanted checks

* CRM-16189, updated class name

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, fixed array indentation

* --CRM-16189, removed conflicts

* --CRM-16189, fixed return value to use it as bool

8 years ago Add summery-overlay contact icons to activity's participants
nielosz [Mon, 27 Jun 2016 14:51:01 +0000 (16:51 +0200)]
 Add summery-overlay contact icons to activity's participants

When listing activities, the contacts columns are enriched with the contact type icons opening summary overlay on hover.

8 years agoMerge pull request #8623 from yashodha/fix-version
Yashodha Chaku [Mon, 27 Jun 2016 05:08:29 +0000 (10:38 +0530)]
Merge pull request #8623 from yashodha/fix-version

Set version to 4.7.10

8 years ago--CRM-16189, don't add entries for line qty is 0
Pradeep Nayak [Wed, 15 Jun 2016 19:35:04 +0000 (01:05 +0530)]
--CRM-16189, don't add entries for line qty is 0

8 years agoCRM-16189, fixed sql for fetching payment for partial paid contribution
Pradeep Nayak [Wed, 15 Jun 2016 19:33:45 +0000 (01:03 +0530)]
CRM-16189, fixed sql for fetching payment for partial paid contribution

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years ago--CRM-16189, removed spaces
Pradeep Nayak [Sun, 26 Jun 2016 23:34:37 +0000 (05:04 +0530)]
--CRM-16189, removed spaces

8 years ago--CRM-16189, added ts tag
Pradeep Nayak [Sun, 26 Jun 2016 23:04:04 +0000 (04:34 +0530)]
--CRM-16189, added ts tag

8 years ago--CRM-16189, generalized code, removed hardcoded values, used function
Pradeep Nayak [Wed, 15 Jun 2016 20:17:28 +0000 (01:47 +0530)]
--CRM-16189, generalized code, removed hardcoded values, used function

8 years agoCRM-19012 set @civicrm_user_id in the DB for REST calls
David Knoll [Sun, 26 Jun 2016 22:13:23 +0000 (23:13 +0100)]
CRM-19012 set @civicrm_user_id in the DB for REST calls

8 years agoSet version to 4.7.10
yashodha [Sun, 26 Jun 2016 13:37:03 +0000 (19:07 +0530)]
Set version to 4.7.10

8 years agoMerge pull request #8529 from eileenmcnaughton/reports
Yashodha Chaku [Sun, 26 Jun 2016 11:42:02 +0000 (17:12 +0530)]
Merge pull request #8529 from eileenmcnaughton/reports

CRM-17154 report actions improvement

8 years agoMerge pull request #8456 from eileenmcnaughton/merge_perms
Yashodha Chaku [Sun, 26 Jun 2016 11:37:52 +0000 (17:07 +0530)]
Merge pull request #8456 from eileenmcnaughton/merge_perms

Dedupe fixes (many)