civicrm-core.git
7 years agoCRM-16189, fee amount is not a payment
Pradeep Nayak [Thu, 25 Aug 2016 15:49:18 +0000 (21:19 +0530)]
CRM-16189, fee amount is not a payment

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

7 years agoCRM-16189, fixed sql to retrieve payments and set is_payment=false for deferred payments
Pradeep Nayak [Thu, 25 Aug 2016 14:08:18 +0000 (19:38 +0530)]
CRM-16189, fixed sql to retrieve payments and set is_payment=false for deferred payments

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

Conflicts:

CRM/Core/BAO/FinancialTrxn.php

7 years agoCRM-16189, changed code to return participant id in query
Pradeep Nayak [Sat, 20 Aug 2016 15:54:11 +0000 (21:24 +0530)]
CRM-16189, changed code to return participant id in query

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

7 years agoCRM-16189, changed the label
Pradeep Nayak [Thu, 11 Aug 2016 07:50:58 +0000 (13:20 +0530)]
CRM-16189, changed the label

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

7 years agoCRM-16189, Added add payment link on contribution search
Pradeep Nayak [Thu, 11 Aug 2016 07:16:41 +0000 (12:46 +0530)]
CRM-16189, Added add payment link on contribution search

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

7 years agoCRM-16189, added link on contribution view form
Pradeep Nayak [Thu, 11 Aug 2016 05:42:35 +0000 (11:12 +0530)]
CRM-16189, added link on contribution view form

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

7 years agoMerge pull request #9553 from colemanw/CRM-19723
colemanw [Fri, 16 Dec 2016 23:08:06 +0000 (18:08 -0500)]
Merge pull request #9553 from colemanw/CRM-19723

CRM-19723 - Activity icon improvements

7 years agoCRM-19723 - Display activity type icons in datatables
Coleman Watts [Fri, 16 Dec 2016 20:32:55 +0000 (15:32 -0500)]
CRM-19723 - Display activity type icons in datatables

7 years agoCRM-19723 - Fix activity links
Coleman Watts [Fri, 16 Dec 2016 20:32:21 +0000 (15:32 -0500)]
CRM-19723 - Fix activity links

7 years agoMerge pull request #9546 from PalanteJon/CRM-19782
Yashodha Chaku [Fri, 16 Dec 2016 08:29:03 +0000 (13:59 +0530)]
Merge pull request #9546 from PalanteJon/CRM-19782

CRM-19782 - Don't show 'View' link on printed Participant Listing reports

7 years agoMerge pull request #9548 from colemanw/Upgrade
colemanw [Thu, 15 Dec 2016 23:34:17 +0000 (18:34 -0500)]
Merge pull request #9548 from colemanw/Upgrade

Upgrade cleanup - use addColumn utility instead of sql

7 years agoUpgrade cleanup - use addColumn utility instead of sql
Coleman Watts [Thu, 15 Dec 2016 22:57:49 +0000 (17:57 -0500)]
Upgrade cleanup - use addColumn utility instead of sql

7 years agoMerge pull request #9528 from colemanw/CRM-19723
colemanw [Thu, 15 Dec 2016 22:37:29 +0000 (17:37 -0500)]
Merge pull request #9528 from colemanw/CRM-19723

CRM-19723 - Add icons for activity types

7 years agoFix upgrade error with unknown column in option_value table
Coleman Watts [Thu, 15 Dec 2016 21:13:26 +0000 (16:13 -0500)]
Fix upgrade error with unknown column in option_value table

7 years agoMerge pull request #9539 from colemanw/api
colemanw [Thu, 15 Dec 2016 21:16:23 +0000 (16:16 -0500)]
Merge pull request #9539 from colemanw/api

API Explorer: Minor usability improvements

7 years agoMerge pull request #9541 from xurizaemon/CRM-19768-comment_only
colemanw [Thu, 15 Dec 2016 20:10:11 +0000 (15:10 -0500)]
Merge pull request #9541 from xurizaemon/CRM-19768-comment_only

Document inconsistent function signature.

