eileen [Thu, 10 Dec 2015 03:28:18 +0000 (16:28 +1300)]
CRM-17691 do not use default return properties from search screen
Change-Id: Ic6b3d7a2ac2b0ca691ed9fdb84a1ff86f6c73e52
Change-Id: Ib275a710fceceba2e10d0293dc3366c1f37d3397
eileen [Mon, 7 Dec 2015 03:51:33 +0000 (16:51 +1300)]
CRM-17628 add qfKey to contribution search links
Change-Id: Ib7f57cf764a8cf4b506f4453b90f9ce841d1419e
Eileen McNaughton [Mon, 7 Dec 2015 02:37:56 +0000 (15:37 +1300)]
Merge pull request #7394 from eileenmcnaughton/CRM-17627
CRM-17627 Set transaction date correctly for refunds
eileen [Mon, 7 Dec 2015 01:16:30 +0000 (14:16 +1300)]
CRM-17627 Set transaction date correctly for refunds
Change-Id: Ida11bb0dbb7febe256881c98afcae6542da2c235
Eileen McNaughton [Mon, 7 Dec 2015 01:36:56 +0000 (14:36 +1300)]
Merge pull request #7393 from eileenmcnaughton/a-net-tests
Add some tolerance to Authorize.net test
eileen [Mon, 7 Dec 2015 01:16:05 +0000 (14:16 +1300)]
CRM-17627 test for ensuring correct refund transaction date
Change-Id: If9276cd7d32bb7fef8071c07cb763dc4fe66da4e
eileen [Mon, 7 Dec 2015 01:01:39 +0000 (14:01 +1300)]
Add some tolerance to Authorize.net test
Change-Id: I0c00bd47294fb4be06d017b56e80dca7c87f4eea
Coleman Watts [Sat, 5 Dec 2015 01:23:34 +0000 (20:23 -0500)]
Fix link href
Dave Greenberg [Fri, 4 Dec 2015 22:56:47 +0000 (14:56 -0800)]
Merge pull request #7386 from davecivicrm/CRM-17147
CRM-17147 - ensure is_deceased FALSE values are 0, not NULL
Dave Greenberg [Fri, 4 Dec 2015 22:56:08 +0000 (14:56 -0800)]
CRM-17147 - ensure is_deceased FALSE values are 0, not NULL
----------------------------------------
* CRM-17147: People with empty deceased-flag ('is null') get removed from recipient list of a mailing
https://issues.civicrm.org/jira/browse/CRM-17147
Dave Greenberg [Fri, 4 Dec 2015 22:46:41 +0000 (14:46 -0800)]
Merge pull request #7367 from saurabhbatra96/CRM-17404
CRM-17404 - NULL values in 'do_not_*' fields if blank in contact:crea…
colemanw [Fri, 4 Dec 2015 20:32:17 +0000 (15:32 -0500)]
Merge pull request #7384 from mollux/CRM-17666
CRM-17666 : Added 'membership_type_id is present check' when saving membership payment.
colemanw [Fri, 4 Dec 2015 20:19:04 +0000 (15:19 -0500)]
Merge pull request #7382 from mollux/CRM-17665
CRM-17665 : Added check if relationship types exist.
Dave Greenberg [Fri, 4 Dec 2015 19:45:14 +0000 (11:45 -0800)]
Merge pull request #7379 from eileenmcnaughton/CRM-17649
CRM-17649 fix fatal on is_recur
Mattias Michaux [Fri, 4 Dec 2015 09:55:41 +0000 (10:55 +0100)]
Added api spec.
Mattias Michaux [Fri, 4 Dec 2015 09:55:24 +0000 (10:55 +0100)]
Added 'membership_type_id is present check' when saving membership payment.
Yashodha Chaku [Fri, 4 Dec 2015 08:43:54 +0000 (14:13 +0530)]
Merge pull request #7381 from sudhabisht/CRMFailure
Fix for CRM failure
Mattias Michaux [Fri, 4 Dec 2015 08:28:51 +0000 (09:28 +0100)]
Added check if relationship types exist.
Sudha Bisht [Fri, 4 Dec 2015 07:54:39 +0000 (13:24 +0530)]
Fix for CRM failure
Eileen McNaughton [Fri, 4 Dec 2015 05:41:29 +0000 (18:41 +1300)]
Merge pull request #7377 from agh1/export-document-header-region
Add regions for report headers (4.7)
eileenmcnaugton [Fri, 4 Dec 2015 05:40:14 +0000 (18:40 +1300)]
CRM-17649 fix fatal on is_recur
Saurabh Batra [Fri, 4 Dec 2015 02:19:43 +0000 (07:49 +0530)]
CRM-17404 - NULL values in 'do_not_*' fields if blank in contact:create API
https://issues.civicrm.org/jira/browse/CRM-17404
Dave Greenberg [Fri, 4 Dec 2015 00:16:34 +0000 (16:16 -0800)]
Merge pull request #7378 from davecivicrm/CRM-16761c
CRM-16761 - User message improvements.
Dave Greenberg [Fri, 4 Dec 2015 00:10:59 +0000 (16:10 -0800)]
CRM-16761 - User message improvements.
----------------------------------------
* CRM-16761: Self service view, update and cancel for CiviEvent
https://issues.civicrm.org/jira/browse/CRM-16761
Dave Greenberg [Thu, 3 Dec 2015 23:06:03 +0000 (15:06 -0800)]
Merge pull request #7373 from jitendrapurohit/CRM-16761-additional-fixes
CRM-16761 - Self Service additional changes
Dave Greenberg [Thu, 3 Dec 2015 21:12:42 +0000 (13:12 -0800)]
Merge pull request #7366 from seamuslee001/CRM-17654
CRM-17654 Allow for multiple relationship types to be used in the rel…
Coleman Watts [Thu, 3 Dec 2015 20:43:45 +0000 (15:43 -0500)]
CRM-17620 - Fix undefined variable
Coleman Watts [Thu, 3 Dec 2015 20:38:46 +0000 (15:38 -0500)]
CRM-17620 - Add title to expand links
Seamus Lee [Thu, 3 Dec 2015 20:25:36 +0000 (20:25 +0000)]
Jenkins fix
colemanw [Thu, 3 Dec 2015 20:24:41 +0000 (15:24 -0500)]
Merge pull request #7376 from colemanw/contributionTable
CRM-17620 - Improve contribution results table layout
Seamus Lee [Thu, 3 Dec 2015 20:06:48 +0000 (20:06 +0000)]
Translate and allow for the negative in operator as per comment from Dave
Andrew Hunt [Thu, 3 Dec 2015 19:44:41 +0000 (14:44 -0500)]
CRM-17658 PDFs: rename pdf-header region to export-document-header
----------------------------------------
* CRM-17658: Can't alter header of PDF report
https://issues.civicrm.org/jira/browse/CRM-17658
Andrew Hunt [Thu, 3 Dec 2015 17:46:36 +0000 (12:46 -0500)]
CRM-17658 Reports: add new region for default report HTML header
Andrew Hunt [Thu, 3 Dec 2015 17:29:00 +0000 (12:29 -0500)]
CRM-17658 PDFs: add new region 'pdf-header' in head of PDFs
Coleman Watts [Thu, 3 Dec 2015 19:41:37 +0000 (14:41 -0500)]
Fix broken table in languages other than English
Table layout was broken because code was relying on english label "Soft Credit For".
There may well be a better way to do this, but at least it's not as broken as before.
Coleman Watts [Thu, 3 Dec 2015 19:33:42 +0000 (14:33 -0500)]
Format and whitespace fixes
Coleman Watts [Thu, 3 Dec 2015 19:26:27 +0000 (14:26 -0500)]
Fix icons in popup buttons
Coleman Watts [Thu, 3 Dec 2015 18:52:33 +0000 (13:52 -0500)]
CRM-17620 - Improve contribution results table layout
colemanw [Thu, 3 Dec 2015 14:29:38 +0000 (09:29 -0500)]
Merge pull request #7365 from eileenmcnaughton/CRM-17653-master
CRM-17653 fix membership renewal to record contribution_recur_id on c…
colemanw [Thu, 3 Dec 2015 13:49:28 +0000 (08:49 -0500)]
Merge pull request #7363 from colemanw/CRM-17620
CRM-17620 - Cleanup and abstract expandRow js
jitendrapurohit [Thu, 3 Dec 2015 13:15:08 +0000 (18:45 +0530)]
fix security bug in transfer form
jitendrapurohit [Thu, 3 Dec 2015 12:49:21 +0000 (18:19 +0530)]
CRM-16761 - Self Service additional changes
Yashodha Chaku [Thu, 3 Dec 2015 12:22:03 +0000 (17:52 +0530)]
Merge pull request #7372 from yashodha/upgrade4.6.beta2
Update version to 4.6beta2
yashodha [Thu, 3 Dec 2015 12:20:28 +0000 (17:50 +0530)]
Update version to 4.6beta2
Eileen McNaughton [Thu, 3 Dec 2015 10:38:20 +0000 (23:38 +1300)]
Merge pull request #7370 from eileenmcnaughton/comments
some comment fixes
Yashodha Chaku [Thu, 3 Dec 2015 10:22:13 +0000 (15:52 +0530)]
Merge pull request #7369 from jitendrapurohit/CRM-16597-generatedsql
Generated sql changes - CRM-16597
eileenmcnaugton [Thu, 3 Dec 2015 03:19:25 +0000 (16:19 +1300)]
CRM-17653 fix membership renewal to record contribution_recur_id on contribution
eileenmcnaughton [Thu, 3 Dec 2015 09:37:06 +0000 (09:37 +0000)]
some somment fixes
jitendrapurohit [Thu, 3 Dec 2015 09:34:30 +0000 (15:04 +0530)]
Generated sql changes - CRM-16597
Monish Deb [Thu, 3 Dec 2015 08:24:44 +0000 (13:54 +0530)]
Merge pull request #7358 from yashodha/CRM-16597
CRM-16597: Current naming of pledge reports is very confusing and nee…
yashodha [Thu, 3 Dec 2015 07:34:54 +0000 (13:04 +0530)]
upgrade fix
Seamus Lee [Thu, 3 Dec 2015 05:58:54 +0000 (05:58 +0000)]
CRM-17654 Allow for multiple relationship types to be used in the relationship report
yashodha [Thu, 3 Dec 2015 06:04:42 +0000 (11:34 +0530)]
fix upgrade bug
Coleman Watts [Thu, 3 Dec 2015 05:05:18 +0000 (00:05 -0500)]
CRM-17620 - Convert cases to use expandRow.js
Coleman Watts [Thu, 3 Dec 2015 04:04:44 +0000 (23:04 -0500)]
Cleanup paperclip icon
Coleman Watts [Thu, 3 Dec 2015 03:47:27 +0000 (22:47 -0500)]
Menu css cleanup
Coleman Watts [Thu, 3 Dec 2015 03:43:00 +0000 (22:43 -0500)]
CRM-17620 - Convert pledges to use expandRow.js
Coleman Watts [Thu, 3 Dec 2015 03:04:10 +0000 (22:04 -0500)]
CRM-17620 - expandRow add margin and smooth scrolling
Coleman Watts [Thu, 3 Dec 2015 01:37:40 +0000 (20:37 -0500)]
Cleanup smarty_function_crmScript
Coleman Watts [Thu, 3 Dec 2015 01:34:21 +0000 (20:34 -0500)]
CRM-17620 - Cleanup and abstract expandRow js
Dave Greenberg [Thu, 3 Dec 2015 00:49:58 +0000 (16:49 -0800)]
Merge pull request #7336 from eileenmcnaughton/CRM-17636
CRM-17636 fix for items not being recorded correctly (modified_date, … …
Dave Greenberg [Thu, 3 Dec 2015 00:48:02 +0000 (16:48 -0800)]
Merge pull request #7356 from davecivicrm/CRM-16761
CRM-16761 - Form / UI fixes.
Dave Greenberg [Thu, 3 Dec 2015 00:26:20 +0000 (16:26 -0800)]
Merge pull request #7220 from ucam-dar/CRM-17556
CRM-17556 Dedupe improvements
Dave Greenberg [Wed, 2 Dec 2015 23:55:11 +0000 (15:55 -0800)]
Merge pull request #7362 from davecivicrm/CRM-16259
CRM-16259 - Schema change for financial_trxn table only - add is_paym…
Dave Greenberg [Wed, 2 Dec 2015 23:53:16 +0000 (15:53 -0800)]
CRM-16259 - Schema change for financial_trxn table only - add is_payment column.
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Dave Greenberg [Wed, 2 Dec 2015 20:12:44 +0000 (12:12 -0800)]
Merge pull request #7286 from eileenmcnaughton/CRM-16929-salvage
CRM-16929 fix hiding on zero dollar contribution pages & events
Dave Greenberg [Wed, 2 Dec 2015 18:28:18 +0000 (10:28 -0800)]
Merge pull request #7360 from monishdeb/CRM-16901
CRM-16901 fix - Offline Recurring Payments
Dave Greenberg [Wed, 2 Dec 2015 18:15:47 +0000 (10:15 -0800)]
CRM-16761 - style fixes.
----------------------------------------
* CRM-16761: Self service view, update and cancel for CiviEvent
https://issues.civicrm.org/jira/browse/CRM-16761
monishdeb [Wed, 2 Dec 2015 14:49:57 +0000 (20:19 +0530)]
CRM-16901 fix - Offline Recurring Payments
https://issues.civicrm.org/jira/browse/CRM-16901
colemanw [Wed, 2 Dec 2015 14:30:00 +0000 (09:30 -0500)]
Merge pull request #7359 from JKingsnorth/mailing-bao-mailing-comments
Mailing BAO comment improvements
JKingsnorth [Wed, 2 Dec 2015 13:34:06 +0000 (13:34 +0000)]
Mailing BAO comment improvements
yashodha [Wed, 2 Dec 2015 10:22:17 +0000 (15:52 +0530)]
CRM-16597: Current naming of pledge reports is very confusing and needs to be changed
----------------------------------------
* CRM-16597: Current naming of pledge reports is very confusing and needs to be changed.
https://issues.civicrm.org/jira/browse/CRM-16597
Eileen McNaughton [Wed, 2 Dec 2015 07:08:35 +0000 (20:08 +1300)]
Merge pull request #7335 from eileenmcnaughton/CRM-17635
CRM-17635 show option to email for autorenew memberships
eileen [Tue, 24 Nov 2015 04:48:09 +0000 (17:48 +1300)]
CRM-16929 fix hiding on zero dollar contribution pages & events
Change-Id: I204b087279a8d5170057b1e2b06d57ed1508127f
Kurund Jalmi [Wed, 2 Dec 2015 05:13:53 +0000 (10:43 +0530)]
Merge pull request #7345 from rohankatkar/MASTER_WEBTESTS
Webtests fixes- master
Eileen McNaughton [Wed, 2 Dec 2015 05:00:19 +0000 (18:00 +1300)]
Merge pull request #7348 from eileenmcnaughton/CRM-17644
CRM-17644 fix caching on tax rates to still cache if none set
Dave Greenberg [Wed, 2 Dec 2015 04:46:13 +0000 (20:46 -0800)]
CRM-16761 - Form / UI fixes.
----------------------------------------
* CRM-16761: Self service view, update and cancel for CiviEvent
https://issues.civicrm.org/jira/browse/CRM-16761
Eileen McNaughton [Wed, 2 Dec 2015 04:26:56 +0000 (17:26 +1300)]
Merge pull request #7353 from eileenmcnaughton/master
fix missing param in comment
eileen [Tue, 1 Dec 2015 17:38:37 +0000 (06:38 +1300)]
CRM-17644 fix caching on tax rates to still cache if none set
Change-Id: I9cbfc19a50e5848fc7ec0a6448929558b3f46fe4
eileen [Wed, 2 Dec 2015 02:11:47 +0000 (15:11 +1300)]
fix missing param in comment
Coleman Watts [Wed, 2 Dec 2015 01:34:45 +0000 (20:34 -0500)]
crm-public fix select2 height
colemanw [Tue, 1 Dec 2015 19:06:18 +0000 (14:06 -0500)]
Merge pull request #7346 from eileenmcnaughton/CRM-17640
CRM-17640 Update contribution api to do a sensible query when doing getcount
colemanw [Tue, 1 Dec 2015 18:59:26 +0000 (13:59 -0500)]
Merge pull request #7349 from guanhuan/master
Add crm-public-form-item class to contribution page and add possibility to style profiles consistently
Dave Greenberg [Tue, 1 Dec 2015 18:53:46 +0000 (10:53 -0800)]
Merge pull request #7344 from monishdeb/CRM-16901
CRM-16901 fix - Offline Recurring Payments
Guanhuan Chen [Tue, 1 Dec 2015 18:11:13 +0000 (18:11 +0000)]
Add crm-public-form-item class to contribution page and add possibility to style profiles consistently
colemanw [Tue, 1 Dec 2015 16:54:08 +0000 (11:54 -0500)]
Merge pull request #7343 from rohankatkar/CRM_16761_Webtest
Webtest - CRM-16761
colemanw [Tue, 1 Dec 2015 16:52:21 +0000 (11:52 -0500)]
Merge pull request #7296 from eileenmcnaughton/CRM-17620
CRM-17620 expose payment data for contributions in the UI
eileen [Tue, 1 Dec 2015 16:35:52 +0000 (05:35 +1300)]
a couple more comments
eileen [Tue, 1 Dec 2015 16:05:53 +0000 (05:05 +1300)]
CRM-17640 add follow up comments to discourage random brutal attacks on site performance
eileen [Tue, 1 Dec 2015 15:32:10 +0000 (04:32 +1300)]
CRM-17640 re-use contact apiQuery for contribution
eileen [Tue, 1 Dec 2015 13:56:20 +0000 (02:56 +1300)]
CRM-17640 Update contribution api to do a sensible query when getcount is being invoked
Without this patch contribution.getcount api does a full query with the full set of select fields and
the nasty joins those entail and only after doing that does it filter for count.
This patch re-uses the code in use for contact api query for contribution getcount
Web Access [Tue, 1 Dec 2015 13:10:50 +0000 (18:40 +0530)]
Webtests fixes- master
Monish Deb [Tue, 1 Dec 2015 11:56:47 +0000 (17:26 +0530)]
Merge pull request #7342 from eileenmcnaughton/CRM-17611
CRM-17611 do not set dummy trxn_id on declines and do not attempt to …
monishdeb [Tue, 1 Dec 2015 10:52:34 +0000 (16:22 +0530)]
upgrade fix
Monish Deb [Tue, 1 Dec 2015 10:26:16 +0000 (15:56 +0530)]
Merge pull request #7341 from jitendrapurohit/CRM-17642
CRM-17642 -- Accounting Batch Transactions page seems to be missing s…
Web Access [Tue, 1 Dec 2015 10:25:21 +0000 (15:55 +0530)]
Minor changes to test
Web Access [Tue, 1 Dec 2015 10:04:31 +0000 (15:34 +0530)]
Webtest - CRM-16761
monishdeb [Tue, 1 Dec 2015 10:04:08 +0000 (15:34 +0530)]
CRM-16901 fix - Offline Recurring Payments
https://issues.civicrm.org/jira/browse/CRM-16901
eileenmcnaugton [Sun, 22 Nov 2015 23:56:46 +0000 (12:56 +1300)]
CRM-17611 do not set dummy trxn_id on declines and do not attempt to validate non-existent trxn_id
Conflicts:
CRM/Core/Payment/AuthorizeNetIPN.php
Eileen McNaughton [Tue, 1 Dec 2015 07:20:01 +0000 (20:20 +1300)]
Merge pull request #7339 from civicrm/eileenmcnaughton-patch-1
Remove odd language construct
projects / civicrm-core.git / log