yashodha [Tue, 17 Jan 2017 07:02:22 +0000 (12:32 +0530)]
CRM-19883 - Activity Priority Field is Not Included in Advanced Search or Activity Reports
colemanw [Wed, 11 Jan 2017 19:53:21 +0000 (14:53 -0500)]
Merge pull request #9644 from omarabuhussein/CRM-19832-backport-#9637
CRM-19832: Backporting #9637 to 4.6
colemanw [Wed, 11 Jan 2017 16:39:18 +0000 (11:39 -0500)]
Merge pull request #9663 from agileware/4.6-CRM-19535
CRM-19535 - Conditionally add is_active param to entityRef
Francis Whittle [Wed, 11 Jan 2017 02:55:42 +0000 (13:55 +1100)]
CRM-19535 - Conditionally add is_active param to entityRef
Backport of #9291 by colemanw
omar abu hussein [Thu, 5 Jan 2017 10:03:03 +0000 (10:03 +0000)]
CRM-19832: Backporting #9637 to 4.6
CiviCRM [Wed, 4 Jan 2017 22:43:26 +0000 (14:43 -0800)]
Update version to 4.6.26
Yashodha Chaku [Wed, 4 Jan 2017 05:48:09 +0000 (11:18 +0530)]
Merge pull request #9611 from JMAConsulting/CRM-19817-4.6
CRM-19817, fixed warnings and export for wordpress cms
Tim Otten [Tue, 3 Jan 2017 07:40:53 +0000 (23:40 -0800)]
Merge pull request #9615 from seamuslee001/https_test_fix
(Port from master) CRM_Utils_HttpClientTest - Use special purpose hostnames
Tim Otten [Fri, 2 Dec 2016 02:56:14 +0000 (18:56 -0800)]
CRM_Utils_HttpClientTest - Use special purpose hostnames
This test issues a few real HTTP requests which are supposed to succeed or
fail in a prescribed way. However, the examples were chosen for expedience
and leached off other/unrelated sites... but this tends to break from
time-to-time (when the example system goes to HTTPS-only or changes their
content).
With this patch, all the examples point to dedicated sites which are
purpose-built for supporting integration tests.
Pradeep Nayak [Mon, 2 Jan 2017 11:15:41 +0000 (16:45 +0530)]
CRM-19817, fixed warnings and export for wordpress cms
----------------------------------------
* CRM-19817: Notice error fails membership export
https://issues.civicrm.org/jira/browse/CRM-19817
Eileen McNaughton [Wed, 14 Dec 2016 07:23:11 +0000 (20:23 +1300)]
Merge pull request #9527 from seamuslee001/CRM-19743
CRM-19743 Ensure that checking for id in sort column works in arrays …
Monish Deb [Mon, 12 Dec 2016 10:06:26 +0000 (15:36 +0530)]
Merge pull request #9519 from monishdeb/CRM-19294-46
CRM-19294: Unable to continue on required file field
Seamus Lee [Mon, 12 Dec 2016 05:16:28 +0000 (16:16 +1100)]
Expand test coverage to include specified ordering
Seamus Lee [Fri, 9 Dec 2016 21:35:26 +0000 (08:35 +1100)]
CRM-19743 Ensure that checking for id in sort column works in arrays as well as strings
deb.monish [Thu, 8 Dec 2016 11:57:20 +0000 (17:27 +0530)]
CRM-19294: Unable to continue on required file field
CiviCRM [Wed, 7 Dec 2016 22:05:17 +0000 (14:05 -0800)]
Update version to 4.6.25
Eileen McNaughton [Fri, 2 Dec 2016 00:49:45 +0000 (13:49 +1300)]
Merge pull request #9483 from colemanw/CRM-19709-lts
CRM-19709 fix html output (LTS)
Coleman Watts [Thu, 1 Dec 2016 22:07:01 +0000 (17:07 -0500)]
CRM-19709 - Fix html output in Common.js
Conflicts:
js/Common.js
Coleman Watts [Thu, 1 Dec 2016 22:06:39 +0000 (17:06 -0500)]
CRM-19709 - Fix double-escaped quicksearch results
Eileen McNaughton [Tue, 29 Nov 2016 10:28:56 +0000 (23:28 +1300)]
Merge pull request #9462 from seamuslee001/CRM-19079
CRM-19079 condition profile edit permission check
Brian Shaughnessy [Thu, 14 Jul 2016 12:40:39 +0000 (08:40 -0400)]
CRM-19079 condition profile edit permission check
Eileen McNaughton [Wed, 23 Nov 2016 21:34:55 +0000 (10:34 +1300)]
Merge pull request #9439 from seamuslee001/CRM-19641-b-46
CRM-19641 Further Fix
Seamus Lee [Wed, 23 Nov 2016 02:46:33 +0000 (13:46 +1100)]
CRM-19641 Further Fix
Eileen McNaughton [Sat, 19 Nov 2016 03:53:51 +0000 (16:53 +1300)]
Merge pull request #9412 from seamuslee001/CRM-19562-46
CRM-19562
Seamus Lee [Fri, 18 Nov 2016 22:31:17 +0000 (09:31 +1100)]
Backport validateAll function to 4.6
Seamus Lee [Wed, 16 Nov 2016 03:56:05 +0000 (14:56 +1100)]
Fix test as per comments from Eileen
Seamus Lee [Wed, 16 Nov 2016 03:26:53 +0000 (14:26 +1100)]
CRM-19562
Eileen McNaughton [Wed, 16 Nov 2016 00:00:43 +0000 (13:00 +1300)]
Merge pull request #9396 from seamuslee001/CRM-19641-46
CRM-19641
Seamus Lee [Tue, 15 Nov 2016 19:37:04 +0000 (06:37 +1100)]
CRM-19641
Eileen McNaughton [Tue, 15 Nov 2016 21:05:29 +0000 (10:05 +1300)]
Merge pull request #9394 from seamuslee001/CRM-18493-46
Backport of CRM-18493
deb.monish [Tue, 15 Nov 2016 10:02:29 +0000 (15:32 +0530)]
minor optimization
Seamus Lee [Mon, 31 Oct 2016 21:06:33 +0000 (08:06 +1100)]
Fix Variable
Seamus Lee [Mon, 31 Oct 2016 21:05:44 +0000 (08:05 +1100)]
Fix Test skipping message
Seamus Lee [Tue, 25 Oct 2016 23:37:06 +0000 (10:37 +1100)]
CRM-18493 Ensure that sort param is valid for use in mysql
colemanw [Tue, 15 Nov 2016 17:17:58 +0000 (12:17 -0500)]
Merge pull request #9391 from davejenx/CRM-19431-46
CRM-19431: avoid pollution (in EntityTag) and use (in ContactType) of CRM_Core_DAO::$_nullArray. - 4.6
Dave Jenkins [Tue, 15 Nov 2016 16:15:52 +0000 (16:15 +0000)]
CRM-19431 - CRM-19431: avoid pollution (in EntityTag) and use (in ContactType) of CRM_Core_DAO::$_nullArray.
Yashodha Chaku [Tue, 15 Nov 2016 06:34:22 +0000 (12:04 +0530)]
Merge pull request #9323 from konadave/CRM-19567-4.6
CRM-19567 FALSE amount owed warning
colemanw [Tue, 15 Nov 2016 02:03:23 +0000 (21:03 -0500)]
Merge pull request #9381 from KarinG/patch-7
Set a value for iDisplayLength - 4.6
Karin Gerritsen [Mon, 14 Nov 2016 03:23:55 +0000 (20:23 -0700)]
Set a value for iDisplayLength - 4.6
The default (if none is set) turns out to be 10. Eileen said (and I quote): "if you wanted to propose an increase in core to 25 that would be an easy sell I think" :-)
colemanw [Sat, 12 Nov 2016 21:13:27 +0000 (16:13 -0500)]
Merge pull request #9378 from colemanw/CRM-19640-backport
CRM-19640 - Add pre/post hooks to CustomField (backport)
Coleman Watts [Fri, 11 Nov 2016 21:28:26 +0000 (16:28 -0500)]
CRM-19640 - Add pre/post hooks to CustomField ops
Eileen McNaughton [Sun, 6 Nov 2016 21:07:26 +0000 (10:07 +1300)]
Merge pull request #9356 from KarinG/patch-5
Update DataSource.php - 4.6 PR
Karin Gerritsen [Sun, 6 Nov 2016 16:29:23 +0000 (09:29 -0700)]
Update DataSource.php
https://issues.civicrm.org/jira/browse/CRM-19607
CiviCRM [Wed, 2 Nov 2016 20:03:25 +0000 (13:03 -0700)]
Update version to 4.6.24
colemanw [Fri, 28 Oct 2016 19:18:58 +0000 (15:18 -0400)]
Merge pull request #9331 from colemanw/CRM-19551-4.6
CRM-19551 - Display multiple case activity attachments
Coleman Watts [Thu, 27 Oct 2016 18:59:53 +0000 (14:59 -0400)]
CRM-19551 - Display multiple case activity attachments
Conflicts:
CRM/Case/BAO/Case.php
David Reedy Jr [Wed, 26 Oct 2016 14:20:17 +0000 (09:20 -0500)]
CRM-19567 FALSE amount owed warning
Eileen McNaughton [Mon, 24 Oct 2016 01:46:52 +0000 (14:46 +1300)]
Merge pull request #9290 from jackrabbithanna/4.6
Fix for CRM-19537 -- backporting fix to make smartGroupCacheTimeout of 0 possible
Eileen McNaughton [Mon, 24 Oct 2016 01:39:23 +0000 (14:39 +1300)]
Merge pull request #9311 from cividesk/CRM-3795-4.6
CRM-3795: Full fix
Nicolas Ganivet [Sun, 23 Oct 2016 21:15:43 +0000 (15:15 -0600)]
Full fix: Bcc addresses no longer shown to recipients when PEAR mailer is not Mail_mail.
Eileen McNaughton [Thu, 20 Oct 2016 02:35:21 +0000 (15:35 +1300)]
Merge pull request #9300 from seamuslee001/CRM-19222
CRM-19222 Export: temp table field length at least 255 for strings
yashodha [Tue, 13 Sep 2016 10:41:43 +0000 (16:11 +0530)]
CRM-19222 Export: temp table field length at least 255 for strings
----------------------------------------
* CRM-19222: Data too long on export including custom field
https://issues.civicrm.org/jira/browse/CRM-19222
Mark Hanna [Wed, 19 Oct 2016 00:15:52 +0000 (19:15 -0500)]
backporting fix to make smartGroupCacheTimeout of 0 possible
Eileen McNaughton [Thu, 13 Oct 2016 18:17:03 +0000 (19:17 +0100)]
Merge pull request #9243 from mollux/CRM18549-4.6
CRM-18549 - Don't store empty array value of a setting as NULL.
Mattias Michaux [Thu, 13 Oct 2016 14:59:02 +0000 (16:59 +0200)]
Don't store empty array value of a setting as NULL.
Eileen McNaughton [Wed, 12 Oct 2016 13:39:21 +0000 (14:39 +0100)]
Merge pull request #9215 from elcapo/4.6
CRM-19418 Fixes showing cancelled contribution box on 4.6
Carlos Capote [Tue, 11 Oct 2016 17:40:59 +0000 (18:40 +0100)]
CRM-19418 Fixes showing cancelled contribution box on 4.6
Monish Deb [Thu, 6 Oct 2016 20:58:49 +0000 (02:28 +0530)]
Merge pull request #9176 from KarinG/patch-3
Porting back fuzionnz/CRM-18830
Karin Gerritsen [Wed, 5 Oct 2016 12:42:00 +0000 (06:42 -0600)]
Porting back fuzionnz/CRM-18830
CiviCRM [Wed, 5 Oct 2016 07:44:30 +0000 (00:44 -0700)]
Update version to 4.6.23
Yashodha Chaku [Tue, 4 Oct 2016 03:47:43 +0000 (09:17 +0530)]
Merge pull request #9163 from Nafhed/CRM-19406
CRM-18984 : Can't delete an import/export mapping
colemanw [Mon, 3 Oct 2016 20:57:27 +0000 (16:57 -0400)]
Merge pull request #9161 from monishdeb/CRM-19294-46
CRM-19294: Unable to upload files via a contribution page (backport PR)
deb.monish [Mon, 3 Oct 2016 12:13:27 +0000 (17:43 +0530)]
additional changes
deb.monish [Mon, 3 Oct 2016 08:11:17 +0000 (13:41 +0530)]
CRM-19294: Unable to upload files via a contribution page (backport 4.6 PR)
nganivet [Thu, 29 Sep 2016 16:50:04 +0000 (12:50 -0400)]
Fix for 4.6 (#9111)
* Fix for 4.6 (a few other places but non-important / too complex to refactor).
* Corrects styling
* Fix style warning
colemanw [Wed, 28 Sep 2016 18:09:53 +0000 (14:09 -0400)]
Merge pull request #9138 from cividesk/CRM-17991-4.6
CRM-17991: backport of 4.7 fix to 4.6
Nicolas Ganivet [Wed, 28 Sep 2016 16:13:09 +0000 (12:13 -0400)]
CRM-17991: Fix Safari JS bug in Contribution popups (affects soft credits, pledges)
yashodha [Thu, 23 Jun 2016 10:18:11 +0000 (15:48 +0530)]
CRM-18984 : Can't delete an import/export mapping
----------------------------------------
* CRM-18984: Can't delete an import/export mapping
https://issues.civicrm.org/jira/browse/CRM-18984
Signed-off-by: Nathan Brettell <nathanbrettell@gmail.com>
colemanw [Mon, 26 Sep 2016 23:31:31 +0000 (19:31 -0400)]
Merge pull request #9050 from seamuslee001/CRM-17789-46-1
CRM-17789 code cleanup for php7 for 4.6
colemanw [Mon, 26 Sep 2016 21:25:03 +0000 (17:25 -0400)]
Merge pull request #9064 from seamuslee001/CRM-19059-46
CRM-19059 - Upgrade dompdf to 0.7.* for 4.6
Eileen McNaughton [Sun, 18 Sep 2016 09:27:33 +0000 (21:27 +1200)]
Merge pull request #9062 from seamuslee001/CRM-19375
CRM-19375 Fix error in the where clause
Seamus Lee [Sat, 17 Sep 2016 22:00:20 +0000 (22:00 +0000)]
Further fixes to ensure that images are supported and to trim filename of extension as per CRM-19183
Seamus Lee [Sat, 17 Sep 2016 21:46:45 +0000 (21:46 +0000)]
CRM-19059 upgrade dompdf for 4.6
Eileen McNaughton [Sat, 17 Sep 2016 04:42:07 +0000 (16:42 +1200)]
Merge pull request #9054 from seamuslee001/fix_contribution_recepits
CRM-19373 Fix printing and sending contribution recepits
Seamus Lee [Fri, 16 Sep 2016 21:25:55 +0000 (07:25 +1000)]
CRM-19375 Fix error in the where clause
Seamus Lee [Fri, 16 Sep 2016 10:55:26 +0000 (10:55 +0000)]
Fix printing and sending contribution recepits
Seamus Lee [Thu, 15 Sep 2016 22:15:33 +0000 (08:15 +1000)]
CRM-17789 code cleanup for php7 for 4.6
Yashodha Chaku [Thu, 15 Sep 2016 08:42:02 +0000 (14:12 +0530)]
Merge pull request #9043 from seamuslee001/sl_upgrade_notice_fix-46
CRM-19370 - Fix upgrade message in 4.6.21 upgrade
Seamus Lee [Thu, 15 Sep 2016 06:23:30 +0000 (16:23 +1000)]
Fix english
Seamus Lee [Thu, 15 Sep 2016 06:18:05 +0000 (16:18 +1000)]
Fix up grade message in 4.6.21 upgrade
Eileen McNaughton [Wed, 14 Sep 2016 04:57:56 +0000 (16:57 +1200)]
Merge pull request #9032 from seamuslee001/CRM-19283-46
CRM-19283 Allow contribution forms to support Mastercard 2bin series
Seamus Lee [Tue, 13 Sep 2016 22:00:35 +0000 (08:00 +1000)]
Allow contribution forms to support Mastercard 2bin series
Eileen McNaughton [Mon, 12 Sep 2016 23:09:39 +0000 (09:09 +1000)]
Merge pull request #8987 from seamuslee001/CRM-18236
CRM-18236 stop schedule reminders from sending multiple reminders for…
CiviCRM [Wed, 7 Sep 2016 19:52:32 +0000 (12:52 -0700)]
Update version to 4.6.22
Seamus Lee [Tue, 6 Sep 2016 00:00:32 +0000 (00:00 +0000)]
CRM-18236 stop schedule reminders from sending multiple reminders for the same event
Eileen McNaughton [Mon, 5 Sep 2016 20:42:51 +0000 (08:42 +1200)]
Merge pull request #8966 from seamuslee001/CRM-19290-46
CRM-19290 Fix date creation in Karma test
Eileen McNaughton [Sun, 4 Sep 2016 02:19:04 +0000 (14:19 +1200)]
Merge pull request #8971 from KarinG/patch-2
English language/grammar - 4.6 branch
Karin Gerritsen [Thu, 1 Sep 2016 13:40:49 +0000 (07:40 -0600)]
English language/grammar - 4.6 branch
One of my clients would very much like to see this small English language/grammar edit. JIRA: https://issues.civicrm.org/jira/browse/CRM-19289 - Already fixed in 4.7
Eileen McNaughton [Thu, 1 Sep 2016 02:06:29 +0000 (14:06 +1200)]
Merge pull request #8957 from seamuslee001/port_totten_nags
CRM-15925 CRM-15928 Port changes from Totten
Seamus Lee [Wed, 31 Aug 2016 23:40:25 +0000 (09:40 +1000)]
CRM-19290 Fix date creation in Karma test
Tim Otten [Tue, 30 Aug 2016 08:03:15 +0000 (01:03 -0700)]
Merge pull request #8947 from seamuslee001/CRM-15928-upgrae
CRM-15928 - For upgraded sites, allow remote submissions by default
Seamus Lee [Tue, 30 Aug 2016 07:48:50 +0000 (17:48 +1000)]
CRM-15928 - Display warning if is enabled
Seamus Lee [Tue, 30 Aug 2016 07:43:46 +0000 (17:43 +1000)]
CRM-15925 - CRM/Upgrade - Add post-upgrade msg re: "import SQL datasource"
Seamus Lee [Tue, 30 Aug 2016 04:00:30 +0000 (14:00 +1000)]
CRM-15928 set allowing remote submissions on upgrade
Eileen McNaughton [Sat, 27 Aug 2016 03:23:49 +0000 (15:23 +1200)]
Merge pull request #8935 from cividesk/CRM-19261-4.6
CRM-19261: full fix
Nicolas Ganivet [Fri, 26 Aug 2016 07:23:31 +0000 (01:23 -0600)]
CRM-19261: full fix
Eileen McNaughton [Fri, 26 Aug 2016 02:43:05 +0000 (14:43 +1200)]
Merge pull request #8921 from seamuslee001/CRM-13640-46
CRM-13640 backport fix to 4.6
Eileen McNaughton [Fri, 26 Aug 2016 02:41:21 +0000 (14:41 +1200)]
Merge pull request #8932 from seamuslee001/CRM-15925
CRM-15925 4.6 Backport
Eileen McNaughton [Fri, 26 Aug 2016 02:41:03 +0000 (14:41 +1200)]
Merge pull request #8931 from seamuslee001/CRM-15928-46
CRM-15928 Backport fix for CRM-15928 to 4.6
Tim Otten [Tue, 23 Aug 2016 22:56:10 +0000 (15:56 -0700)]
CRM-15925 - CRM_Contact_Import_Form_DataSource - Enforce permissions
projects / civicrm-core.git / log