7 years agoCRM-19782 - Don't show 'View' link on printed Participant Listing reports
Jon goldberg [Thu, 15 Dec 2016 19:21:10 +0000 (14:21 -0500)]
CRM-19782 - Don't show 'View' link on printed Participant Listing reports

7 years agoCRM-19723 - Allow rotation of icons
Coleman Watts [Fri, 9 Dec 2016 20:40:31 +0000 (15:40 -0500)]
CRM-19723 - Allow rotation of icons

7 years agoCRM-19723 - Display activity type icons in ui
Coleman Watts [Fri, 9 Dec 2016 06:14:57 +0000 (01:14 -0500)]
CRM-19723 - Display activity type icons in ui

7 years agoCRM-19723 - Add field for option_value icon
Coleman Watts [Fri, 9 Dec 2016 04:35:29 +0000 (23:35 -0500)]
CRM-19723 - Add field for option_value icon

7 years agoSet version to 4.7.16
Tim Otten [Thu, 15 Dec 2016 16:31:34 +0000 (08:31 -0800)]
Set version to 4.7.16

7 years agoCRM-19723 - Update fontAwesome version
Coleman Watts [Fri, 9 Dec 2016 04:33:59 +0000 (23:33 -0500)]
CRM-19723 - Update fontAwesome version

7 years agoCRM-19723 - Add crmIconPicker widget
Coleman Watts [Wed, 7 Dec 2016 16:06:36 +0000 (11:06 -0500)]
CRM-19723 - Add crmIconPicker widget

7 years agoMerge pull request #9543 from xurizaemon/dev-fieldname_should_possibly
Monish Deb [Thu, 15 Dec 2016 10:31:22 +0000 (16:01 +0530)]
Merge pull request #9543 from xurizaemon/dev-fieldname_should_possibly

Improve error message for "possibly mandatory" exception.

7 years agoMerge pull request #9534 from monishdeb/CRM-19333
Monish Deb [Thu, 15 Dec 2016 10:26:21 +0000 (15:56 +0530)]
Merge pull request #9534 from monishdeb/CRM-19333

CRM-19333: Fix group_type filter in Advance Search and api

7 years agoMerge pull request #9538 from jitendrapurohit/CRM-19736
Yashodha Chaku [Thu, 15 Dec 2016 09:06:15 +0000 (14:36 +0530)]
Merge pull request #9538 from jitendrapurohit/CRM-19736

CRM-19736: PHP 7 Fatal Error on printing labels for members

7 years agoMerge pull request #9537 from jitendrapurohit/CRM-19048-add
Yashodha Chaku [Thu, 15 Dec 2016 05:55:57 +0000 (11:25 +0530)]
Merge pull request #9537 from jitendrapurohit/CRM-19048-add

CRM-19048: Fix attached operator search

7 years agoImprove error message for "possibly mandatory" exception.
Chris Burgess [Thu, 15 Dec 2016 03:29:22 +0000 (16:29 +1300)]
Improve error message for "possibly mandatory" exception.

CRM-19772

7 years agoMerge pull request #9540 from colemanw/CRM-19764
colemanw [Thu, 15 Dec 2016 02:47:19 +0000 (21:47 -0500)]
Merge pull request #9540 from colemanw/CRM-19764

CRM-19764 - Pass context when fetching custom field options

7 years agoDocument inconsistent function signature.
Chris Burgess [Thu, 15 Dec 2016 00:11:41 +0000 (13:11 +1300)]
Document inconsistent function signature.

7 years agoAPI Explorer: Make return value sortable
Coleman Watts [Wed, 14 Dec 2016 21:05:09 +0000 (16:05 -0500)]
API Explorer: Make return value sortable

7 years agoCRM-19764 - Pass context when fetching custom field options
Coleman Watts [Wed, 14 Dec 2016 15:43:40 +0000 (10:43 -0500)]
CRM-19764 - Pass context when fetching custom field options

7 years agoAPI Explorer: Remove redundant clear button for selected options
Coleman Watts [Wed, 14 Dec 2016 14:27:41 +0000 (09:27 -0500)]
API Explorer: Remove redundant clear button for selected options

