Eileen McNaughton [Fri, 26 Jun 2015 02:17:54 +0000 (14:17 +1200)]
Merge pull request #6090 from eileenmcnaughton/master
CRM-16417 towards incorporating follow on refactors
Eileen McNaughton [Thu, 25 Jun 2015 23:44:28 +0000 (11:44 +1200)]
CRM-16417 towards incorporating follow on refactors
The work on CRM-16417 allows a bunch of follow on refactors. As this one involves extracting it creates a hard to read patch
to it has been pulled out to a separate PR
Dave Greenberg [Thu, 25 Jun 2015 21:20:53 +0000 (14:20 -0700)]
Merge pull request #6076 from mallezie/crm-16707
CRM-16707 Make token usage the responsibality of the form
colemanw [Thu, 25 Jun 2015 17:57:45 +0000 (13:57 -0400)]
Merge pull request #6061 from colemanw/require_once
Remove unnecessary require_once
Monish Deb [Thu, 25 Jun 2015 12:44:23 +0000 (18:14 +0530)]
Merge pull request #5729 from mlutfy/47-crm14588
CRM-14588: Format date fields in contribution confirm page.
Monish Deb [Thu, 25 Jun 2015 12:43:41 +0000 (18:13 +0530)]
Merge pull request #6010 from eileenmcnaughton/CRM-16675-2
CRM-16675 move functions only used by (deprecated) contribution proce…
Yashodha Chaku [Thu, 25 Jun 2015 11:27:31 +0000 (16:57 +0530)]
Merge pull request #6065 from yashodha/CRM-16665.master
CRM-16665: add followup functionality for email
Monish Deb [Thu, 25 Jun 2015 10:43:42 +0000 (16:13 +0530)]
Merge pull request #5593 from relldoesphp/CRM-15992
CRM-15992 update primary membership
Monish Deb [Thu, 25 Jun 2015 10:15:43 +0000 (15:45 +0530)]
Merge pull request #6074 from johanv/CRM-16736_null
CRM-16736 - changed 'null' into NULL.
yashodha [Thu, 25 Jun 2015 08:53:34 +0000 (14:23 +0530)]
CRM-16665: fix variable
----------------------------------------
* CRM-16665: Add followup activity to "Send Email" form
https://issues.civicrm.org/jira/browse/CRM-16665
Yashodha Chaku [Thu, 25 Jun 2015 06:37:15 +0000 (12:07 +0530)]
Merge pull request #6086 from Seb35/master
CRM-16740 - No possibility to select "no premium image"
Eileen McNaughton [Thu, 25 Jun 2015 03:53:20 +0000 (15:53 +1200)]
Merge pull request #6084 from eileenmcnaughton/CRM-16417
CRM-16417 always create contributions, even if failed
Eileen McNaughton [Thu, 25 Jun 2015 01:38:51 +0000 (13:38 +1200)]
Merge pull request #6082 from eileenmcnaughton/master
Code tidyups towards test fix & CRM-16402
Eileen McNaughton [Thu, 25 Jun 2015 00:02:23 +0000 (12:02 +1200)]
CRM-16417 fix paramter name
Eileen McNaughton [Wed, 24 Jun 2015 23:59:51 +0000 (11:59 +1200)]
CRM-16417 save trxn_id when completing status
Eileen McNaughton [Wed, 24 Jun 2015 23:50:33 +0000 (11:50 +1200)]
CRM-16417 complete transaction when result shows it succeeded
Eileen McNaughton [Wed, 24 Jun 2015 23:43:16 +0000 (11:43 +1200)]
CRM-16471 since pending payments exist now the checkDupe function needs to include the contribution ID in the check
Eileen McNaughton [Wed, 24 Jun 2015 23:36:33 +0000 (11:36 +1200)]
CRM-16417 improve error presentation
Dave Greenberg [Wed, 24 Jun 2015 23:26:54 +0000 (16:26 -0700)]
Merge pull request #6066 from jitendrapurohit/CRM-16715
Fix for CRM-16715 and CRM-16714 - implement mode, median and Fiscal year grouping in Contribution Summary Reports and Find Contribution Page
Eileen McNaughton [Wed, 24 Jun 2015 21:45:40 +0000 (09:45 +1200)]
enotice fix
Eileen McNaughton [Wed, 24 Jun 2015 21:19:48 +0000 (09:19 +1200)]
enotice fix (removed empty declaration of this var while removing unused var
Eileen McNaughton [Wed, 24 Jun 2015 11:42:59 +0000 (23:42 +1200)]
enotice fix
Eileen McNaughton [Wed, 24 Jun 2015 11:39:29 +0000 (23:39 +1200)]
remove unused parameters
Eileen McNaughton [Wed, 24 Jun 2015 11:39:11 +0000 (23:39 +1200)]
fix error where 4.6 change was not merged correctly to
Change affects adding a paramter to the function signature
Eileen McNaughton [Wed, 24 Jun 2015 11:38:21 +0000 (23:38 +1200)]
towards CRM-16402, improve payment processor loading.
In this case we stop calling a deprecated function & filter through loaded in to get the
recurring processors and re-introduce caching of payment processors
Eileen McNaughton [Wed, 24 Jun 2015 11:35:40 +0000 (23:35 +1200)]
towards test fixes, enforce unique trxn_id from dummy payment processor. as otherwise
erwise during test runs the same one can be set twice is the first has not yet been saved to the DB
Seb35 [Wed, 24 Jun 2015 14:35:40 +0000 (16:35 +0200)]
CRM-16740 - No possibility to select "no premium image"
Monish Deb [Wed, 24 Jun 2015 13:53:44 +0000 (19:23 +0530)]
Merge pull request #6085 from rohankatkar/webtest--master
Webtest for contribution search by premiums
Web Access [Wed, 24 Jun 2015 13:42:56 +0000 (19:12 +0530)]
Webtest for contribution search by premiums
Eileen McNaughton [Wed, 24 Jun 2015 13:05:28 +0000 (01:05 +1200)]
CRM-16417 tests passing on not deleting failed transaction from contribution page,
also towards CRM-16737 & the general principle of 2-step payment creating
Eileen McNaughton [Wed, 24 Jun 2015 11:35:40 +0000 (23:35 +1200)]
towards test fixes, enforce unique trxn_id from dummy payment processor. as otherwise
erwise during test runs the same one can be set twice is the first has not yet been saved to the DB
Eileen McNaughton [Wed, 24 Jun 2015 12:50:55 +0000 (00:50 +1200)]
CRM-16417 always create a pending contribution in direct payment mode
Eileen McNaughton [Wed, 24 Jun 2015 12:41:21 +0000 (00:41 +1200)]
Rename financial type & assign to form in one place
Eileen McNaughton [Wed, 24 Jun 2015 12:38:13 +0000 (00:38 +1200)]
CRM-16407 use new factory class fo instantiating payment processors
Eileen McNaughton [Wed, 24 Jun 2015 12:33:21 +0000 (00:33 +1200)]
rename test functions to make them easier to filter on
Eileen McNaughton [Wed, 24 Jun 2015 12:23:41 +0000 (00:23 +1200)]
CRM-16417 add test
Eileen McNaughton [Wed, 24 Jun 2015 12:19:16 +0000 (00:19 +1200)]
CRM-16417 extract main processing into testable function
Eileen McNaughton [Wed, 24 Jun 2015 12:13:44 +0000 (00:13 +1200)]
CRM-16417 towards not deleting contributions when a payment failes
Monish Deb [Wed, 24 Jun 2015 12:50:58 +0000 (18:20 +0530)]
Merge pull request #6083 from sudhabisht/apiFix
Remove hardcode value
Sudha Bisht [Wed, 24 Jun 2015 12:38:21 +0000 (18:08 +0530)]
Remove hardcode value
Eileen McNaughton [Wed, 24 Jun 2015 12:25:47 +0000 (00:25 +1200)]
Merge pull request #6081 from sudhabisht/apiFix
Fix Api Test Failure
Monish Deb [Wed, 24 Jun 2015 12:18:26 +0000 (17:48 +0530)]
Merge pull request #6071 from sudhabisht/CRM-16719
Added column to activity summary report.
Monish Deb [Wed, 24 Jun 2015 11:30:53 +0000 (17:00 +0530)]
Merge pull request #6077 from onlyjob/CRM-16731
CRM-16731: correct AGPL version number.
Sudha Bisht [Wed, 24 Jun 2015 11:21:00 +0000 (16:51 +0530)]
warning fix
Sudha Bisht [Tue, 23 Jun 2015 12:04:14 +0000 (17:34 +0530)]
Test Fix
Sudha Bisht [Tue, 23 Jun 2015 10:58:18 +0000 (16:28 +0530)]
Upgrade Changes
Sudha Bisht [Tue, 23 Jun 2015 07:07:22 +0000 (12:37 +0530)]
Added field in activity summary report
Eileen McNaughton [Wed, 24 Jun 2015 10:39:04 +0000 (22:39 +1200)]
Merge pull request #6080 from eileenmcnaughton/master
test & comment fixes - unrelated failures
Monish Deb [Wed, 24 Jun 2015 09:52:25 +0000 (15:22 +0530)]
Merge pull request #6078 from jitendrapurohit/CRM-14844
CRM-14844 - Cannot copy-paste fatal errors
Monish Deb [Wed, 24 Jun 2015 08:35:02 +0000 (14:05 +0530)]
Merge pull request #6070 from rohankatkar/CRM-16713
CRM-16713 Find Contributions: Search by Premium
Monish Deb [Wed, 24 Jun 2015 08:26:12 +0000 (13:56 +0530)]
Merge pull request #6067 from monishdeb/master
CRM-16716 fix - Recurring Contributions report improvements
Sudha Bisht [Wed, 24 Jun 2015 08:02:17 +0000 (13:32 +0530)]
Api Fix
Monish Deb [Wed, 24 Jun 2015 07:47:58 +0000 (13:17 +0530)]
Merge pull request #6056 from yashodha/CRM-16720.new
CRM-16720 : Activity Details report: add source, target and assignee …
Eileen McNaughton [Wed, 24 Jun 2015 07:06:10 +0000 (19:06 +1200)]
test & comment fixes
jitendrapurohit [Wed, 24 Jun 2015 06:43:34 +0000 (12:13 +0530)]
CRM-14844 - Cannot copy-paste fatal errors
yashodha [Wed, 24 Jun 2015 05:32:19 +0000 (11:02 +0530)]
fix variable name
Dmitry Smirnov [Wed, 24 Jun 2015 01:22:25 +0000 (11:22 +1000)]
CRM-16731: correct AGPL version number.
colemanw [Tue, 23 Jun 2015 19:24:21 +0000 (15:24 -0400)]
Merge pull request #6075 from colemanw/CRM-16706
CRM-16706 - Remove unused fn
Coleman Watts [Tue, 23 Jun 2015 19:23:50 +0000 (15:23 -0400)]
CRM-16706 - Remove unused fn
colemanw [Tue, 23 Jun 2015 19:19:18 +0000 (15:19 -0400)]
Merge pull request #6041 from mallezie/crm-16706
merge commonLetterCompose() and commonCompose()
Johan Vervloet [Tue, 23 Jun 2015 18:25:46 +0000 (20:25 +0200)]
CRM-16736 - changed 'null' into NULL.
I think this might fix the issues I have with this PR:
https://github.com/civicrm/civicrm-core/pull/6059
----------------------------------------
* CRM-16736: Possible NULL/'null' error in SavedSearch BAO
https://issues.civicrm.org/jira/browse/CRM-16736
Eileen McNaughton [Tue, 23 Jun 2015 13:48:49 +0000 (01:48 +1200)]
Merge pull request #6072 from eileenmcnaughton/master
Merge 4.6 to master
jitendrapurohit [Tue, 23 Jun 2015 13:04:02 +0000 (18:34 +0530)]
minor fix for mode in Search
jitendrapurohit [Tue, 23 Jun 2015 04:54:02 +0000 (10:24 +0530)]
test fix
jitendrapurohit [Mon, 22 Jun 2015 13:30:11 +0000 (19:00 +0530)]
warning fixes
jitendrapurohit [Mon, 22 Jun 2015 13:21:45 +0000 (18:51 +0530)]
CRM-16714 - Find Contributions: Include 'Median Amount' and 'Mode Amount' for search results
jitendrapurohit [Mon, 22 Jun 2015 13:20:54 +0000 (18:50 +0530)]
migrate mode and median in separate function
jitendrapurohit [Mon, 22 Jun 2015 05:55:53 +0000 (11:25 +0530)]
CRM-16715 - Contribution Summary Report: add mode and median statistics; group by fiscal year
Eileen McNaughton [Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)]
Merge branch '4.6' of https://github.com/civicrm/civicrm-core
Conflicts:
xml/templates/civicrm_data.tpl
Web Access [Tue, 23 Jun 2015 10:52:20 +0000 (16:22 +0530)]
CRM-16713 Find Contributions: Search by Premium
yashodha [Tue, 23 Jun 2015 07:39:44 +0000 (13:09 +0530)]
CRM-16665: formatting fix
----------------------------------------
* CRM-16665: Add followup activity to "Send Email" form
https://issues.civicrm.org/jira/browse/CRM-16665
yashodha [Tue, 23 Jun 2015 06:34:49 +0000 (12:04 +0530)]
CRM-16665: more cleanup
----------------------------------------
* CRM-16665: Add followup activity to "Send Email" form
https://issues.civicrm.org/jira/browse/CRM-16665
monishdeb [Tue, 23 Jun 2015 05:54:20 +0000 (11:24 +0530)]
minor fix
Dave Greenberg [Tue, 23 Jun 2015 01:07:28 +0000 (18:07 -0700)]
Merge pull request #6068 from eileenmcnaughton/4.6
fixes to comments
Eileen McNaughton [Mon, 22 Jun 2015 23:00:17 +0000 (11:00 +1200)]
phpcs fixes
Eileen McNaughton [Mon, 22 Jun 2015 22:40:15 +0000 (10:40 +1200)]
phpcs fixes
Dave Greenberg [Mon, 22 Jun 2015 18:17:13 +0000 (11:17 -0700)]
Merge pull request #6062 from eileenmcnaughton/CRM-16417-46
CRM-16417 add failed payment activity type
monishdeb [Mon, 22 Jun 2015 17:19:31 +0000 (22:49 +0530)]
minor fix
monishdeb [Mon, 22 Jun 2015 17:12:41 +0000 (22:42 +0530)]
formatting fix
monishdeb [Mon, 22 Jun 2015 17:09:21 +0000 (22:39 +0530)]
formatting fix
monishdeb [Mon, 22 Jun 2015 17:03:44 +0000 (22:33 +0530)]
CRM-16716 fix - Recurring Contributions report improvements
https://issues.civicrm.org/jira/browse/CRM-16716
Monish Deb [Mon, 22 Jun 2015 17:01:16 +0000 (22:31 +0530)]
Merge pull request #6058 from monishdeb/CRM-16575
CRM-16581 fix - API and checking if a custom field is empty is ignored
kurund [Mon, 22 Jun 2015 16:48:05 +0000 (22:18 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-22-22-17-50
yashodha [Mon, 22 Jun 2015 12:43:26 +0000 (18:13 +0530)]
cleanup
yashodha [Mon, 22 Jun 2015 12:37:55 +0000 (18:07 +0530)]
cleanup
yashodha [Mon, 22 Jun 2015 12:30:39 +0000 (18:00 +0530)]
cleanup
yashodha [Mon, 22 Jun 2015 10:29:47 +0000 (15:59 +0530)]
CRM-16665: minor fixes
----------------------------------------
* CRM-16665: Add followup activity to "Send Email" form
https://issues.civicrm.org/jira/browse/CRM-16665
yashodha [Mon, 22 Jun 2015 10:13:43 +0000 (15:43 +0530)]
CRM-16665: add followup functionality for email
----------------------------------------
* CRM-16665: Add followup activity to "Send Email" form
https://issues.civicrm.org/jira/browse/CRM-16665
Monish Deb [Mon, 22 Jun 2015 05:05:38 +0000 (10:35 +0530)]
Merge pull request #5898 from monishdeb/master
Merge conflict fix
colemanw [Sat, 20 Jun 2015 18:20:11 +0000 (14:20 -0400)]
Merge pull request #6063 from colemanw/editable
Fix caching of multi-custom options
Coleman Watts [Sat, 20 Jun 2015 18:06:22 +0000 (14:06 -0400)]
Fix caching of multi-custom options
colemanw [Sat, 20 Jun 2015 16:13:52 +0000 (12:13 -0400)]
Merge pull request #6055 from colemanw/CRM-16401
CRM-16401 - Allow admin to set which day is the first day of the week
Eileen McNaughton [Sat, 20 Jun 2015 08:54:00 +0000 (20:54 +1200)]
CRM-16417 add failed payment activity type
monishdeb [Fri, 19 Jun 2015 23:06:25 +0000 (04:36 +0530)]
merge conflict fix
Monish Deb [Fri, 19 Jun 2015 22:51:16 +0000 (04:21 +0530)]
Merge pull request #6057 from sudhabisht/CRM-16116
Fix for financial_type_id not returned on Contribution get
monishdeb [Fri, 19 Jun 2015 22:13:30 +0000 (03:43 +0530)]
improvement fixes
monishdeb [Fri, 19 Jun 2015 11:00:29 +0000 (16:30 +0530)]
CRM-16581 fix - API and checking if a custom field is empty is ignored
https://issues.civicrm.org/jira/browse/CRM-16581
Dave Greenberg [Fri, 19 Jun 2015 21:56:36 +0000 (14:56 -0700)]
Merge pull request #5252 from JKingsnorth/CRM-10551
CRM-10551: Allow deletion of blanked location-based fields edited via a profile
Coleman Watts [Fri, 19 Jun 2015 20:20:11 +0000 (16:20 -0400)]
Remove unnecessary require_once
Coleman Watts [Fri, 19 Jun 2015 19:25:55 +0000 (15:25 -0400)]
Merge branch '4.6' into master
Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Core/BAO/Mapping.php
CRM/Core/BAO/PdfFormat.php
CRM/Core/Payment/Form.php
CRM/Member/BAO/Membership.php
CRM/Utils/Hook.php
sql/civicrm_generated.mysql
xml/version.xml
projects / civicrm-core.git / log