JKingsnorth [Mon, 2 Nov 2015 10:20:53 +0000 (10:20 +0000)]
CRM-17474 Remove erroneous modified_date (refers to contact not contribution)
JKingsnorth [Fri, 30 Oct 2015 14:58:31 +0000 (14:58 +0000)]
CRM-17474: Add fields to participant listing report
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 …
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
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
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…
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
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
Yashodha Chaku [Mon, 26 Oct 2015 06:27:28 +0000 (11:57 +0530)]
Merge pull request #7039 from yashodha/CRM-16990
CRM-16990: Custom fields are NOT being saved for some component custo…
eileenmcnaugton [Mon, 26 Oct 2015 05:49:28 +0000 (18:49 +1300)]
minor clean up of toxic code function
eileenmcnaugton [Mon, 26 Oct 2015 05:36:34 +0000 (18:36 +1300)]
Comments fixes
Eileen McNaughton [Mon, 26 Oct 2015 01:41:23 +0000 (14:41 +1300)]
Merge pull request #7021 from saurabhbatra96/CRM-14756
CRM-14756 fixed some legacy code and the issue where supplying id was not enough.
Eileen McNaughton [Mon, 26 Oct 2015 01:27:48 +0000 (14:27 +1300)]
Merge pull request #7034 from eileenmcnaughton/tests
CRM-17397 fix enotices on amount_level
Coleman Watts [Sun, 25 Oct 2015 14:36:47 +0000 (10:36 -0400)]
CRM-13823 - Fix invalid markup and add animation
colemanw [Sun, 25 Oct 2015 13:14:14 +0000 (09:14 -0400)]
Merge pull request #7033 from colemanw/CRM-13823-2
System status message page fixups
Coleman Watts [Sat, 24 Oct 2015 16:56:23 +0000 (12:56 -0400)]
Whitespace cleanup
Coleman Watts [Sat, 24 Oct 2015 16:52:09 +0000 (12:52 -0400)]
CRM-13823 - Use popup menu for snooze options
Eileen McNaughton [Sat, 24 Oct 2015 11:55:15 +0000 (00:55 +1300)]
Merge pull request #7042 from monishdeb/CRM-17434
CRM-17434 fix - Free event registration with 'skip confirmation' thro…
eileenmcnaugton [Sat, 24 Oct 2015 05:20:37 +0000 (18:20 +1300)]
CRM-17442 fix search builder not yet handling formvalue conversion
Eileen McNaughton [Sat, 24 Oct 2015 05:19:43 +0000 (18:19 +1300)]
Merge pull request #7046 from eileenmcnaughton/master
Master
eileenmcnaugton [Fri, 23 Oct 2015 20:00:44 +0000 (09:00 +1300)]
comment fixes
Eileen McNaughton [Fri, 23 Oct 2015 19:20:33 +0000 (08:20 +1300)]
Merge pull request #7038 from eileenmcnaughton/master
Comments
eileenmcnaugton [Fri, 23 Oct 2015 19:07:49 +0000 (08:07 +1300)]
comment fixes
Coleman Watts [Fri, 23 Oct 2015 19:03:15 +0000 (15:03 -0400)]
CRM-13823 - Show icons in Angular tabs
eileenmcnaugton [Fri, 23 Oct 2015 05:09:14 +0000 (18:09 +1300)]
comment fixes
Coleman Watts [Fri, 23 Oct 2015 18:42:31 +0000 (14:42 -0400)]
CRM-13823 - Show count in Angular tabs
Eileen McNaughton [Fri, 23 Oct 2015 18:36:16 +0000 (07:36 +1300)]
Merge pull request #7043 from saurabhbatra96/comment-fixes-sms
Minor comment-fixes for CRM/SMS directory.
colemanw [Fri, 23 Oct 2015 18:31:59 +0000 (14:31 -0400)]
Merge pull request #7045 from laryn/patch-2
CRM-17440 - CSS improvement for notify UI
Laryn [Fri, 23 Oct 2015 18:20:25 +0000 (13:20 -0500)]
CRM-17440 - CSS improvement for notify UI
Saurabh Batra [Fri, 23 Oct 2015 16:33:15 +0000 (22:03 +0530)]
Minor comment-fixes for CRM/SMS directory.
Coleman Watts [Fri, 23 Oct 2015 12:43:19 +0000 (08:43 -0400)]
CRM-13823 - Snooze/hush cleanup
yashodha [Fri, 23 Oct 2015 11:24:49 +0000 (16:54 +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
monishdeb [Fri, 23 Oct 2015 11:23:34 +0000 (16:53 +0530)]
CRM-17434 fix - Free event registration with 'skip confirmation' throws warning
https://issues.civicrm.org/jira/browse/CRM-17434
yashodha [Fri, 23 Oct 2015 10:10:13 +0000 (15:40 +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
yashodha [Fri, 23 Oct 2015 09:03:00 +0000 (14:33 +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
Monish Deb [Fri, 23 Oct 2015 05:04:17 +0000 (10:34 +0530)]
Merge pull request #7018 from monishdeb/CRM-17129
CRM-17129 fix - Checkbox custom fields for participants are not not r…
eileenmcnaugton [Fri, 23 Oct 2015 05:02:15 +0000 (18:02 +1300)]
comment fixes
Eileen McNaughton [Fri, 23 Oct 2015 04:32:56 +0000 (17:32 +1300)]
phpcs fix
Eileen McNaughton [Fri, 23 Oct 2015 04:30:30 +0000 (17:30 +1300)]
Merge pull request #7036 from eileenmcnaughton/master
Master
eileenmcnaugton [Fri, 23 Oct 2015 03:39:15 +0000 (16:39 +1300)]
comment fixes
eileenmcnaugton [Fri, 23 Oct 2015 02:16:36 +0000 (15:16 +1300)]
comment fixes
Coleman Watts [Fri, 23 Oct 2015 02:31:18 +0000 (22:31 -0400)]
CRM-13823 - Simplify data loading
eileenmcnaugton [Fri, 23 Oct 2015 01:23:01 +0000 (14:23 +1300)]
comment fixes
Eileen McNaughton [Fri, 23 Oct 2015 01:21:07 +0000 (14:21 +1300)]
Merge pull request #7031 from saurabhbatra96/comment-fixes-activity
Comment fixes and function clean-up for CRM/Activity directory.
eileenmcnaugton [Thu, 22 Oct 2015 23:07:28 +0000 (12:07 +1300)]
CRM-17397 fix enotices on amount_level
After looking at this I think the 'right' answer is to always go to the same function to find out what the amount_level
should be - rather than calculate it on the forms and / or tack it onto the function that derives the line_items
I made this change on the form that was experiencing an issue & added a test.
Elsewhere I just added comments
Eileen McNaughton [Thu, 22 Oct 2015 21:46:04 +0000 (10:46 +1300)]
Merge pull request #7030 from eileenmcnaughton/tests
Test fix - adapt tests to not use hard-coded payment_processor_type_id
Coleman Watts [Thu, 22 Oct 2015 21:18:22 +0000 (17:18 -0400)]
CRM-13823 - Remove unused api calls
Coleman Watts [Thu, 22 Oct 2015 19:33:47 +0000 (15:33 -0400)]
CRM-13823 - Switch statusPage to use tabbed interface
monishdeb [Thu, 22 Oct 2015 16:42:24 +0000 (22:12 +0530)]
format only to checkbox values
Coleman Watts [Thu, 22 Oct 2015 16:24:43 +0000 (12:24 -0400)]
CRM-13823 - Show help for system status page
Saurabh Batra [Thu, 22 Oct 2015 12:31:00 +0000 (18:01 +0530)]
Comment fixes and function clean-up for CRM/Activity directory.
Coleman Watts [Thu, 22 Oct 2015 15:42:14 +0000 (11:42 -0400)]
CRM-13823 - Cleanup and add icons to system status messages
colemanw [Thu, 22 Oct 2015 13:49:00 +0000 (09:49 -0400)]
Merge pull request #7024 from colemanw/CRM-13823
CRM-13823 - Better extension error handling
colemanw [Thu, 22 Oct 2015 13:48:01 +0000 (09:48 -0400)]
Merge pull request #7025 from davecivicrm/CRM-17395
CRM-17395 - Backporting to 4.6 branch since it is a minor fix for pai…
projects / civicrm-core.git / log