7 years agoAPI Explorer: Add more options
Coleman Watts [Wed, 14 Dec 2016 02:39:06 +0000 (21:39 -0500)]
API Explorer: Add more options

7 years agoCRM-19048: Fix attached operator search
jitendrapurohit [Wed, 14 Dec 2016 08:50:55 +0000 (14:20 +0530)]
CRM-19048: Fix attached operator search

7 years agoMerge pull request #9517 from jitendrapurohit/CRM-19626-2
Yashodha Chaku [Wed, 14 Dec 2016 11:26:21 +0000 (16:56 +0530)]
Merge pull request #9517 from jitendrapurohit/CRM-19626-2

CRM-19626: Add min-amount handling to priceset

7 years agoCRM-19736: PHP 7 printing labels for members
jitendrapurohit [Wed, 14 Dec 2016 11:05:30 +0000 (16:35 +0530)]
CRM-19736: PHP 7 printing labels for members

7 years agoMerge pull request #9428 from jitendrapurohit/CRM-19662
Monish Deb [Wed, 14 Dec 2016 10:49:55 +0000 (16:19 +0530)]
Merge pull request #9428 from jitendrapurohit/CRM-19662

CRM-19662 - Fix remaining full group by clause

7 years agoMerge pull request #9480 from jitendrapurohit/CRM-17410
Monish Deb [Wed, 14 Dec 2016 10:42:37 +0000 (16:12 +0530)]
Merge pull request #9480 from jitendrapurohit/CRM-17410

CRM-17410: Using xml on upgrade (not installation) of extension to cr…

7 years agoMerge pull request #9523 from jitendrapurohit/CRM-19717
Monish Deb [Wed, 14 Dec 2016 09:52:46 +0000 (15:22 +0530)]
Merge pull request #9523 from jitendrapurohit/CRM-19717

CRM-19717: remove inline edit of class from reserved participant status

7 years agoCRM-17410: Using xml on upgrade (not installation) of extension to create/append...
jitendrapurohit [Thu, 1 Dec 2016 13:19:45 +0000 (18:49 +0530)]
CRM-17410: Using xml on upgrade (not installation) of extension to create/append new optionvalues

7 years agoCRM-19626: Add min-amount handling to priceset
jitendrapurohit [Thu, 8 Dec 2016 11:42:11 +0000 (17:12 +0530)]
CRM-19626: Add min-amount handling to priceset

7 years agoMerge pull request #9516 from jitendrapurohit/CRM-19722
Monish Deb [Wed, 14 Dec 2016 06:44:17 +0000 (12:14 +0530)]
Merge pull request #9516 from jitendrapurohit/CRM-19722

CRM-19722: Fatal Error: Unknown column 'contribution_source' in 'orde…

7 years agoadd sort order
deb.monish [Wed, 14 Dec 2016 05:57:04 +0000 (11:27 +0530)]
add sort order

7 years agoMerge pull request #9531 from civicrm/CRM-19755=1
Yashodha Chaku [Wed, 14 Dec 2016 05:12:10 +0000 (10:42 +0530)]
Merge pull request #9531 from civicrm/CRM-19755=1

CRM-19755 reverse order of html and text

7 years agoChange order of body html and text on form
Joe Murray [Tue, 13 Dec 2016 17:48:54 +0000 (12:48 -0500)]
Change order of body html and text on form

7 years agoFix group_type filter in Advance Search and api
deb.monish [Tue, 13 Dec 2016 16:23:34 +0000 (21:53 +0530)]
Fix group_type filter in Advance Search and api

7 years agoreversed L53 L52 as per @seamuslea request
Joe Murray [Tue, 13 Dec 2016 16:29:18 +0000 (11:29 -0500)]
reversed L53 L52 as per @seamuslea request

7 years agoMerge pull request #9475 from jitendrapurohit/CRM-19549
Monish Deb [Tue, 13 Dec 2016 12:57:31 +0000 (18:27 +0530)]
Merge pull request #9475 from jitendrapurohit/CRM-19549

CRM-19549 : New pledge data entry page shows hard coded $ for installments

