Dave Greenberg [Wed, 8 Jul 2015 21:42:50 +0000 (14:42 -0700)]
Merge pull request #6172 from colemanw/CRM-16811
CRM-16811 - Support markup fields in popup profile editor
Coleman Watts [Wed, 8 Jul 2015 17:52:13 +0000 (13:52 -0400)]
CRM-16811 - Support markup fields in popup profile editor
Coleman Watts [Wed, 8 Jul 2015 17:44:06 +0000 (13:44 -0400)]
Profile editor - Sort/drag usability fix
Yashodha Chaku [Wed, 8 Jul 2015 15:52:43 +0000 (21:22 +0530)]
Merge pull request #6169 from yashodha/webtest-skip
skipping webtests that are working locally and not on Jenkins
Monish Deb [Wed, 8 Jul 2015 12:47:41 +0000 (18:17 +0530)]
Merge pull request #6114 from seamuslee001/civi_permission
Deal with ACL'ed users not getting is_deleted = 0 added on
Yashodha Chaku [Wed, 8 Jul 2015 10:09:53 +0000 (15:39 +0530)]
Merge pull request #6158 from monishdeb/46test
CRM-16804 fix - Contribution updated via api wrongfully deletes PCP s…
yashodha [Wed, 8 Jul 2015 09:15:59 +0000 (14:45 +0530)]
skipping webtests that are working locally and not on Jenkins
monishdeb [Tue, 7 Jul 2015 10:28:46 +0000 (15:58 +0530)]
minor fix
monishdeb [Tue, 7 Jul 2015 07:07:12 +0000 (12:37 +0530)]
CRM-16804 fix - Contribution updated via api wrongfully deletes PCP soft contribution
https://issues.civicrm.org/jira/browse/CRM-16804
colemanw [Tue, 7 Jul 2015 00:57:25 +0000 (20:57 -0400)]
Merge pull request #6156 from colemanw/CRM-16645
CRM-16645 - Fix js scope issue affecting popup contribution edit forms
Coleman Watts [Tue, 7 Jul 2015 00:54:28 +0000 (20:54 -0400)]
CRM-16645 - Fix js scope issue affecting popup contribution edit forms
Monish Deb [Mon, 6 Jul 2015 19:33:44 +0000 (01:03 +0530)]
Merge pull request #6153 from monishdeb/46test
CRM test failures
monishdeb [Mon, 6 Jul 2015 11:15:34 +0000 (16:45 +0530)]
CRM test failures
Eileen McNaughton [Mon, 6 Jul 2015 01:35:17 +0000 (13:35 +1200)]
Merge pull request #6146 from KarinG/patch-8
Edit <title> to avoid clash with other field
Karin Gerritsen [Sun, 5 Jul 2015 22:01:13 +0000 (16:01 -0600)]
Edit <title> to avoid clash with other field
Both processor_id and payment_processor_id have <title>Payment Processor</title>. This causes issues with imports into the recurring series table (using Eileen's CSV importer) - as the field mapping is stored by title and will always select the first match - even if you previously selected 'the second Payment Processor' <title>. Renaming the <title> for processor_id to Processor ID. Leaving the payment_processor_id <title> as is: Payment Processor
colemanw [Sat, 4 Jul 2015 01:56:43 +0000 (21:56 -0400)]
Merge pull request #6138 from colemanw/CRM-16643
CRM-16643 - Add 'setvalue' deprecation warning to api explorer
Coleman Watts [Fri, 3 Jul 2015 20:40:59 +0000 (16:40 -0400)]
CRM-16643 - Add 'setvalue' deprecation warning to api explorer
colemanw [Fri, 3 Jul 2015 20:20:44 +0000 (16:20 -0400)]
Merge pull request #6134 from colemanw/CRM-16584
CRM-16584 - Improve bounce management with Mandrilla SMTP
Coleman Watts [Fri, 3 Jul 2015 15:31:13 +0000 (11:31 -0400)]
Whitespace fix
Olivier [Fri, 3 Jul 2015 14:05:41 +0000 (10:05 -0400)]
CRM-16584 - Improve bounce management with Mandrilla SMTP
colemanw [Fri, 3 Jul 2015 13:37:24 +0000 (09:37 -0400)]
Merge pull request #6129 from colemanw/CRM-16793
CRM-16793 - Fix editing group names
colemanw [Fri, 3 Jul 2015 13:31:33 +0000 (09:31 -0400)]
Merge pull request #6132 from colemanw/CRM-16795
CRM-16795 - Fix z-index conflict btw WP admin bar and popups
Coleman Watts [Fri, 3 Jul 2015 13:28:41 +0000 (09:28 -0400)]
CRM-16795 - Fix z-index conflict btw WP admin bar and popups
Monish Deb [Fri, 3 Jul 2015 09:43:08 +0000 (15:13 +0530)]
Merge pull request #6124 from sudhabisht/46qa
Webtest Failure
Yashodha Chaku [Fri, 3 Jul 2015 08:43:23 +0000 (14:13 +0530)]
Merge pull request #6130 from civicrm/revert-6117-CRM-16735.4.6
Revert "CRM-16735: PCP notification email should not be sent when con…
Yashodha Chaku [Fri, 3 Jul 2015 12:21:33 +0000 (17:51 +0530)]
Revert "CRM-16735: PCP notification email should not be sent when contributio…"
Sudha Bisht [Fri, 3 Jul 2015 07:06:37 +0000 (12:36 +0530)]
Format Fixs
Sudha Bisht [Thu, 2 Jul 2015 15:06:20 +0000 (20:36 +0530)]
Format fix
Sudha Bisht [Thu, 2 Jul 2015 14:47:32 +0000 (20:17 +0530)]
Removed unwanted code
Sudha Bisht [Thu, 2 Jul 2015 14:39:45 +0000 (20:09 +0530)]
Webtest Fix
Yashodha Chaku [Fri, 3 Jul 2015 06:48:42 +0000 (12:18 +0530)]
Merge pull request #6117 from yashodha/CRM-16735.4.6
CRM-16735: PCP notification email should not be sent when contributio…
Coleman Watts [Fri, 3 Jul 2015 00:34:44 +0000 (20:34 -0400)]
CRM-16793 - Fix editing group names
colemanw [Fri, 3 Jul 2015 00:19:09 +0000 (20:19 -0400)]
Merge pull request #6111 from colemanw/CRM-11856
CRM-11856 - Add help text when creating a smart group
Dave Greenberg [Thu, 2 Jul 2015 16:50:19 +0000 (09:50 -0700)]
Merge pull request #6122 from marcov4lente/CRM-16789
CRM-16789 Invoice attachements when tax rate is 0.
Marco Valente [Thu, 2 Jul 2015 11:33:55 +0000 (12:33 +0100)]
CRM-16789 Invoice attachements when tax rate is 0
Correcting the issue: Event or contribution payment invoices is not being sent when
the tax amount is 0 or evaluates to false.
Monish Deb [Wed, 1 Jul 2015 21:53:35 +0000 (03:23 +0530)]
Merge pull request #6119 from monishdeb/CRM-16782
CRM-16782 fix - Fatal error on using IN/NOT IN operator on contribution and membership fields
monishdeb [Wed, 1 Jul 2015 21:51:15 +0000 (03:21 +0530)]
Webtest fix
Monish Deb [Wed, 1 Jul 2015 18:52:34 +0000 (00:22 +0530)]
Merge pull request #6118 from sudhabisht/46webtest
Webtest Fix
monishdeb [Wed, 1 Jul 2015 14:32:14 +0000 (20:02 +0530)]
CRM-16782 fix - Fatal error on using IN/NOT IN operator on contribution and membership fields
https://issues.civicrm.org/jira/browse/CRM-16782
Monish Deb [Wed, 1 Jul 2015 14:01:57 +0000 (19:31 +0530)]
Merge pull request #6116 from rohankatkar/webtest4.6
Webtest fix - 4.6
Sudha Bisht [Wed, 1 Jul 2015 13:59:24 +0000 (19:29 +0530)]
Webtest Fix
yashodha [Wed, 1 Jul 2015 13:48:13 +0000 (19:18 +0530)]
line spacing fix
yashodha [Wed, 1 Jul 2015 11:40:36 +0000 (17:10 +0530)]
CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
----------------------------------------
* CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
https://issues.civicrm.org/jira/browse/CRM-16735
yashodha [Wed, 1 Jul 2015 10:54:43 +0000 (16:24 +0530)]
CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
----------------------------------------
* CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
https://issues.civicrm.org/jira/browse/CRM-16735
Eileen McNaughton [Wed, 1 Jul 2015 08:52:05 +0000 (20:52 +1200)]
Merge pull request #6088 from eileenmcnaughton/CRM-16473
CRM-16473 api:user Add user.get api
Web Access [Wed, 1 Jul 2015 07:14:47 +0000 (12:44 +0530)]
Webtest fix - 4.6
Eileen McNaughton [Wed, 1 Jul 2015 02:03:20 +0000 (14:03 +1200)]
cleanup uf match in custom data test
Eileen McNaughton [Wed, 1 Jul 2015 02:00:41 +0000 (14:00 +1200)]
CRM-16473 - createLoggedInUser in setup & in test - reduce to setup only
Seamus Lee [Tue, 30 Jun 2015 23:47:08 +0000 (23:47 +0000)]
Deal with ACL'ed users not getting is_deleted = 0 added on
Eileen McNaughton [Tue, 30 Jun 2015 21:51:14 +0000 (09:51 +1200)]
CRM-16473 test fixes to support addition of User api & uf_match entry to createLoggedInUser
Eileen McNaughton [Tue, 30 Jun 2015 21:49:15 +0000 (09:49 +1200)]
CRM-16473 add user api test
Eileen McNaughton [Tue, 30 Jun 2015 21:47:59 +0000 (09:47 +1200)]
CRM-16473 API: user.get - add user get api (drupal only)
Coleman Watts [Tue, 30 Jun 2015 21:25:15 +0000 (17:25 -0400)]
CRM-11856 - Copy/paste the fix to copy/pasted code
Coleman Watts [Tue, 30 Jun 2015 20:58:14 +0000 (16:58 -0400)]
CRM-11856 - Add help text when creating a smart group
Coleman Watts [Tue, 30 Jun 2015 19:10:08 +0000 (15:10 -0400)]
Fix task button icon
Yashodha Chaku [Tue, 30 Jun 2015 16:32:09 +0000 (22:02 +0530)]
Merge pull request #6110 from jitendrapurohit/webtestfixes
webtest fix for Address Import
Dave Greenberg [Tue, 30 Jun 2015 15:01:19 +0000 (08:01 -0700)]
Merge pull request #5839 from seamuslee001/CRM-9764-4-6
CRM-9764 Ensure all custom searches have ACL - Backport to 4.6
jitendrapurohit [Tue, 30 Jun 2015 13:23:48 +0000 (18:53 +0530)]
webtest fix for Address Import
Yashodha Chaku [Tue, 30 Jun 2015 10:19:00 +0000 (15:49 +0530)]
Merge pull request #6107 from yashodha/CRM-16768
CRM-16768: Invoice template function uses domain id instead of contac…
yashodha [Tue, 30 Jun 2015 07:13:47 +0000 (12:43 +0530)]
CRM-16768: Invoice template function uses domain id instead of contact id to get address parts
----------------------------------------
* CRM-16768: Invoice template function uses domain id instead of contact id to get address parts
https://issues.civicrm.org/jira/browse/CRM-16768
Monish Deb [Tue, 30 Jun 2015 05:56:41 +0000 (11:26 +0530)]
Merge pull request #6102 from sudhabisht/CRM-16685
Fix for status message while displaying disabled event info.
Seamus Lee [Tue, 30 Jun 2015 05:12:26 +0000 (05:12 +0000)]
Fix minor typo
Dave Greenberg [Mon, 29 Jun 2015 22:58:13 +0000 (15:58 -0700)]
Merge pull request #6091 from davecivicrm/CRM-16747
CRM-16747 - Include missing ContactReference.tpl in OnBehalf profile …
Seamus Lee [Mon, 29 Jun 2015 22:08:58 +0000 (22:08 +0000)]
Fix PHP style issues
Seamus Lee [Mon, 29 Jun 2015 22:05:47 +0000 (22:05 +0000)]
Fix up SQL errors found by dave
Monish Deb [Mon, 29 Jun 2015 18:09:56 +0000 (23:39 +0530)]
Merge pull request #6105 from rohankatkar/CRM-16755
CRM-16755: Case Summary Report - Invalid number of entries
Monish Deb [Mon, 29 Jun 2015 13:52:27 +0000 (19:22 +0530)]
Merge pull request #6103 from jitendrapurohit/CRM-16764
CRM-16764 fix for 'Find Respondents To Interview' and 'Find Respondents To Release' thr…
Web Access [Mon, 29 Jun 2015 13:13:51 +0000 (18:43 +0530)]
Fix for CRM-16755
jitendrapurohit [Mon, 29 Jun 2015 09:57:18 +0000 (15:27 +0530)]
'Find Respondents To Interview' and 'Find Respondents To Release' throws DB error
Sudha Bisht [Mon, 29 Jun 2015 07:06:34 +0000 (12:36 +0530)]
Fix for event info message
Monish Deb [Sun, 28 Jun 2015 19:24:22 +0000 (00:54 +0530)]
Merge pull request #6095 from jitendrapurohit/webtestfixes
webtest fix
Monish Deb [Sun, 28 Jun 2015 19:23:54 +0000 (00:53 +0530)]
Merge pull request #6096 from sudhabisht/4.6QA
Fix for AddCaseTypeTest failure
Monish Deb [Sun, 28 Jun 2015 19:22:31 +0000 (00:52 +0530)]
Merge pull request #6094 from rohankatkar/Webtest--4.6
Webtest Fix-4.6
Yashodha Chaku [Sun, 28 Jun 2015 14:32:50 +0000 (20:02 +0530)]
Merge pull request #6100 from yashodha/webtest
skipping webtests that are working locally and not on Jenkins
yashodha [Sun, 28 Jun 2015 06:59:42 +0000 (12:29 +0530)]
skipping webtests that are working locally and not on Jenkins
colemanw [Sat, 27 Jun 2015 17:20:21 +0000 (13:20 -0400)]
Merge pull request #6097 from colemanw/image
Better sizing of image popups
Coleman Watts [Fri, 26 Jun 2015 19:39:40 +0000 (15:39 -0400)]
Better sizing of image popups
Sudha Bisht [Fri, 26 Jun 2015 13:27:31 +0000 (18:57 +0530)]
Fix for AddCaseTypeTest failure
jitendrapurohit [Fri, 26 Jun 2015 13:22:07 +0000 (18:52 +0530)]
webtest fix
Web Access [Fri, 26 Jun 2015 13:11:17 +0000 (18:41 +0530)]
Webtest Fix-4.6
Dave Greenberg [Fri, 26 Jun 2015 00:05:30 +0000 (17:05 -0700)]
CRM-16747 - Include missing ContactReference.tpl in OnBehalf profile form template.
----------------------------------------
* CRM-16747: Contact Reference fields do not work in profiles present on "On Behalf Of" Contribution pages.
https://issues.civicrm.org/jira/browse/CRM-16747
Monish Deb [Thu, 25 Jun 2015 10:33:58 +0000 (16:03 +0530)]
Merge pull request #6064 from sfe-ev/fix-dompdf-reinvoke
Fix CRM_Utils_PDF_Utils::_html2pdf_dompdf() when invoked more than once
Tim Otten [Thu, 25 Jun 2015 04:16:44 +0000 (21:16 -0700)]
Merge pull request #5840 from totten/4.6-cron-lock-2
CiviMail locks - Tests, fixes, and cleanups
Seamus Lee [Thu, 25 Jun 2015 01:10:17 +0000 (01:10 +0000)]
Fix Whitespace issues
Seamus Lee [Thu, 25 Jun 2015 00:25:56 +0000 (00:25 +0000)]
CRM-9764 Fix underfined property notices noticed by David
Tim Otten [Wed, 24 Jun 2015 21:09:24 +0000 (14:09 -0700)]
bin/cli.php - Accept `-J` as alias for `--json`
colemanw [Tue, 23 Jun 2015 19:41:21 +0000 (15:41 -0400)]
Merge pull request #6069 from eileenmcnaughton/CRM-16627
CRM-16627 add invoice id to contribution search
Eileen McNaughton [Tue, 23 Jun 2015 01:17:35 +0000 (13:17 +1200)]
CRM-16627 add br tag per dggs advice
Dave Greenberg [Tue, 23 Jun 2015 01:07:28 +0000 (18:07 -0700)]
Merge pull request #6068 from eileenmcnaughton/4.6
fixes to comments
Eileen McNaughton [Mon, 22 Jun 2015 23:49:57 +0000 (11:49 +1200)]
CRM-16627 add invoice id to contribution search
Eileen McNaughton [Mon, 22 Jun 2015 23:00:17 +0000 (11:00 +1200)]
phpcs fixes
Eileen McNaughton [Mon, 22 Jun 2015 22:40:15 +0000 (10:40 +1200)]
phpcs fixes
Dave Greenberg [Mon, 22 Jun 2015 18:17:13 +0000 (11:17 -0700)]
Merge pull request #6062 from eileenmcnaughton/CRM-16417-46
CRM-16417 add failed payment activity type
Olaf Buddenhagen [Sat, 20 Jun 2015 22:49:12 +0000 (00:49 +0200)]
Fix CRM_Utils_PDF_Utils::_html2pdf_dompdf() when invoked more than once
Constants are like functions: they are always global; and they cannot
be redefined. Thus, move the defines to a context that doesn't get
re-evaluated on each invocation.
colemanw [Sat, 20 Jun 2015 18:20:11 +0000 (14:20 -0400)]
Merge pull request #6063 from colemanw/editable
Fix caching of multi-custom options
Coleman Watts [Sat, 20 Jun 2015 18:06:22 +0000 (14:06 -0400)]
Fix caching of multi-custom options
Eileen McNaughton [Sat, 20 Jun 2015 08:54:00 +0000 (20:54 +1200)]
CRM-16417 add failed payment activity type
colemanw [Fri, 19 Jun 2015 18:29:40 +0000 (14:29 -0400)]
Merge pull request #5961 from colemanw/CRM-16577
CRM-16577 - Clear caches more thoroughly from UpdateConfigBackend
colemanw [Fri, 19 Jun 2015 16:36:00 +0000 (12:36 -0400)]
Merge pull request #5962 from colemanw/CRM-16556
CRM-16556 - Clear caches more thoroughly from config->cleanupCaches
colemanw [Fri, 19 Jun 2015 01:58:19 +0000 (21:58 -0400)]
Merge pull request #5998 from seamuslee001/CRM-16600-4.6
Crm 16600 4.6
projects / civicrm-core.git / log