Brian Shaughnessy [Tue, 3 Nov 2015 00:48:05 +0000 (19:48 -0500)]
CRM-17491 update price set field if quantity changes
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
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
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
Sudha Bisht [Mon, 2 Nov 2015 13:53:29 +0000 (19:23 +0530)]
WebtestFix
Kurund Jalmi [Mon, 2 Nov 2015 12:01:49 +0000 (17:31 +0530)]
CRM-17393, changed the incorrect logic
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
colemanw [Fri, 30 Oct 2015 17:08:57 +0000 (13:08 -0400)]
Merge pull request #7078 from colemanw/qs
EntityRef filter UI fixes
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
Web Access [Fri, 30 Oct 2015 13:15:00 +0000 (18:45 +0530)]
Webtest fix
Yashodha Chaku [Fri, 30 Oct 2015 11:53:23 +0000 (17:23 +0530)]
Merge pull request #7079 from monishdeb/testFailures
4.7beta1 Webtest fixes for Event
Yashodha Chaku [Fri, 30 Oct 2015 11:45:02 +0000 (17:15 +0530)]
Merge pull request #7083 from yashodha/CRM-17181
rename Participant Fee to avoid confusion w/ contribution fee amount …
monishdeb [Fri, 30 Oct 2015 11:34:48 +0000 (17:04 +0530)]
fixes for profile
yashodha [Fri, 30 Oct 2015 09:33:53 +0000 (15:03 +0530)]
rename Participant Fee to avoid confusion w/ contribution fee amount in the event report
Yashodha Chaku [Fri, 30 Oct 2015 09:16:00 +0000 (14:46 +0530)]
Merge pull request #7082 from yashodha/fixCRM-17461
CRM-17461: Contribution Batch Entry : eNotices and invalid / missing …
yashodha [Fri, 30 Oct 2015 09:08:37 +0000 (14:38 +0530)]
CRM-17461: Contribution Batch Entry : eNotices and invalid / missing receipt data
----------------------------------------
* CRM-17461: Contribution Batch Entry : eNotices and invalid / missing receipt data
https://issues.civicrm.org/jira/browse/CRM-17461
monishdeb [Fri, 30 Oct 2015 07:26:43 +0000 (12:56 +0530)]
4.7beta1 Webtest fixes for Event
Yashodha Chaku [Fri, 30 Oct 2015 06:00:08 +0000 (11:30 +0530)]
Merge pull request #7062 from yashodha/CRM-17331
CRM-17331: Mass SMSes are not being sent, even though send schedules …
Monish Deb [Fri, 30 Oct 2015 05:03:20 +0000 (10:33 +0530)]
Merge pull request #7075 from rohankatkar/Master_webtests
Webtest Fix for Import
Coleman Watts [Fri, 30 Oct 2015 00:30:52 +0000 (20:30 -0400)]
EntityRef filter UI fixes
Tim Otten [Thu, 29 Oct 2015 21:08:24 +0000 (14:08 -0700)]
CRM-17466 - Refine error message
Web Access [Thu, 29 Oct 2015 13:18:18 +0000 (18:48 +0530)]
Webtest Fix for Import
yashodha [Thu, 29 Oct 2015 09:35:34 +0000 (15:05 +0530)]
CRM-17331: Mass SMSes are not being sent, even though send schedules SMS -job completes without errors
----------------------------------------
* CRM-17331: Mass SMSes are not being sent, even though "send schedules SMS"-job completes without errors
https://issues.civicrm.org/jira/browse/CRM-17331
Kurund Jalmi [Thu, 29 Oct 2015 07:22:03 +0000 (12:52 +0530)]
Merge pull request #7071 from davecivicrm/CRM-17032
CRM-17032 - Add totals for Fees and Net Amount to Contribution Detail…
monishdeb [Thu, 29 Oct 2015 06:19:27 +0000 (11:49 +0530)]
CRM-17457 fix - Enotices when skip participant is used
https://issues.civicrm.org/jira/browse/CRM-17457
Dave Greenberg [Thu, 29 Oct 2015 00:21:40 +0000 (17:21 -0700)]
CRM-17032 - Add totals for Fees and Net Amount to Contribution Detail Report.
----------------------------------------
* CRM-17032: Add Fees and Net to Statistics of Contribution Detail Report
https://issues.civicrm.org/jira/browse/CRM-17032
Dave Greenberg [Wed, 28 Oct 2015 23:53:27 +0000 (16:53 -0700)]
Merge pull request #7070 from davecivicrm/CRM-17425
Crm 17425
Dave Greenberg [Wed, 28 Oct 2015 23:24:01 +0000 (16:24 -0700)]
Merge pull request #7063 from monishdeb/CRM-17434
CRM-17434 fix - Free event registration with 'skip confirmation' thro…
Dave Greenberg [Wed, 28 Oct 2015 22:55:03 +0000 (15:55 -0700)]
CRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGroup tabset.
----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
https://issues.civicrm.org/jira/browse/CRM-17425
Dave Greenberg [Wed, 28 Oct 2015 22:17:49 +0000 (15:17 -0700)]
Merge pull request #7067 from eileenmcnaughton/uf_field
Fix form-call to uf_field:add to reflect new standardised fn signature
Dave Greenberg [Wed, 28 Oct 2015 22:14:59 +0000 (15:14 -0700)]
CRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGroup tabset.
----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
https://issues.civicrm.org/jira/browse/CRM-17425
Dave Greenberg [Wed, 28 Oct 2015 22:10:25 +0000 (15:10 -0700)]
Merge pull request #7010 from agh1/pcp-profile
CRM-17425 Handle PCP fields on contribution batch entry
Coleman Watts [Wed, 28 Oct 2015 15:36:00 +0000 (11:36 -0400)]
CRM-13823 - More descriptive titles for upgrade messages
Kurund Jalmi [Wed, 28 Oct 2015 15:08:46 +0000 (20:38 +0530)]
Merge pull request #7068 from rohankatkar/Webtest-Master
Webtest fix for master
Web Access [Wed, 28 Oct 2015 13:23:34 +0000 (18:53 +0530)]
Webtest fix
monishdeb [Wed, 28 Oct 2015 08:34:25 +0000 (14:04 +0530)]
CRM-17434 fix - Free event registration with 'skip confirmation' throws warning
https://issues.civicrm.org/jira/browse/CRM-17434
Kurund Jalmi [Wed, 28 Oct 2015 06:11:00 +0000 (11:41 +0530)]
Merge pull request #7066 from eileenmcnaughton/CRM-17120-2
CRM-17120 remove calls to uncached function
Kurund Jalmi [Wed, 28 Oct 2015 06:09:57 +0000 (11:39 +0530)]
Merge pull request #7064 from rohankatkar/Webtest-Fix-Master
Webtest Fix- Master
eileen [Wed, 28 Oct 2015 00:56:58 +0000 (13:56 +1300)]
Fix form-call to uf_field:add to reflect new standardised fn signature
colemanw [Wed, 28 Oct 2015 00:44:15 +0000 (20:44 -0400)]
Merge pull request #7065 from colemanw/wysiwyg
wysiwyg cleanup
eileen [Wed, 28 Oct 2015 00:11:49 +0000 (13:11 +1300)]
CRM-17120 remove calls to uncached function
Dave Greenberg [Tue, 27 Oct 2015 23:15:00 +0000 (16:15 -0700)]
Merge pull request #7037 from seamuslee001/CRM-17436
CRM-17436 Make the Date and time filter on ContributionAggregate sear…
Eileen McNaughton [Tue, 27 Oct 2015 22:27:11 +0000 (11:27 +1300)]
Merge pull request #7058 from eileenmcnaughton/merge-test
Add test for contact.merge action
Eileen McNaughton [Tue, 27 Oct 2015 22:26:45 +0000 (11:26 +1300)]
Merge pull request #7060 from eileenmcnaughton/CRM-17256-paypal
CRM-17256 Show / bounce on paypal express errors
Coleman Watts [Tue, 27 Oct 2015 19:32:17 +0000 (15:32 -0400)]
CRM-16354 - use crm-wysiwyg-enabled css class more reliably
Coleman Watts [Tue, 27 Oct 2015 19:12:26 +0000 (15:12 -0400)]
CRM-16354 - Add sanity check
Dave Greenberg [Tue, 27 Oct 2015 18:52:08 +0000 (11:52 -0700)]
Merge pull request #7061 from eileenmcnaughton/CRM-17397
CRM-17397 enotice fix
Web Access [Tue, 27 Oct 2015 13:01:38 +0000 (18:31 +0530)]
Webtest Fix- Master
monishdeb [Tue, 27 Oct 2015 10:59:51 +0000 (16:29 +0530)]
CRM-17434 fix - Free event registration with 'skip confirmation' throws warning
https://issues.civicrm.org/jira/browse/CRM-17434
yashodha [Tue, 27 Oct 2015 08:27:40 +0000 (13:57 +0530)]
CRM-17331: Mass SMSes are not being sent, even though send schedules SMS -job completes without errors
----------------------------------------
* CRM-17331: Mass SMSes are not being sent, even though "send schedules SMS"-job completes without errors
https://issues.civicrm.org/jira/browse/CRM-17331
eileen [Tue, 27 Oct 2015 08:10:08 +0000 (21:10 +1300)]
CRM-17397 enotice fix
Eileen McNaughton [Tue, 27 Oct 2015 07:50:37 +0000 (20:50 +1300)]
Merge pull request #7052 from eileenmcnaughton/master
Comments fixes
eileen [Mon, 26 Oct 2015 22:14:14 +0000 (11:14 +1300)]
Add test for contact.merge action
eileen [Tue, 27 Oct 2015 07:43:42 +0000 (20:43 +1300)]
CRM-17256 Show / bounce on paypal express errors
Yashodha Chaku [Tue, 27 Oct 2015 06:49:42 +0000 (12:19 +0530)]
Merge pull request #7054 from yashodha/fix.CRM-16990
CRM-16990: Custom fields are NOT being saved for some component custo…
yashodha [Tue, 27 Oct 2015 05:41:16 +0000 (11:11 +0530)]
CRM-16990: notice fixes
----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
https://issues.civicrm.org/jira/browse/CRM-16990
yashodha [Mon, 26 Oct 2015 07:00:35 +0000 (12:30 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
https://issues.civicrm.org/jira/browse/CRM-16990
colemanw [Tue, 27 Oct 2015 01:55:06 +0000 (21:55 -0400)]
Merge pull request #7056 from colemanw/CRM-16665
CRM-16665 - Fix inappropriate tpl inclusion
Dave Greenberg [Tue, 27 Oct 2015 01:18:42 +0000 (18:18 -0700)]
Merge pull request #7057 from davecivicrm/CRM-17271
CRM-17271 - Change all references to profile field visibility to use …
Dave Greenberg [Mon, 26 Oct 2015 23:47:16 +0000 (16:47 -0700)]
CRM-17271 - Fix test to look for new visibilty label.
----------------------------------------
* CRM-17271: Change Profile Field Label from Public Pages to Expose Publicly
https://issues.civicrm.org/jira/browse/CRM-17271
Dave Greenberg [Mon, 26 Oct 2015 21:49:17 +0000 (14:49 -0700)]
CRM-17271 - Change all references to profile field visibility to use new language (help and drop-downs in php and js).
----------------------------------------
* CRM-17271: Change Profile Field Label from Public Pages to Expose Publicly
https://issues.civicrm.org/jira/browse/CRM-17271
Coleman Watts [Mon, 26 Oct 2015 21:28:32 +0000 (17:28 -0400)]
CRM-16665 - Fix inappropriate tpl inclusion
Kurund Jalmi [Mon, 26 Oct 2015 18:50:06 +0000 (00:20 +0530)]
Merge pull request #7050 from saurabhbatra96/comment-fixes-extension
Minor comment fixes for CRM/Extensions directory.
colemanw [Mon, 26 Oct 2015 14:33:00 +0000 (10:33 -0400)]
Merge pull request #7053 from eileenmcnaughton/toxic
minor clean up of toxic code function
Saurabh Batra [Sun, 25 Oct 2015 15:55:58 +0000 (21:25 +0530)]
Minor comment fixes for CRM/Extensions directory.
Monish Deb [Mon, 26 Oct 2015 09:56:33 +0000 (15:26 +0530)]
Merge pull request #7055 from monishdeb/CRM-17441
CRM-17441 fix - Code issue in search save
monishdeb [Mon, 26 Oct 2015 09:52:05 +0000 (15:22 +0530)]
CRM-17441 fix - Code issue in search save
https://issues.civicrm.org/jira/browse/CRM-17441
Monish Deb [Mon, 26 Oct 2015 09:39:44 +0000 (15:09 +0530)]
Merge pull request #7048 from eileenmcnaughton/CRM-17442
CRM-17442 fix search builder not yet handling formvalue conversion
Kurund Jalmi [Mon, 26 Oct 2015 08:58:59 +0000 (14:28 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-26-14-28-29
projects / civicrm-core.git / log