7 years agoMerge pull request #9532 from jitendrapurohit/CRM-19263
Yashodha Chaku [Tue, 13 Dec 2016 12:27:21 +0000 (17:57 +0530)]
Merge pull request #9532 from jitendrapurohit/CRM-19263

Additional fixes for CRM-19263

7 years agoMerge pull request #9506 from monishdeb/CRM-19698
Monish Deb [Tue, 13 Dec 2016 10:42:49 +0000 (16:12 +0530)]
Merge pull request #9506 from monishdeb/CRM-19698

CRM-19698: fix and improve smart and regular group search

7 years agoAdditional fixes for CRM-19263
jitendrapurohit [Tue, 13 Dec 2016 10:38:47 +0000 (16:08 +0530)]
Additional fixes for CRM-19263

7 years agoAPI Explorer: Make param selection more convenient
Coleman Watts [Mon, 12 Dec 2016 23:16:41 +0000 (18:16 -0500)]
API Explorer: Make param selection more convenient

Auto-open param select widget, and only show params that have not been previously chosen.

7 years agoCRM-19755 reverse order of html and text
Joe Murray [Mon, 12 Dec 2016 20:37:44 +0000 (15:37 -0500)]
CRM-19755 reverse order of html and text

Make order same as rest of CiviMail

7 years agoMerge pull request #9530 from seamuslee001/CRM-19490-regression-fix
Eileen McNaughton [Mon, 12 Dec 2016 20:31:21 +0000 (09:31 +1300)]
Merge pull request #9530 from seamuslee001/CRM-19490-regression-fix

Fix regression in CRM-19490 where input field wasn't being properly set

7 years agoMerge pull request #9525 from seamuslee001/api_order_by_test
Monish Deb [Mon, 12 Dec 2016 11:09:31 +0000 (16:39 +0530)]
Merge pull request #9525 from seamuslee001/api_order_by_test

CRM-19743 Ensure that checking for id in sort column works in arrays …

7 years agoMerge pull request #9518 from monishdeb/CRM-19294
Monish Deb [Mon, 12 Dec 2016 10:19:39 +0000 (15:49 +0530)]
Merge pull request #9518 from monishdeb/CRM-19294

CRM-19294: Unable to continue on required file field

7 years agoappend empty string for currency without symbol
jitendrapurohit [Mon, 12 Dec 2016 08:39:30 +0000 (14:09 +0530)]
append empty string for currency without symbol

7 years agoMerge pull request #9479 from jitendrapurohit/CRM-19226
Monish Deb [Mon, 12 Dec 2016 05:18:59 +0000 (10:48 +0530)]
Merge pull request #9479 from jitendrapurohit/CRM-19226

CRM-19226: Fix loginUrl token in drupal

7 years agoExpand test coverage to include specified ordering
Seamus Lee [Mon, 12 Dec 2016 05:16:28 +0000 (16:16 +1100)]
Expand test coverage to include specified ordering

7 years agoFix regression in CRM-19490 where input field wasn't being properly set
Seamus Lee [Mon, 12 Dec 2016 04:22:52 +0000 (15:22 +1100)]
Fix regression in CRM-19490 where input field wasn't being properly set

7 years agoMerge pull request #9529 from xurizaemon/docfix-CRM19490
Eileen McNaughton [Mon, 12 Dec 2016 04:02:50 +0000 (17:02 +1300)]
Merge pull request #9529 from xurizaemon/docfix-CRM19490

Correct labelling of new Short Date format

7 years agoCorrect labelling of new Short Date format. Refs CRM-19490.
Chris Burgess [Mon, 12 Dec 2016 02:43:48 +0000 (15:43 +1300)]
Correct labelling of new Short Date format. Refs CRM-19490.

7 years agoCRM-19743 Ensure that checking for id in sort column works in arrays as well as strings
Seamus Lee [Fri, 9 Dec 2016 21:35:26 +0000 (08:35 +1100)]
CRM-19743 Ensure that checking for id in sort column works in arrays as well as strings

7 years agoCRM-19717: remove inline edit of class from reserved participant status
jitendrapurohit [Fri, 9 Dec 2016 12:33:30 +0000 (18:03 +0530)]
CRM-19717: remove inline edit of class from reserved participant status

