monishdeb [Fri, 6 Nov 2015 06:24:50 +0000 (11:54 +0530)]
CRM-17518 fix - "IN" operator doesn't work on the contact_sub_type field for api.Contact.get
https://issues.civicrm.org/jira/browse/CRM-17518
colemanw [Thu, 5 Nov 2015 21:58:24 +0000 (16:58 -0500)]
Merge pull request #6892 from eileenmcnaughton/CRM-17225-report-save
CRM-17225 add button for reports to be saved in view mode or criteria mode
colemanw [Thu, 5 Nov 2015 21:33:17 +0000 (16:33 -0500)]
Merge pull request #7059 from totten/danaskallman-patch-3
CRM-12227 - Set default extension directory
colemanw [Thu, 5 Nov 2015 21:28:21 +0000 (16:28 -0500)]
Merge pull request #7088 from mollux/CRM-17459
CRM-17459 - fix filtering with api on custom fields.
colemanw [Thu, 5 Nov 2015 21:25:23 +0000 (16:25 -0500)]
Merge pull request #7089 from JKingsnorth/CRM-17474
CRM-17474: Improvements to contact, participant and mailing reports
Coleman Watts [Thu, 5 Nov 2015 19:37:05 +0000 (14:37 -0500)]
Merge branch 4.6 into master
Conflicts:
CRM/Member/BAO/Query.php
sql/civicrm_generated.mysql
xml/version.xml
colemanw [Thu, 5 Nov 2015 19:31:37 +0000 (14:31 -0500)]
Merge pull request #7136 from monishdeb/CRM-17339
CRM-17339 master fix - Error when importing contributions matched on email
Monish Deb [Thu, 5 Nov 2015 19:11:12 +0000 (00:41 +0530)]
Merge pull request #7137 from rohankatkar/master-4.7-webtests
Fix for webtests
Dave Greenberg [Thu, 5 Nov 2015 18:12:17 +0000 (10:12 -0800)]
Merge pull request #7114 from mollux/CRM-16029
CRM-16029 - Follow-up fixes for multilingual financial types and accounts
Dave Greenberg [Thu, 5 Nov 2015 17:43:56 +0000 (09:43 -0800)]
Merge pull request #7138 from mollux/minor_fixes
Fixed possibly wrong modifier id id when creating an activity.
Dave Greenberg [Thu, 5 Nov 2015 17:13:50 +0000 (09:13 -0800)]
Merge pull request #7140 from JKingsnorth/patch-2
Update README.txt
John Kingsnorth [Thu, 5 Nov 2015 16:32:58 +0000 (16:32 +0000)]
Update README.txt
Candidate for trivial patch of the year.
Mattias Michaux [Thu, 5 Nov 2015 15:59:06 +0000 (16:59 +0100)]
Fixed possibly wrong modifier id id when creating activity.
Eileen McNaughton [Thu, 5 Nov 2015 14:55:49 +0000 (06:55 -0800)]
Merge pull request #7133 from eileenmcnaughton/CRM-17509
CRM-17509 fix fatal on getting amount for waitlisted registrants
Web Access [Thu, 5 Nov 2015 13:11:45 +0000 (18:41 +0530)]
Fix for webtests
monishdeb [Thu, 5 Nov 2015 09:58:56 +0000 (15:28 +0530)]
CRM-17339 fix - Error when importing contributions matched on email
https://issues.civicrm.org/jira/browse/CRM-17339
eileen [Thu, 5 Nov 2015 02:13:00 +0000 (18:13 -0800)]
CRM-17509 fix fatal on getting amount for waitlisted registrants
Dave Greenberg [Thu, 5 Nov 2015 00:40:24 +0000 (16:40 -0800)]
Merge pull request #7116 from JKingsnorth/CRM-17488
CRM-17488 Fix bounce status on mailing detail report
Dave Greenberg [Wed, 4 Nov 2015 22:22:34 +0000 (14:22 -0800)]
Merge pull request #7131 from davecivicrm/CRM-17505
CRM-17505 - Choose date range layout fix.
Dave Greenberg [Wed, 4 Nov 2015 22:20:15 +0000 (14:20 -0800)]
CRM-17505 - Choose date range layout fix.
----------------------------------------
* CRM-17505: Fix search form layout for date range fields
https://issues.civicrm.org/jira/browse/CRM-17505
colemanw [Wed, 4 Nov 2015 22:16:03 +0000 (17:16 -0500)]
Merge pull request #7130 from colemanw/CRM-17493
CRM-17493 - Fix datatable when popup forms disabled
Coleman Watts [Wed, 4 Nov 2015 22:15:01 +0000 (17:15 -0500)]
CRM-17493 - Fix datatable when popup forms disabled
Coleman Watts [Wed, 4 Nov 2015 21:45:43 +0000 (16:45 -0500)]
Minor cleanup
Tim Otten [Wed, 4 Nov 2015 21:20:10 +0000 (13:20 -0800)]
Merge pull request #7092 from totten/master-exturl-default
CRM-16373 - Settings - Fix default for ext_repo_url
Dave Greenberg [Wed, 4 Nov 2015 20:00:48 +0000 (12:00 -0800)]
Merge pull request #7126 from monishdeb/4.6
CRM-17497 fix - Adding relationship with multi-valued custom field fails
Kurund Jalmi [Wed, 4 Nov 2015 15:17:49 +0000 (20:47 +0530)]
Merge pull request #7127 from rohankatkar/Master_4.7
Webtests Fixes - Master
JKingsnorth [Wed, 4 Nov 2015 14:38:48 +0000 (14:38 +0000)]
Style fixes
JKingsnorth [Wed, 4 Nov 2015 14:28:26 +0000 (14:28 +0000)]
CRM-17474 Add custom field support to mailing detail report
JKingsnorth [Wed, 4 Nov 2015 14:27:25 +0000 (14:27 +0000)]
CRM-17474 Tidy up comments and deprecated properties in mailing reports
JKingsnorth [Wed, 4 Nov 2015 14:06:40 +0000 (14:06 +0000)]
CRM-17474 Provide additional information on bounce report
Web Access [Wed, 4 Nov 2015 13:21:09 +0000 (18:51 +0530)]
Webtests Fixes - Master
CiviCRM [Wed, 4 Nov 2015 10:05:31 +0000 (02:05 -0800)]
Update version to 4.6.11
JKingsnorth [Wed, 4 Nov 2015 09:34:24 +0000 (09:34 +0000)]
CRM-17488 Correct capitalization of values
monishdeb [Wed, 4 Nov 2015 08:07:59 +0000 (13:37 +0530)]
CRM-17497 fix - Adding relationship with multi-valued custom field fails
https://issues.civicrm.org/jira/browse/CRM-17497
Monish Deb [Wed, 4 Nov 2015 06:01:39 +0000 (11:31 +0530)]
Merge pull request #7122 from rohankatkar/Master_Webtest
Webtest fixes- Master
Dave Greenberg [Wed, 4 Nov 2015 02:08:32 +0000 (18:08 -0800)]
Merge pull request #7074 from jitendrapurohit/CRM-17433
CRM-17433 - Invalid error message on deleting Participant record if N…
Dave Greenberg [Wed, 4 Nov 2015 02:01:33 +0000 (18:01 -0800)]
Merge pull request #7120 from monishdeb/testFailures
CRM-17481 fix - Simply saving Individual Edit Form, create new inheri…
Eileen McNaughton [Tue, 3 Nov 2015 22:56:19 +0000 (14:56 -0800)]
Merge pull request #7117 from eileenmcnaughton/CRM-17490
CRM-17490 fix interface error on activity import
Eileen McNaughton [Tue, 3 Nov 2015 22:49:24 +0000 (14:49 -0800)]
Merge pull request #7115 from mollux/CRM-17486
CRM-17486 - Added skipRecentView support when creating a relationship.
Dave Greenberg [Tue, 3 Nov 2015 20:17:09 +0000 (12:17 -0800)]
Merge pull request #7119 from seamuslee001/CRM-17471-4.6
Crm 17471 Fix situation where search options not updating for change in membership status
Web Access [Tue, 3 Nov 2015 13:18:10 +0000 (18:48 +0530)]
Webtest fixes- Master
Monish Deb [Tue, 3 Nov 2015 12:49:55 +0000 (18:19 +0530)]
Merge pull request #7112 from rohankatkar/4.7-WebtestMaster
Webtest Fix-Master
monishdeb [Tue, 3 Nov 2015 11:16:16 +0000 (16:46 +0530)]
CRM-17481 fix - Simply saving Individual Edit Form, create new inherited membership everytime
https://issues.civicrm.org/jira/browse/CRM-17481
Monish Deb [Tue, 3 Nov 2015 05:00:27 +0000 (10:30 +0530)]
Merge pull request #6901 from monishdeb/4.6
CRM-17339 fix - Error when importing contributions matched on name an…
Monish Deb [Tue, 3 Nov 2015 05:00:16 +0000 (10:30 +0530)]
Merge pull request #7041 from monishdeb/CRM-17343
CRM-17343 fix - Invoice email does not send out when completing payme…
Web Access [Tue, 3 Nov 2015 04:50:30 +0000 (10:20 +0530)]
Warning fix
Seamus Lee [Sat, 31 Oct 2015 23:09:12 +0000 (23:09 +0000)]
CRM - 17471 Fix Issue where updated status labels aren't displayed in search
CRM-17471 Fix issue where updated statuses aren't represented in PseudoConstant, by flushing the cache
Change membershipStatus psuedoConstant to use label column not name
Alter buildSearchForm rather than PseudoConstant to be more safe
Coleman Watts [Mon, 2 Nov 2015 21:58:29 +0000 (16:58 -0500)]
Merge branch '4.6' into master
Conflicts:
templates/CRM/common/footer.tpl
Monish Deb [Mon, 2 Nov 2015 19:15:26 +0000 (00:45 +0530)]
Merge pull request #7105 from eileenmcnaughton/master
enotice fix
Monish Deb [Mon, 2 Nov 2015 19:14:16 +0000 (00:44 +0530)]
Merge pull request #7113 from sudhabisht/TestFix
Fix for webtest failure
eileenmcnaugton [Mon, 2 Nov 2015 18:25:33 +0000 (07:25 +1300)]
CRM-17490 fix interface error on activity import
Dave Greenberg [Mon, 2 Nov 2015 18:19:15 +0000 (10:19 -0800)]
Merge pull request #7111 from kurund/CRM-17393
CRM-17393, changed the incorrect logic
Dave Greenberg [Mon, 2 Nov 2015 18:17:04 +0000 (10:17 -0800)]
Merge pull request #7101 from colemanw/footer
Footer tpl cleanup
JKingsnorth [Mon, 2 Nov 2015 15:43:17 +0000 (15:43 +0000)]
CRM-17488 Fix bounce status on mailing detail report
JKingsnorth [Mon, 2 Nov 2015 15:10:04 +0000 (15:10 +0000)]
Remove old merge conflict comments
Mattias Michaux [Mon, 2 Nov 2015 14:59:20 +0000 (15:59 +0100)]
Added possibility to skip the recent view list when creating a relationship.
JKingsnorth [Mon, 2 Nov 2015 14:55:34 +0000 (14:55 +0000)]
Code style fixes
Mattias Michaux [Mon, 2 Nov 2015 14:37:01 +0000 (15:37 +0100)]
Removed accidentally committed code.
Mattias Michaux [Mon, 2 Nov 2015 14:34:31 +0000 (15:34 +0100)]
Fixed CRM_Core_PseudoConstant::accountOptionValues hardcoded values, breaking multilingual installs.
Kurund Jalmi [Mon, 2 Nov 2015 14:22:06 +0000 (19:52 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-02-19-51-55
Mattias Michaux [Fri, 30 Oct 2015 16:42:42 +0000 (17:42 +0100)]
Added correct from value for default reply-to address.
JKingsnorth [Mon, 2 Nov 2015 14:08:20 +0000 (14:08 +0000)]
CRM-17474 Standardise contact summary report fields
Sudha Bisht [Mon, 2 Nov 2015 13:53:29 +0000 (19:23 +0530)]
WebtestFix
Web Access [Mon, 2 Nov 2015 12:31:47 +0000 (18:01 +0530)]
Webtest Fix-Master
Kurund Jalmi [Mon, 2 Nov 2015 12:01:49 +0000 (17:31 +0530)]
CRM-17393, changed the incorrect logic
JKingsnorth [Mon, 2 Nov 2015 10:20:53 +0000 (10:20 +0000)]
CRM-17474 Remove erroneous modified_date (refers to contact not contribution)
Yashodha Chaku [Mon, 2 Nov 2015 08:03:19 +0000 (13:33 +0530)]
Merge pull request #7108 from yashodha/CRM-17478
CRM-17478: Accounting Batch Listings : FATAL error
yashodha [Mon, 2 Nov 2015 05:59:58 +0000 (11:29 +0530)]
CRM-17478: Accounting Batch Listings : FATAL error
----------------------------------------
* CRM-17478: Accounting Batch Listings : FATAL error
https://issues.civicrm.org/jira/browse/CRM-17478
eileenmcnaugton [Mon, 2 Nov 2015 03:29:08 +0000 (16:29 +1300)]
enotice fix
Coleman Watts [Sun, 1 Nov 2015 19:52:19 +0000 (14:52 -0500)]
Fix setting undefined view value
Coleman Watts [Sun, 1 Nov 2015 13:38:18 +0000 (08:38 -0500)]
Footer tpl cleanup
colemanw [Sun, 1 Nov 2015 12:27:48 +0000 (07:27 -0500)]
Merge pull request #7049 from colemanw/angularTitle
Set CMS page title from Angular
Kurund Jalmi [Sun, 1 Nov 2015 11:20:59 +0000 (16:50 +0530)]
Merge pull request #7076 from totten/4.6-weight-sgn
CRM-17466 - Refine error message
Kurund Jalmi [Sun, 1 Nov 2015 10:52:54 +0000 (16:22 +0530)]
Merge pull request #7093 from totten/master-iats
composer.json - Add iATS extension
Kurund Jalmi [Sun, 1 Nov 2015 10:50:06 +0000 (16:20 +0530)]
Merge pull request #7096 from deepak-srivastava/CRM-16865-mass-dedupe-test-cases
CRM-16865 - dedupe batch merge test cases
Kurund Jalmi [Sun, 1 Nov 2015 10:49:40 +0000 (16:19 +0530)]
Merge pull request #7085 from rohankatkar/webtests-4.7-alpha
Webtest fix
colemanw [Sun, 1 Nov 2015 01:20:53 +0000 (21:20 -0400)]
Merge pull request #7097 from seamuslee001/CRM-17303-test2
CRM-17303 fix radiodate test
Seamus Lee [Sat, 31 Oct 2015 22:10:47 +0000 (22:10 +0000)]
Remove month extension in test as no longer needed as we are extending the year
Seamus Lee [Sat, 31 Oct 2015 21:34:16 +0000 (21:34 +0000)]
CRM-17303 Fix Radio Date test
Further test fix
Further test fix
Further test fix
Further test fix
Coleman Watts [Sat, 31 Oct 2015 21:42:00 +0000 (17:42 -0400)]
Add title to caseType screens
Coleman Watts [Sat, 31 Oct 2015 21:40:00 +0000 (17:40 -0400)]
StatusPage tpl cleanup
Dave Greenberg [Fri, 30 Oct 2015 22:45:01 +0000 (15:45 -0700)]
Merge pull request #7094 from lcdservices/CRM-17467
CRM-17467 contrib detail report - batch records
deepak-srivastava [Fri, 30 Oct 2015 21:17:52 +0000 (21:17 +0000)]
batch merge test cases
Coleman Watts [Fri, 30 Oct 2015 20:09:28 +0000 (16:09 -0400)]
CRM-13823 - Only count status messages with priority >= 3
Coleman Watts [Fri, 30 Oct 2015 20:04:04 +0000 (16:04 -0400)]
Support rich text titles + plain document title
Brian Shaughnessy [Fri, 30 Oct 2015 19:42:08 +0000 (15:42 -0400)]
CRM-17467 contrib detail report - batch records
Coleman Watts [Sun, 25 Oct 2015 15:50:43 +0000 (11:50 -0400)]
Force page title to plain text
Coleman Watts [Sun, 25 Oct 2015 15:36:35 +0000 (11:36 -0400)]
Set CMS page title from Angular
Dave Greenberg [Fri, 30 Oct 2015 18:56:53 +0000 (11:56 -0700)]
Merge pull request #7072 from monishdeb/CRM-17457
CRM-17457 fix - Enotices when skip participant is used
Tim Otten [Fri, 30 Oct 2015 18:36:09 +0000 (11:36 -0700)]
composer.json - Add iATS extension
Tim Otten [Fri, 30 Oct 2015 17:57:09 +0000 (10:57 -0700)]
CRM-16373 - Settings - Fix default for ext_repo_url
colemanw [Fri, 30 Oct 2015 17:08:57 +0000 (13:08 -0400)]
Merge pull request #7078 from colemanw/qs
EntityRef filter UI fixes
JKingsnorth [Fri, 30 Oct 2015 14:58:31 +0000 (14:58 +0000)]
CRM-17474: Add fields to participant listing report
Mattias Michaux [Fri, 30 Oct 2015 14:48:05 +0000 (15:48 +0100)]
Don't prefix custom fields with entity table.
Monish Deb [Fri, 30 Oct 2015 14:40:21 +0000 (20:10 +0530)]
Merge pull request #7086 from jitendrapurohit/webtest47
webtest fix for CRM-17182
monishdeb [Fri, 30 Oct 2015 14:18:42 +0000 (19:48 +0530)]
additional notices on enabling tax invoice
Monish Deb [Fri, 30 Oct 2015 14:03:29 +0000 (19:33 +0530)]
Merge pull request #7087 from sudhabisht/webtest2Fix
Webtest2 fix
Sudha Bisht [Fri, 30 Oct 2015 13:59:26 +0000 (19:29 +0530)]
Minor fix
Sudha Bisht [Fri, 30 Oct 2015 13:57:16 +0000 (19:27 +0530)]
WebtestFix2
jitendrapurohit [Fri, 30 Oct 2015 13:21:13 +0000 (18:51 +0530)]
webtest fix for CRM-17182
projects / civicrm-core.git / log