Monish Deb [Tue, 14 Jul 2015 05:24:03 +0000 (10:54 +0530)]
Merge pull request #6202 from jitendrapurohit/CRM-16823
CRM-16823 - Contact Image does not display on contact summary screen …
Yashodha Chaku [Tue, 14 Jul 2015 05:02:17 +0000 (10:32 +0530)]
Merge pull request #6198 from Seb35/4.6
CRM-16824: Unrecognized date format in custom fields during import of…
Dave Greenberg [Mon, 13 Jul 2015 18:03:39 +0000 (11:03 -0700)]
Merge pull request #6126 from rohankatkar/CRM-16777
CRM-16777: Allow users who can configure an event to also configure scheduled reminders for that event
Dave Greenberg [Mon, 13 Jul 2015 17:01:53 +0000 (10:01 -0700)]
Merge pull request #6050 from eileenmcnaughton/CRM-16717
CRM-16717 alter logging table field length when altering custom table…
Web Access [Mon, 13 Jul 2015 15:56:13 +0000 (21:26 +0530)]
Changes to CRM-16777
Monish Deb [Mon, 13 Jul 2015 13:37:46 +0000 (19:07 +0530)]
Merge pull request #6182 from monishdeb/46test
CRM-16711 fix - contact details accessible v…
monishdeb [Mon, 13 Jul 2015 10:11:59 +0000 (15:41 +0530)]
QA changes
monishdeb [Fri, 10 Jul 2015 18:35:20 +0000 (00:05 +0530)]
minor fix
monishdeb [Thu, 9 Jul 2015 20:38:09 +0000 (02:08 +0530)]
CRM-16711 fix - Security breach of data: contact details accessible via relationships
https://issues.civicrm.org/jira/browse/CRM-16711
Kurund Jalmi [Mon, 13 Jul 2015 09:31:10 +0000 (15:01 +0530)]
Merge pull request #6178 from xurizaemon/CRM-16821
CRM-16821
Web Access [Mon, 13 Jul 2015 09:26:25 +0000 (14:56 +0530)]
Modifications to CRM-16777
Yashodha Chaku [Mon, 13 Jul 2015 08:35:25 +0000 (14:05 +0530)]
Merge pull request #6187 from yashodha/CRM-16814
CRM-16814: Scheduled Activity on a second case is deleted when the op…
jitendrapurohit [Mon, 13 Jul 2015 07:25:37 +0000 (12:55 +0530)]
CRM-16823 - Contact Image does not display on contact summary screen when loaded via a profile
Seb35 [Sat, 11 Jul 2015 16:59:36 +0000 (18:59 +0200)]
CRM-16824: Unrecognized date format in custom fields during import of contributions
During import of contributions, the contact type was not explicely set, leading to
misrecognized contribution custom fields. This was fixed by comparing with the
pre-import (summary) function, and tested on a real import of contributions with custom
fields.
colemanw [Fri, 10 Jul 2015 19:06:04 +0000 (15:06 -0400)]
Merge pull request #6195 from colemanw/Fix
Fix contact sub-type profile field to use select2
Coleman Watts [Fri, 10 Jul 2015 19:05:34 +0000 (15:05 -0400)]
Fix contact sub-type profile field to use select2
Dave Greenberg [Fri, 10 Jul 2015 15:36:31 +0000 (08:36 -0700)]
Merge pull request #6183 from lsmithgo/patch-1
Update Joomla.php
colemanw [Fri, 10 Jul 2015 15:30:41 +0000 (11:30 -0400)]
Merge pull request #6192 from colemanw/CRM-16825
CRM-16825 - Respect quicksearch result count setting
Coleman Watts [Fri, 10 Jul 2015 15:28:14 +0000 (11:28 -0400)]
CRM-16825 - Respect quicksearch result count setting
Dave Greenberg [Fri, 10 Jul 2015 14:42:10 +0000 (07:42 -0700)]
Merge pull request #6141 from monishdeb/4.6
CRM-16483 fix - Fix search builder to accept all operators with conta… …
Web Access [Fri, 10 Jul 2015 13:13:15 +0000 (18:43 +0530)]
Warning fix
Web Access [Fri, 10 Jul 2015 13:06:17 +0000 (18:36 +0530)]
Additional changes
Web Access [Tue, 7 Jul 2015 10:14:50 +0000 (15:44 +0530)]
webtest for CRM-16777
Web Access [Thu, 2 Jul 2015 15:50:39 +0000 (21:20 +0530)]
Fix for CRM-16777
Monish Deb [Fri, 10 Jul 2015 12:18:47 +0000 (17:48 +0530)]
Merge pull request #6133 from jitendrapurohit/CRM-16796
CRM-16796 - Add ACL support for profile related api's
yashodha [Fri, 10 Jul 2015 09:57:44 +0000 (15:27 +0530)]
CRM-16814: Scheduled Activity on a second case is deleted when the open date on the first case is changed
----------------------------------------
* CRM-16814: Scheduled Activity on a second case is deleted when the open date on the first case is changed
https://issues.civicrm.org/jira/browse/CRM-16814
jitendrapurohit [Tue, 7 Jul 2015 11:44:42 +0000 (17:14 +0530)]
warning fixes
jitendrapurohit [Tue, 7 Jul 2015 09:51:48 +0000 (15:21 +0530)]
webtest for CRM-16796 and CRM-16776
jitendrapurohit [Tue, 7 Jul 2015 09:49:06 +0000 (15:19 +0530)]
api test for CRM-16796
jitendrapurohit [Mon, 6 Jul 2015 04:33:31 +0000 (10:03 +0530)]
style fix
jitendrapurohit [Fri, 3 Jul 2015 13:34:20 +0000 (19:04 +0530)]
CRM-16796 - Add ACL support for profile related api's
Eileen McNaughton [Fri, 10 Jul 2015 02:14:35 +0000 (14:14 +1200)]
Merge pull request #6150 from eileenmcnaughton/CRM-16803
CRM-16803 fix non-creating on recurring contributio record on members…
lsmithgo [Thu, 9 Jul 2015 22:43:38 +0000 (23:43 +0100)]
Update Joomla.php
One word fix to CRM-16827 for redirection to login page and back during event registration
Eileen McNaughton [Thu, 9 Jul 2015 21:26:59 +0000 (09:26 +1200)]
CRM-16803 QA fixes
Yashodha Chaku [Thu, 9 Jul 2015 14:03:37 +0000 (19:33 +0530)]
Merge pull request #6160 from eileenmcnaughton/CRM-16737
CRM-16737 support either payment_status_id OR contribution_status_id
monishdeb [Thu, 9 Jul 2015 11:46:47 +0000 (17:16 +0530)]
minor fix
Chris Burgess [Thu, 9 Jul 2015 04:51:22 +0000 (16:51 +1200)]
CRM-16821. Improve output escaping from CRM_Core_Error.
monishdeb [Wed, 8 Jul 2015 09:21:36 +0000 (14:51 +0530)]
add smartGroup title in select clause
monishdeb [Sat, 4 Jul 2015 14:51:50 +0000 (20:21 +0530)]
reverted chcanges
monishdeb [Sat, 4 Jul 2015 14:30:02 +0000 (20:00 +0530)]
api failure fixes
monishdeb [Fri, 3 Jul 2015 14:19:26 +0000 (19:49 +0530)]
formatting fix
monishdeb [Fri, 3 Jul 2015 14:02:38 +0000 (19:32 +0530)]
CRM-16483 fix - Fix search builder to accept all operators with contact groups
https://issues.civicrm.org/jira/browse/CRM-16483
Conflicts:
CRM/Contact/BAO/Query.php
Chris Burgess [Thu, 9 Jul 2015 04:02:23 +0000 (16:02 +1200)]
CRM-16821. Escape output from Authorize IPN.
Eileen McNaughton [Thu, 9 Jul 2015 00:33:37 +0000 (12:33 +1200)]
CRM-16717 trim prefix field as it might have syntactical space
Eileen McNaughton [Thu, 18 Jun 2015 00:33:28 +0000 (12:33 +1200)]
CRM-16717 consider length of fields when comparing schema when turning logging on
If a field length has increased we need to ensure the field length of the log table is also increased
Eileen McNaughton [Wed, 17 Jun 2015 23:50:42 +0000 (11:50 +1200)]
CRM-16717 alter logging table field length when altering custom table field length
Dave Greenberg [Thu, 9 Jul 2015 00:22:50 +0000 (17:22 -0700)]
Merge pull request #6121 from jitendrapurohit/CRM-16776
CRM-16776 - Event-related profiles can be created & edited with either 'administe…
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
jitendrapurohit [Wed, 8 Jul 2015 09:09:49 +0000 (14:39 +0530)]
check for manage event profile permission on preview
eileenmcnaughton [Wed, 8 Jul 2015 02:55:54 +0000 (02:55 +0000)]
CRM-16737 further fix as test showed now quite right
Eileen McNaughton [Tue, 7 Jul 2015 10:35:33 +0000 (22:35 +1200)]
CRM-16737 code coments
Eileen McNaughton [Tue, 7 Jul 2015 10:25:11 +0000 (22:25 +1200)]
CRM-16737, CRM-15296 support for payment_status_id as the new official way to
declare outcome of payment transaction
monishdeb [Tue, 7 Jul 2015 10:28:46 +0000 (15:58 +0530)]
minor fix
Eileen McNaughton [Tue, 7 Jul 2015 10:16:53 +0000 (22:16 +1200)]
CRM-16737 spport either payment_status_id OR contribution_status_id as processor return status
In 4.6 the idea is a payment processor can return payment_status_id or contribution_status_id to denote outcome of
payment, in 4.7 contribution_status_id is to be removed
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 10:42:08 +0000 (22:42 +1200)]
CRM-16803 fix non-creating on recurring contributio record on membership renewal
jitendrapurohit [Mon, 6 Jul 2015 04:49:50 +0000 (10:19 +0530)]
warning fix
jitendrapurohit [Mon, 6 Jul 2015 04:35:24 +0000 (10:05 +0530)]
style fix
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
jitendrapurohit [Fri, 3 Jul 2015 13:32:01 +0000 (19:02 +0530)]
check ACL permission for buttons
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.
jitendrapurohit [Thu, 2 Jul 2015 09:15:24 +0000 (14:45 +0530)]
Event-related profiles can be created & edited with either 'administer CiviCRM' OR 'manage event profiles' permission
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