7 years agorevert operator changes and shift getChildGroupIds() definition
deb.monish [Fri, 9 Dec 2016 06:08:02 +0000 (11:38 +0530)]
revert operator changes and shift getChildGroupIds() definition

7 years agoMerge pull request #9492 from monishdeb/CRM-19325
Monish Deb [Fri, 9 Dec 2016 06:39:26 +0000 (12:09 +0530)]
Merge pull request #9492 from monishdeb/CRM-19325

CRM-19325 : Search contributions that are not in any batch

7 years agoadditional improvement and unit test
deb.monish [Wed, 7 Dec 2016 16:26:04 +0000 (21:56 +0530)]
additional improvement and unit test

7 years agoCRM-19698: fix and improve smart and regular group search
deb.monish [Wed, 7 Dec 2016 10:11:30 +0000 (15:41 +0530)]
CRM-19698: fix and improve smart and regular group search

7 years agoadditonal unit test changes to assert batch contributions
deb.monish [Thu, 8 Dec 2016 05:20:22 +0000 (10:50 +0530)]
additonal unit test changes to assert batch contributions

7 years agoAdd unit test
deb.monish [Wed, 7 Dec 2016 08:46:29 +0000 (14:16 +0530)]
Add unit test

7 years agooptimization
deb.monish [Fri, 2 Dec 2016 09:36:58 +0000 (15:06 +0530)]
optimization

7 years agoStyle error.
Johan Vervloet [Thu, 8 Sep 2016 10:27:47 +0000 (12:27 +0200)]
Style error.

7 years agoCRM-19325 - enable search for contributions that are not in any batch.
Johan Vervloet [Thu, 8 Sep 2016 10:24:45 +0000 (12:24 +0200)]
CRM-19325 - enable search for contributions that are not in any batch.

7 years agoCRM-19294: Unable to continue on required file field
deb.monish [Thu, 8 Dec 2016 11:49:55 +0000 (17:19 +0530)]
CRM-19294: Unable to continue on required file field

7 years agoCRM-19722: Fatal Error: Unknown column 'contribution_source' in 'order clause'
jitendrapurohit [Wed, 7 Dec 2016 13:02:17 +0000 (18:32 +0530)]
CRM-19722: Fatal Error: Unknown column 'contribution_source' in 'order clause'

7 years agoMerge pull request #9514 from xurizaemon/docfix-20161208a
Monish Deb [Thu, 8 Dec 2016 06:55:18 +0000 (12:25 +0530)]
Merge pull request #9514 from xurizaemon/docfix-20161208a

Correct code docs for CRM_Core_Menu::get()

7 years agoMinor change
Monish Deb [Thu, 8 Dec 2016 06:52:15 +0000 (12:22 +0530)]
Minor change

7 years agoIndentationating.
Chris Burgess [Thu, 8 Dec 2016 02:26:05 +0000 (15:26 +1300)]
Indentationating.

7 years agoCorrect code docs for CRM_Core_Menu::get()
Chris Burgess [Thu, 8 Dec 2016 02:21:58 +0000 (15:21 +1300)]
Correct code docs for CRM_Core_Menu::get()

7 years agoMerge pull request #9511 from civicrm/4.7.14-rc
colemanw [Wed, 7 Dec 2016 21:04:40 +0000 (16:04 -0500)]
Merge pull request #9511 from civicrm/4.7.14-rc

Merge 4.7.14-rc into master

7 years agoMerge pull request #9510 from colemanw/CRM-19709-b
colemanw [Wed, 7 Dec 2016 20:17:04 +0000 (15:17 -0500)]
Merge pull request #9510 from colemanw/CRM-19709-b

CRM-19709 - Make status message plain-text

7 years agoMerge pull request #9443 from agh1/4.7.14-releasenotes
colemanw [Wed, 7 Dec 2016 20:15:10 +0000 (15:15 -0500)]
Merge pull request #9443 from agh1/4.7.14-releasenotes

Draft of release notes

