Dave Greenberg [Wed, 9 Dec 2015 21:06:15 +0000 (13:06 -0800)]
Merge pull request #7408 from seamuslee001/CRM-17307
CRM-17650 ensure that replyto_email is updated when re-using a previo…
Eileen McNaughton [Wed, 9 Dec 2015 20:00:15 +0000 (09:00 +1300)]
Merge pull request #7371 from eileenmcnaughton/CRM-17655
CRM-17655 Adding a payment to a recurring contribution sequence shoul…
Kurund Jalmi [Wed, 9 Dec 2015 15:18:08 +0000 (20:48 +0530)]
Merge pull request #7417 from rohankatkar/Webtests-master-fix
Webtests Fix
Web Access [Wed, 9 Dec 2015 13:18:31 +0000 (18:48 +0530)]
Webtests Fix
CiviCRM [Wed, 9 Dec 2015 08:42:57 +0000 (00:42 -0800)]
Update version to 4.7.beta3
eileenmcnaugton [Wed, 9 Dec 2015 03:47:28 +0000 (16:47 +1300)]
add code to help track down intermittant test fail
eileenmcnaughton [Thu, 3 Dec 2015 09:32:03 +0000 (09:32 +0000)]
CRM-17655 Adding a payment to a recurring contribution sequence should update the contribution_recur table
Dave Greenberg [Tue, 8 Dec 2015 23:50:51 +0000 (15:50 -0800)]
Merge pull request #7414 from davecivicrm/CRM-17656
CRM-17656 - forward port web test for activity custom data.
Dave Greenberg [Tue, 8 Dec 2015 23:48:56 +0000 (15:48 -0800)]
CRM-17656 - forward port web test for activity custom data.
----------------------------------------
* CRM-17656: Cannot edit activities with custom fields in popup from a search results screen
https://issues.civicrm.org/jira/browse/CRM-17656
Dave Greenberg [Tue, 8 Dec 2015 17:25:50 +0000 (09:25 -0800)]
Merge pull request #7411 from jitendrapurohit/webtest
47 webtest fixes
colemanw [Tue, 8 Dec 2015 17:22:06 +0000 (12:22 -0500)]
Merge pull request #7412 from colemanw/UpgradeCleanup
Upgrade cleanup
Coleman Watts [Mon, 7 Dec 2015 02:38:43 +0000 (21:38 -0500)]
Remove redundant fn
Coleman Watts [Sun, 6 Dec 2015 02:40:13 +0000 (21:40 -0500)]
Array cleanup
Coleman Watts [Sat, 5 Dec 2015 18:08:38 +0000 (13:08 -0500)]
Remove unnecessarily translated strings
jitendrapurohit [Tue, 8 Dec 2015 13:25:19 +0000 (18:55 +0530)]
webtest fixes
Yashodha Chaku [Tue, 8 Dec 2015 12:40:12 +0000 (18:10 +0530)]
Merge pull request #7410 from jitendrapurohit/CRM-17679
generated sql changes for CRM-17679
jitendrapurohit [Tue, 8 Dec 2015 12:18:52 +0000 (17:48 +0530)]
generated sql changes for CRM-17679
Yashodha Chaku [Tue, 8 Dec 2015 11:23:09 +0000 (16:53 +0530)]
Merge pull request #7409 from yashodha/CRM-17679.fix
CRM-17679: Mismatch between financial transactions & contributions
yashodha [Tue, 8 Dec 2015 09:13:53 +0000 (14:43 +0530)]
CRM-17679: Mismatch between financial transactions & contributions
----------------------------------------
* CRM-17679: Mismatch between financial transactions & contributions
https://issues.civicrm.org/jira/browse/CRM-17679
Seamus Lee [Tue, 8 Dec 2015 06:14:39 +0000 (06:14 +0000)]
CRM-17307 ensure that replyto_email is updated when re-using a previous mailing and changing the from address
Dave Greenberg [Tue, 8 Dec 2015 00:55:40 +0000 (16:55 -0800)]
Merge pull request #7403 from monishdeb/CRM-17308
CRM-17308 fix - Location type 'select' (for all entities) AND Phone t…
Dave Greenberg [Tue, 8 Dec 2015 00:33:52 +0000 (16:33 -0800)]
Merge pull request #7402 from rohankatkar/webtestmaster_4.7
Webtests fix
Eileen McNaughton [Tue, 8 Dec 2015 00:23:27 +0000 (13:23 +1300)]
Merge pull request #7406 from eileenmcnaughton/CRM-16259
CRM-16259 exclude payment from syntax conformance tests
eileenmcnaugton [Mon, 7 Dec 2015 22:11:32 +0000 (11:11 +1300)]
CRM-16259 exclude payment from syntax conformance tests
colemanw [Mon, 7 Dec 2015 21:39:14 +0000 (16:39 -0500)]
Merge pull request #7387 from colemanw/versionCheck
CRM-17637 - Refactor versionCheck into a scheduled job
Dave Greenberg [Mon, 7 Dec 2015 20:58:21 +0000 (12:58 -0800)]
Merge pull request #7405 from laryn/patch-4
Change Dutch word to English
Laryn [Mon, 7 Dec 2015 20:53:20 +0000 (14:53 -0600)]
Change Dutch word to English
Coleman Watts [Mon, 7 Dec 2015 20:12:59 +0000 (15:12 -0500)]
CRM-17637 - Don't show up-to-date status if scheduled job is disabled
Dave Greenberg [Mon, 7 Dec 2015 18:56:40 +0000 (10:56 -0800)]
Merge pull request #7401 from sudhabisht/WebtesFix
Fixed test failure
colemanw [Mon, 7 Dec 2015 18:46:00 +0000 (13:46 -0500)]
Merge pull request #7398 from eileenmcnaughton/CRM-17628
CRM-17628 add qfKey to contribution search links
colemanw [Mon, 7 Dec 2015 17:56:18 +0000 (12:56 -0500)]
Merge pull request #7397 from colemanw/CRM-17507
CRM-17507 - Cleanup settings setItem calls
monishdeb [Mon, 7 Dec 2015 14:22:26 +0000 (19:52 +0530)]
CRM-17308 fix - Location type 'select' (for all entities) AND Phone type should be required
https://issues.civicrm.org/jira/browse/CRM-17308
Web Access [Mon, 7 Dec 2015 14:08:22 +0000 (19:38 +0530)]
Webtests fix
Sudha Bisht [Mon, 7 Dec 2015 14:03:26 +0000 (19:33 +0530)]
Fixed test failure
Yashodha Chaku [Mon, 7 Dec 2015 12:24:23 +0000 (17:54 +0530)]
Merge pull request #7399 from sudhabisht/CRM-16869
Fixed File upload issue
Yashodha Chaku [Mon, 7 Dec 2015 06:01:57 +0000 (11:31 +0530)]
Merge pull request #7392 from eileenmcnaughton/CRM-17675
CRM-17675 set date AND time to 'now' when refunding contributions
eileen [Mon, 7 Dec 2015 03:51:33 +0000 (16:51 +1300)]
CRM-17628 add qfKey to contribution search links
Change-Id: Ib7f57cf764a8cf4b506f4453b90f9ce841d1419e
Tim Otten [Mon, 7 Dec 2015 03:38:18 +0000 (19:38 -0800)]
Merge pull request #7389 from totten/master-cxn-proxy
CiviConnect - Proxy support; UI tweaks; System.get improvements
colemanw [Mon, 7 Dec 2015 03:36:47 +0000 (22:36 -0500)]
Merge pull request #7390 from colemanw/CRM-16373
CRM-16373 - Drop config_backend
Coleman Watts [Mon, 7 Dec 2015 03:29:07 +0000 (22:29 -0500)]
CRM-17507 - Cleanup settings setItem calls
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
eileen [Mon, 7 Dec 2015 00:06:09 +0000 (13:06 +1300)]
CRM-17675 set date AND time to 'now' when refunding contributions
Change-Id: Icca2230993e73e9ff10d115d13fc0539b5e8a234
Coleman Watts [Sun, 6 Dec 2015 02:14:35 +0000 (21:14 -0500)]
CRM-16373 - Drop config_backend
Tim Otten [Sat, 5 Dec 2015 23:56:53 +0000 (15:56 -0800)]
System.get API - Return current PHP + MySQL time
Tim Otten [Sat, 5 Dec 2015 23:50:52 +0000 (15:50 -0800)]
System.get API - Return MySQL settings
Tim Otten [Sat, 5 Dec 2015 22:09:43 +0000 (14:09 -0800)]
System.get API - Return CMS version
Tim Otten [Sat, 5 Dec 2015 23:51:29 +0000 (15:51 -0800)]
crmCxnManageCtrl - Style rows
Tim Otten [Sat, 5 Dec 2015 22:05:01 +0000 (14:05 -0800)]
crmCxnManageCtrl - Consistently show app name in dialog titles
Tim Otten [Sat, 5 Dec 2015 22:00:52 +0000 (14:00 -0800)]
crmCxnManageCtrl - Provide informational dialog
Tim Otten [Sat, 5 Dec 2015 21:43:36 +0000 (13:43 -0800)]
crmCxnManageCtrl - Display appId and appUrl
Tim Otten [Sat, 5 Dec 2015 21:31:49 +0000 (13:31 -0800)]
crmCxn - Add "Reconnect" option
Tim Otten [Sat, 5 Dec 2015 21:13:38 +0000 (13:13 -0800)]
crmCxnManageCtrl - Style rows. Move links into dropdown.
Tim Otten [Sat, 5 Dec 2015 04:58:34 +0000 (20:58 -0800)]
CRM_Cxn_BAO_Cxn::createRegistrationClient - Support proxies
Tim Otten [Sat, 5 Dec 2015 04:57:19 +0000 (20:57 -0800)]
composer.json - Update civicrm/civicrm-cxn-rpc
Coleman Watts [Sat, 5 Dec 2015 16:26:22 +0000 (11:26 -0500)]
Add newline
Coleman Watts [Sat, 5 Dec 2015 16:24:55 +0000 (11:24 -0500)]
Comment fix
Coleman Watts [Sat, 5 Dec 2015 16:20:16 +0000 (11:20 -0500)]
CRM-17637 - Delete unused file
Coleman Watts [Sat, 5 Dec 2015 15:25:54 +0000 (10:25 -0500)]
CRM-17637 - Suppress version status if not available
Coleman Watts [Sat, 5 Dec 2015 03:17:29 +0000 (22:17 -0500)]
CRM-17637 - Refactor out versionCheck setting
Coleman Watts [Sat, 5 Dec 2015 02:57:16 +0000 (21:57 -0500)]
CRM-17637 - Add scheduled job
Coleman Watts [Sat, 5 Dec 2015 02:52:11 +0000 (21:52 -0500)]
CRM-17637 - Move shared constant
Coleman Watts [Sat, 5 Dec 2015 02:24:28 +0000 (21:24 -0500)]
CRM-17637 - Add version_check api job
Coleman Watts [Sat, 5 Dec 2015 01:58:52 +0000 (20:58 -0500)]
CRM-17637 - Remove useless singleton method
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
Sudha Bisht [Fri, 4 Dec 2015 13:42:31 +0000 (19:12 +0530)]
Fixed File upload issue
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…