deb.monish [Wed, 7 Dec 2016 10:11:30 +0000 (15:41 +0530)]
CRM-19698: fix and improve smart and regular group search
Monish Deb [Thu, 8 Dec 2016 06:55:18 +0000 (12:25 +0530)]
Merge pull request #9514 from xurizaemon/docfix-
20161208a
Correct code docs for CRM_Core_Menu::get()
Chris Burgess [Thu, 8 Dec 2016 02:26:05 +0000 (15:26 +1300)]
Indentationating.
Chris Burgess [Thu, 8 Dec 2016 02:21:58 +0000 (15:21 +1300)]
Correct code docs for CRM_Core_Menu::get()
colemanw [Wed, 7 Dec 2016 21:04:40 +0000 (16:04 -0500)]
Merge pull request #9511 from civicrm/4.7.14-rc
Merge 4.7.14-rc into master
colemanw [Wed, 7 Dec 2016 20:17:04 +0000 (15:17 -0500)]
Merge pull request #9510 from colemanw/CRM-19709-b
CRM-19709 - Make status message plain-text
colemanw [Wed, 7 Dec 2016 20:15:10 +0000 (15:15 -0500)]
Merge pull request #9443 from agh1/4.7.14-releasenotes
Draft of release notes
Coleman Watts [Wed, 7 Dec 2016 20:14:20 +0000 (15:14 -0500)]
CRM-19709 - Make status message plain-text
colemanw [Wed, 7 Dec 2016 17:37:30 +0000 (12:37 -0500)]
Remove pr that was reverted
colemanw [Wed, 7 Dec 2016 16:59:55 +0000 (11:59 -0500)]
Merge pull request #9502 from colemanw/CRM-18248
CRM-18248 - Set quietMillis to 300 for EntityRef ajax
Andrew Hunt [Wed, 7 Dec 2016 16:23:06 +0000 (11:23 -0500)]
Release notes: final couple of fixes
Andrew Hunt [Wed, 7 Dec 2016 15:46:41 +0000 (10:46 -0500)]
Release notes: moved version notes to folder and updated distmaker
Andrew Hunt [Wed, 7 Dec 2016 15:29:16 +0000 (10:29 -0500)]
Release notes: Updated through 2016-12-06
Andrew Hunt [Fri, 2 Dec 2016 17:26:07 +0000 (12:26 -0500)]
Release notes: Moved contributors to bottom, fixed some contrib names
colemanw [Wed, 7 Dec 2016 15:11:10 +0000 (10:11 -0500)]
Merge pull request #9505 from colemanw/wysiwyg
JS Optimizations
Yashodha Chaku [Wed, 7 Dec 2016 05:44:53 +0000 (11:14 +0530)]
Merge pull request #9374 from jitendrapurohit/CRM-19048
CRM-19048 - Additional fix
Yashodha Chaku [Wed, 7 Dec 2016 05:20:29 +0000 (10:50 +0530)]
Merge pull request #9401 from jmcclelland/CRM-19656
CRM-19656 - Ensure user updates to subscription info succeed
Coleman Watts [Tue, 6 Dec 2016 23:22:38 +0000 (18:22 -0500)]
Only load tableHeader.js for authorized users
Coleman Watts [Tue, 6 Dec 2016 23:19:14 +0000 (18:19 -0500)]
Wysiwyg js optimizations
Tim Otten [Tue, 6 Dec 2016 22:44:21 +0000 (14:44 -0800)]
Merge pull request #9500 from totten/master-cxnrpc
CRM-19721 - composer.json - Update civicrm-cxn-rpc for PHP 7
Eileen McNaughton [Tue, 6 Dec 2016 20:20:44 +0000 (09:20 +1300)]
Merge pull request #9499 from eileenmcnaughton/4.7.14-rc
CRM-19298 further fix on templates.
Coleman Watts [Tue, 6 Dec 2016 17:44:15 +0000 (12:44 -0500)]
CRM-18248 - Set quietMillis to 300 for EntityRef ajax
Yashodha Chaku [Tue, 6 Dec 2016 07:01:34 +0000 (12:31 +0530)]
Merge pull request #9501 from yashodha/CRM-19720
CRM-19720: typo fixes
yashodha [Tue, 6 Dec 2016 05:19:43 +0000 (10:49 +0530)]
CRM-19720: more fixes
yashodha [Tue, 6 Dec 2016 05:02:39 +0000 (10:32 +0530)]
CRM-19720: typo fixes
Tim Otten [Tue, 6 Dec 2016 04:48:53 +0000 (20:48 -0800)]
composer.json - Update civicrm-cxn-rpc for PHP 7
To work with PHP 7, civicrm-cxn-rpc requires a newer version of phpseclib.
Note: civicrm-cxn-rpc includes a test suite, which we've checked in PHP 5.3,
5.4, and 7.0. `civicrm-core` doesn't seem to have much test coverage here,
so I did a manual test run locally (MAMP / PHP 5.5), and these steps worked:
* Setup https://github.com/civicrm/civicrm-cxn-rpc/blob/master/doc/proxy.md
* Connect to "Site Profile" service
* View "Settings" and view the profile
* Disconnect
eileen [Tue, 6 Dec 2016 04:37:48 +0000 (17:37 +1300)]
CRM-19298 further fix on templates.
Upgrade version did not seem to have an if ending in the right place. Also, simplify 2 if
statements to one
Yashodha Chaku [Mon, 5 Dec 2016 11:32:06 +0000 (17:02 +0530)]
Merge pull request #9490 from eileenmcnaughton/report
CRM-19711 Bookkeeping report displays pay later items twice
Monish Deb [Mon, 5 Dec 2016 06:03:03 +0000 (11:33 +0530)]
Merge pull request #9493 from monishdeb/CRM-18460
CRM-18460 - Contribution Aggregate custom search - use relative date fields
Eileen McNaughton [Sun, 4 Dec 2016 21:12:59 +0000 (10:12 +1300)]
Merge pull request #9495 from civicrm/4.7.14-rc
4.7.14 rc
Tim Otten [Sat, 3 Dec 2016 05:17:18 +0000 (21:17 -0800)]
Merge pull request #9485 from totten/master-httpclienttest
CRM_Utils_HttpClientTest - Use special purpose hostnames
colemanw [Sat, 3 Dec 2016 02:47:02 +0000 (21:47 -0500)]
Merge pull request #9496 from colemanw/4.7.14-rc
CRM-19649 - Add upgrade message
Coleman Watts [Sat, 3 Dec 2016 01:28:50 +0000 (20:28 -0500)]
CRM-19649 - Add upgrade message
Monish Deb [Fri, 2 Dec 2016 13:19:45 +0000 (18:49 +0530)]
Merge pull request #9472 from mlutfy/master-crm19699
CRM-19699: PHP7 define DB_DSN_MODE for drush mysqli compat.
deb.monish [Fri, 2 Dec 2016 12:35:56 +0000 (18:05 +0530)]
additional fix
Jon goldberg [Thu, 21 Apr 2016 21:09:53 +0000 (17:09 -0400)]
CRM-18460 - Contribution Aggregate custom search - use relative date fields
Monish Deb [Fri, 2 Dec 2016 10:52:51 +0000 (16:22 +0530)]
Merge pull request #9469 from jitendrapurohit/CRM-19692-4.7.14-rc
CRM-19692: Fix js error on Submit Credit Card Contribution form
Monish Deb [Fri, 2 Dec 2016 10:26:13 +0000 (15:56 +0530)]
Merge pull request #9491 from jitendrapurohit/msg_template
Include 4.7.14 message template changes
jitendrapurohit [Fri, 2 Dec 2016 09:32:20 +0000 (15:02 +0530)]
Include 4.7.14 message template changes
Eileen McNaughton [Fri, 2 Dec 2016 05:53:03 +0000 (18:53 +1300)]
Merge pull request #9486 from civicrm/4.7.14-rc
4.7.14 rc
eileenmcnaugton [Fri, 2 Dec 2016 05:24:47 +0000 (18:24 +1300)]
CRM-19711 Bookkeeping report displays pay later items twice
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.
Eileen McNaughton [Fri, 2 Dec 2016 00:49:28 +0000 (13:49 +1300)]
Merge pull request #9482 from colemanw/CRM-19709-rc
CRM-19709 fix html output
Coleman Watts [Thu, 1 Dec 2016 22:07:01 +0000 (17:07 -0500)]
CRM-19709 - Fix html output in Common.js
Coleman Watts [Thu, 1 Dec 2016 22:06:39 +0000 (17:06 -0500)]
CRM-19709 - Fix double-escaped quicksearch results
Eileen McNaughton [Thu, 1 Dec 2016 20:10:36 +0000 (09:10 +1300)]
Merge pull request #9477 from eileenmcnaughton/4.7.14-rc
Revert "CRM-19626 - Event Registration page allows registration even …
eileenmcnaugton [Thu, 1 Dec 2016 07:40:16 +0000 (20:40 +1300)]
Revert "CRM-19626 - Event Registration page allows registration even if no number (or the number 0) has been entered in any ticket quantity boxes"
This reverts commit
73dc8be2b15a6ef0a6b7821f88d32a1ebe18cc17.
Eileen McNaughton [Thu, 1 Dec 2016 02:59:34 +0000 (15:59 +1300)]
Merge pull request #9474 from eileenmcnaughton/memberships
CRM-19298, (relates to testing on CRM-19621) fix receipts on separate… …
eileen [Thu, 1 Dec 2016 00:55:25 +0000 (13:55 +1300)]
CRM-19298, (relates to testing on CRM-19621) fix receipts on separate membership payments to not have extraneous line.
The additional line is arguably better in some use-cases, but weird from the point
of view that the line is covered in a separate email as well. It is also technically
more difficult & fragile so I am removing it.
Eileen McNaughton [Thu, 1 Dec 2016 02:05:19 +0000 (15:05 +1300)]
Merge pull request #9473 from civicrm/4.7.14-rc
4.7.14 rc
Eileen McNaughton [Wed, 30 Nov 2016 23:08:21 +0000 (12:08 +1300)]
Merge pull request #9466 from eileenmcnaughton/address
CRM-19621 fix address field to show country & state.
Mathieu Lutfy [Wed, 30 Nov 2016 20:22:54 +0000 (15:22 -0500)]
CRM-19699: PHP7 define DB_DSN_MODE for drush mysqli compat.
jitendrapurohit [Wed, 30 Nov 2016 12:04:59 +0000 (17:34 +0530)]
Fix if condition for country
eileen [Tue, 29 Nov 2016 10:56:58 +0000 (23:56 +1300)]
CRM-19621 fix address field to show country & state.
Yashodha Chaku [Wed, 30 Nov 2016 07:31:52 +0000 (13:01 +0530)]
Merge pull request #9463 from yashodha/CRM-19685
CRM-19685: Contacts preferred_mail_format can't be NULL
jitendrapurohit [Wed, 30 Nov 2016 07:00:47 +0000 (12:30 +0530)]
CRM-19692: Fix js error on Submit Credit Card Contribution form
Yashodha Chaku [Wed, 30 Nov 2016 05:15:47 +0000 (10:45 +0530)]
Merge pull request #9454 from JKingsnorth/CRM-19688
CRM-19688 Create StateProvince API
Eileen McNaughton [Tue, 29 Nov 2016 11:42:33 +0000 (00:42 +1300)]
Merge pull request #9467 from civicrm/4.7.14-rc
4.7.14 rc
Eileen McNaughton [Tue, 29 Nov 2016 11:02:57 +0000 (00:02 +1300)]
Merge pull request #9464 from eileenmcnaughton/4.7.14-rc
CRM-19594 fix line items for separate payments, non-price set
eileen [Tue, 29 Nov 2016 08:55:45 +0000 (21:55 +1300)]
CRM-19594 fix line items for separate payments, non-price set
yashodha [Tue, 29 Nov 2016 06:55:10 +0000 (12:25 +0530)]
CRM-19685: Contacts preferred_mail_format can't be NULL
Andrew Hunt [Tue, 29 Nov 2016 04:05:22 +0000 (23:05 -0500)]
remainder of 4.7.14 release notes and credits
Eileen McNaughton [Mon, 28 Nov 2016 22:39:18 +0000 (11:39 +1300)]
Merge pull request #9438 from jmcclelland/CRM-19298
CRM-19298 - ensure we get two receipts, with no total line.
Eileen McNaughton [Mon, 28 Nov 2016 22:33:48 +0000 (11:33 +1300)]
Merge pull request #9457 from agh1/activemembersearchlabel
CRM-19556 CiviMember: wording on "current" membership search
Jamie McClelland [Mon, 28 Nov 2016 21:29:42 +0000 (16:29 -0500)]
CRM-19298 - hopefully last syntax error
Eileen McNaughton [Mon, 28 Nov 2016 20:01:11 +0000 (09:01 +1300)]
Merge pull request #9447 from monishdeb/CRM-19678
CRM-19678: No Membership Renewal Activity is created when a Pay Later is set to Completed
Andrew Hunt [Mon, 28 Nov 2016 16:10:15 +0000 (11:10 -0500)]
CRM-19556 CiviMember: wording on "current" membership search
Jamie McClelland [Mon, 28 Nov 2016 15:08:08 +0000 (10:08 -0500)]
CRM-19298 - one more style error fixed.
Monish Deb [Mon, 28 Nov 2016 14:01:40 +0000 (19:31 +0530)]
Merge pull request #9456 from jitendrapurohit/CRM-19534
CRM-19534 - Avoid db constraint violation when saving report for non-admins
JKingsnorth [Mon, 28 Nov 2016 13:37:39 +0000 (13:37 +0000)]
Fix typo in StateProvince DAO
jitendrapurohit [Mon, 28 Nov 2016 12:57:06 +0000 (18:27 +0530)]
add unit test, fix jenkin warning and remove unused array variable
Jamie McClelland [Wed, 19 Oct 2016 14:31:19 +0000 (10:31 -0400)]
removed extraneous lines and switched to static call.
Jamie McClelland [Tue, 18 Oct 2016 19:07:12 +0000 (15:07 -0400)]
CRM-19534 - use better wrapper for getting logged in user contact id.
Jamie McClelland [Tue, 18 Oct 2016 19:04:15 +0000 (15:04 -0400)]
CRM-19534 - avoid DB constraint violation if dashboard exists
Yashodha Chaku [Mon, 28 Nov 2016 11:54:09 +0000 (17:24 +0530)]
Merge pull request #9455 from yashodha/CRM-19686
CRM-19686
JKingsnorth [Mon, 28 Nov 2016 11:04:07 +0000 (11:04 +0000)]
CRM-19688 Create StateProvince API
yashodha [Mon, 28 Nov 2016 10:59:39 +0000 (16:29 +0530)]
change quotes to backticks
Steve Kessler [Fri, 25 Nov 2016 19:21:31 +0000 (12:21 -0700)]
Update DedupeException.tpl
Add links to contact for exceptions.
Monish Deb [Mon, 28 Nov 2016 09:45:25 +0000 (15:15 +0530)]
Merge pull request #9436 from jitendrapurohit/CRM-19679
CRM-19679 fix custom file upload in multi-record set
Monish Deb [Mon, 28 Nov 2016 08:06:57 +0000 (13:36 +0530)]
Merge pull request #9453 from jitendrapurohit/CRM-19680
CRM-19680: Participant.get API generates invalid query when searching…
jitendrapurohit [Mon, 28 Nov 2016 05:57:12 +0000 (11:27 +0530)]
CRM-19680: Participant.get API generates invalid query when searching for role_id IS NULL
Coleman Watts [Sat, 26 Nov 2016 01:17:11 +0000 (20:17 -0500)]
Fix wrong component id in option value
Monish Deb [Fri, 25 Nov 2016 11:14:35 +0000 (16:44 +0530)]
Merge pull request #9446 from johanv/CRM-19683-word_replacement_fix
CRM-19683: Can now change word replacements if you have more than one language
Monish Deb [Fri, 25 Nov 2016 03:55:05 +0000 (09:25 +0530)]
Merge pull request #9450 from civicrm/4.7.14-rc
4.7.14 rc
Eileen McNaughton [Thu, 24 Nov 2016 23:16:47 +0000 (12:16 +1300)]
Merge pull request #9449 from eileenmcnaughton/member
CRM-19594 fix line item memberships for price sets with multiple memb…
eileen [Thu, 24 Nov 2016 14:48:13 +0000 (03:48 +1300)]
CRM-19594 fix line item memberships for price sets with multiple memberships
Eileen McNaughton [Thu, 24 Nov 2016 22:09:34 +0000 (11:09 +1300)]
Merge pull request #9448 from civicrm/4.7.14-rc
4.7.14 rc
Monish Deb [Thu, 24 Nov 2016 12:36:16 +0000 (18:06 +0530)]
Merge pull request #9437 from JMAConsulting/CRM-19681
CRM-19681, fixed code to respect date filters passed from url for report
deb.monish [Thu, 24 Nov 2016 11:25:42 +0000 (16:55 +0530)]
CRM-19678: No Membership Renewal Activity is created when a Pay Later is set to Completed
Johan Vervloet [Thu, 24 Nov 2016 10:30:39 +0000 (11:30 +0100)]
Please the PHP 5.old gods.
Johan Vervloet [Thu, 24 Nov 2016 09:41:05 +0000 (10:41 +0100)]
CRM-19683 Can now change word replacements if you have more than one language.
Eileen McNaughton [Thu, 24 Nov 2016 07:35:06 +0000 (20:35 +1300)]
Merge pull request #9444 from eileenmcnaughton/member
CRM-19594 further fix on creating correct line items for memberships
eileen [Thu, 24 Nov 2016 04:39:12 +0000 (17:39 +1300)]
CRM-19594 another fix on line items for membership.
This one was test driven, but extends us to checking correct line item amounts
eileen [Thu, 24 Nov 2016 02:03:39 +0000 (15:03 +1300)]
CRM-19594 further fix on creating correct line items for memberships
Coleman Watts [Thu, 24 Nov 2016 01:20:26 +0000 (20:20 -0500)]
Merge branch '4.7.14-rc' into master
Conflicts:
CRM/Utils/System/DrupalBase.php
Andrew Hunt [Thu, 24 Nov 2016 00:51:57 +0000 (19:51 -0500)]
added credits (for the pull requests reviewed so far)
Andrew Hunt [Thu, 24 Nov 2016 00:23:59 +0000 (19:23 -0500)]
Added contributor key for matching names to handles
Andrew Hunt [Wed, 23 Nov 2016 23:25:41 +0000 (18:25 -0500)]
Draft of release notes
Includes PRs merged through
999d52acff5fe81a2c7145f128cc622f50db02b3
Coleman Watts [Wed, 23 Nov 2016 22:52:53 +0000 (17:52 -0500)]
Jamie McClelland [Wed, 23 Nov 2016 21:48:35 +0000 (16:48 -0500)]
CRM-19298 - fix style error
projects / civicrm-core.git / log