7 years agoCRM-19709 - Make status message plain-text
Coleman Watts [Wed, 7 Dec 2016 20:14:20 +0000 (15:14 -0500)]
CRM-19709 - Make status message plain-text

7 years agoRemove pr that was reverted
colemanw [Wed, 7 Dec 2016 17:37:30 +0000 (12:37 -0500)]
Remove pr that was reverted

7 years agoMerge pull request #9502 from colemanw/CRM-18248
colemanw [Wed, 7 Dec 2016 16:59:55 +0000 (11:59 -0500)]
Merge pull request #9502 from colemanw/CRM-18248

CRM-18248 - Set quietMillis to 300 for EntityRef ajax

7 years agoRelease notes: final couple of fixes
Andrew Hunt [Wed, 7 Dec 2016 16:23:06 +0000 (11:23 -0500)]
Release notes: final couple of fixes

7 years agoRelease notes: moved version notes to folder and updated distmaker
Andrew Hunt [Wed, 7 Dec 2016 15:46:41 +0000 (10:46 -0500)]
Release notes: moved version notes to folder and updated distmaker

7 years agoRelease notes: Updated through 2016-12-06
Andrew Hunt [Wed, 7 Dec 2016 15:29:16 +0000 (10:29 -0500)]
Release notes: Updated through 2016-12-06

7 years agoRelease notes: Moved contributors to bottom, fixed some contrib names
Andrew Hunt [Fri, 2 Dec 2016 17:26:07 +0000 (12:26 -0500)]
Release notes: Moved contributors to bottom, fixed some contrib names

7 years agoMerge pull request #9505 from colemanw/wysiwyg
colemanw [Wed, 7 Dec 2016 15:11:10 +0000 (10:11 -0500)]
Merge pull request #9505 from colemanw/wysiwyg

JS Optimizations

7 years agoMerge pull request #9374 from jitendrapurohit/CRM-19048
Yashodha Chaku [Wed, 7 Dec 2016 05:44:53 +0000 (11:14 +0530)]
Merge pull request #9374 from jitendrapurohit/CRM-19048

CRM-19048 - Additional fix

7 years agoMerge pull request #9401 from jmcclelland/CRM-19656
Yashodha Chaku [Wed, 7 Dec 2016 05:20:29 +0000 (10:50 +0530)]
Merge pull request #9401 from jmcclelland/CRM-19656

CRM-19656 - Ensure user updates to subscription info succeed

7 years agoOnly load tableHeader.js for authorized users
Coleman Watts [Tue, 6 Dec 2016 23:22:38 +0000 (18:22 -0500)]
Only load tableHeader.js for authorized users

7 years agoWysiwyg js optimizations
Coleman Watts [Tue, 6 Dec 2016 23:19:14 +0000 (18:19 -0500)]
Wysiwyg js optimizations

7 years agoMerge pull request #9500 from totten/master-cxnrpc
Tim Otten [Tue, 6 Dec 2016 22:44:21 +0000 (14:44 -0800)]
Merge pull request #9500 from totten/master-cxnrpc

CRM-19721 - composer.json - Update civicrm-cxn-rpc for PHP 7

7 years agoMerge pull request #9499 from eileenmcnaughton/4.7.14-rc
Eileen McNaughton [Tue, 6 Dec 2016 20:20:44 +0000 (09:20 +1300)]
Merge pull request #9499 from eileenmcnaughton/4.7.14-rc

CRM-19298 further fix on templates.

7 years agoCRM-18248 - Set quietMillis to 300 for EntityRef ajax
Coleman Watts [Tue, 6 Dec 2016 17:44:15 +0000 (12:44 -0500)]
CRM-18248 - Set quietMillis to 300 for EntityRef ajax

7 years agoMerge pull request #9501 from yashodha/CRM-19720
Yashodha Chaku [Tue, 6 Dec 2016 07:01:34 +0000 (12:31 +0530)]
Merge pull request #9501 from yashodha/CRM-19720

CRM-19720: typo fixes

7 years agoreplace cj with $ and fix validation error
jitendrapurohit [Tue, 6 Dec 2016 06:38:28 +0000 (12:08 +0530)]
replace cj with $ and fix validation error