Monish Deb [Thu, 15 Dec 2016 10:26:21 +0000 (15:56 +0530)]
Merge pull request #9534 from monishdeb/CRM-19333
CRM-19333: Fix group_type filter in Advance Search and api
Yashodha Chaku [Thu, 15 Dec 2016 09:06:15 +0000 (14:36 +0530)]
Merge pull request #9538 from jitendrapurohit/CRM-19736
CRM-19736: PHP 7 Fatal Error on printing labels for members
Yashodha Chaku [Thu, 15 Dec 2016 05:55:57 +0000 (11:25 +0530)]
Merge pull request #9537 from jitendrapurohit/CRM-19048-add
CRM-19048: Fix attached operator search
colemanw [Thu, 15 Dec 2016 02:47:19 +0000 (21:47 -0500)]
Merge pull request #9540 from colemanw/CRM-19764
CRM-19764 - Pass context when fetching custom field options
Coleman Watts [Wed, 14 Dec 2016 15:43:40 +0000 (10:43 -0500)]
CRM-19764 - Pass context when fetching custom field options
jitendrapurohit [Wed, 14 Dec 2016 08:50:55 +0000 (14:20 +0530)]
CRM-19048: Fix attached operator search
Yashodha Chaku [Wed, 14 Dec 2016 11:26:21 +0000 (16:56 +0530)]
Merge pull request #9517 from jitendrapurohit/CRM-19626-2
CRM-19626: Add min-amount handling to priceset
jitendrapurohit [Wed, 14 Dec 2016 11:05:30 +0000 (16:35 +0530)]
CRM-19736: PHP 7 printing labels for members
Monish Deb [Wed, 14 Dec 2016 10:49:55 +0000 (16:19 +0530)]
Merge pull request #9428 from jitendrapurohit/CRM-19662
CRM-19662 - Fix remaining full group by clause
Monish Deb [Wed, 14 Dec 2016 10:42:37 +0000 (16:12 +0530)]
Merge pull request #9480 from jitendrapurohit/CRM-17410
CRM-17410: Using xml on upgrade (not installation) of extension to cr…
Monish Deb [Wed, 14 Dec 2016 09:52:46 +0000 (15:22 +0530)]
Merge pull request #9523 from jitendrapurohit/CRM-19717
CRM-19717: remove inline edit of class from reserved participant status
jitendrapurohit [Thu, 1 Dec 2016 13:19:45 +0000 (18:49 +0530)]
CRM-17410: Using xml on upgrade (not installation) of extension to create/append new optionvalues
jitendrapurohit [Thu, 8 Dec 2016 11:42:11 +0000 (17:12 +0530)]
CRM-19626: Add min-amount handling to priceset
Monish Deb [Wed, 14 Dec 2016 06:44:17 +0000 (12:14 +0530)]
Merge pull request #9516 from jitendrapurohit/CRM-19722
CRM-19722: Fatal Error: Unknown column 'contribution_source' in 'orde…
deb.monish [Wed, 14 Dec 2016 05:57:04 +0000 (11:27 +0530)]
add sort order
Yashodha Chaku [Wed, 14 Dec 2016 05:12:10 +0000 (10:42 +0530)]
Merge pull request #9531 from civicrm/CRM-19755=1
CRM-19755 reverse order of html and text
Joe Murray [Tue, 13 Dec 2016 17:48:54 +0000 (12:48 -0500)]
Change order of body html and text on form
deb.monish [Tue, 13 Dec 2016 16:23:34 +0000 (21:53 +0530)]
Fix group_type filter in Advance Search and api
Joe Murray [Tue, 13 Dec 2016 16:29:18 +0000 (11:29 -0500)]
reversed L53 L52 as per @seamuslea request
Monish Deb [Tue, 13 Dec 2016 12:57:31 +0000 (18:27 +0530)]
Merge pull request #9475 from jitendrapurohit/CRM-19549
CRM-19549 : New pledge data entry page shows hard coded $ for installments
Yashodha Chaku [Tue, 13 Dec 2016 12:27:21 +0000 (17:57 +0530)]
Merge pull request #9532 from jitendrapurohit/CRM-19263
Additional fixes for CRM-19263
Monish Deb [Tue, 13 Dec 2016 10:42:49 +0000 (16:12 +0530)]
Merge pull request #9506 from monishdeb/CRM-19698
CRM-19698: fix and improve smart and regular group search
jitendrapurohit [Tue, 13 Dec 2016 10:38:47 +0000 (16:08 +0530)]
Additional fixes for CRM-19263
Joe Murray [Mon, 12 Dec 2016 20:37:44 +0000 (15:37 -0500)]
CRM-19755 reverse order of html and text
Make order same as rest of CiviMail
Eileen McNaughton [Mon, 12 Dec 2016 20:31:21 +0000 (09:31 +1300)]
Merge pull request #9530 from seamuslee001/CRM-19490-regression-fix
Fix regression in CRM-19490 where input field wasn't being properly set
Monish Deb [Mon, 12 Dec 2016 11:09:31 +0000 (16:39 +0530)]
Merge pull request #9525 from seamuslee001/api_order_by_test
CRM-19743 Ensure that checking for id in sort column works in arrays …
Monish Deb [Mon, 12 Dec 2016 10:19:39 +0000 (15:49 +0530)]
Merge pull request #9518 from monishdeb/CRM-19294
CRM-19294: Unable to continue on required file field
jitendrapurohit [Mon, 12 Dec 2016 08:39:30 +0000 (14:09 +0530)]
append empty string for currency without symbol
Monish Deb [Mon, 12 Dec 2016 05:18:59 +0000 (10:48 +0530)]
Merge pull request #9479 from jitendrapurohit/CRM-19226
CRM-19226: Fix loginUrl token in drupal
Seamus Lee [Mon, 12 Dec 2016 05:16:28 +0000 (16:16 +1100)]
Expand test coverage to include specified ordering
Seamus Lee [Mon, 12 Dec 2016 04:22:52 +0000 (15:22 +1100)]
Fix regression in CRM-19490 where input field wasn't being properly set
Eileen McNaughton [Mon, 12 Dec 2016 04:02:50 +0000 (17:02 +1300)]
Merge pull request #9529 from xurizaemon/docfix-CRM19490
Correct labelling of new Short Date format
Chris Burgess [Mon, 12 Dec 2016 02:43:48 +0000 (15:43 +1300)]
Correct labelling of new Short Date format. Refs CRM-19490.
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
jitendrapurohit [Fri, 9 Dec 2016 12:33:30 +0000 (18:03 +0530)]
CRM-19717: remove inline edit of class from reserved participant status
deb.monish [Fri, 9 Dec 2016 06:08:02 +0000 (11:38 +0530)]
revert operator changes and shift getChildGroupIds() definition
Monish Deb [Fri, 9 Dec 2016 06:39:26 +0000 (12:09 +0530)]
Merge pull request #9492 from monishdeb/CRM-19325
CRM-19325 : Search contributions that are not in any batch
deb.monish [Wed, 7 Dec 2016 16:26:04 +0000 (21:56 +0530)]
additional improvement and unit test
deb.monish [Wed, 7 Dec 2016 10:11:30 +0000 (15:41 +0530)]
CRM-19698: fix and improve smart and regular group search
deb.monish [Thu, 8 Dec 2016 05:20:22 +0000 (10:50 +0530)]
additonal unit test changes to assert batch contributions
deb.monish [Wed, 7 Dec 2016 08:46:29 +0000 (14:16 +0530)]
Add unit test
deb.monish [Fri, 2 Dec 2016 09:36:58 +0000 (15:06 +0530)]
optimization
Johan Vervloet [Thu, 8 Sep 2016 10:27:47 +0000 (12:27 +0200)]
Style error.
Johan Vervloet [Thu, 8 Sep 2016 10:24:45 +0000 (12:24 +0200)]
CRM-19325 - enable search for contributions that are not in any batch.
deb.monish [Thu, 8 Dec 2016 11:49:55 +0000 (17:19 +0530)]
CRM-19294: Unable to continue on required file field
jitendrapurohit [Wed, 7 Dec 2016 13:02:17 +0000 (18:32 +0530)]
CRM-19722: Fatal Error: Unknown column 'contribution_source' in 'order clause'
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()
Monish Deb [Thu, 8 Dec 2016 06:52:15 +0000 (12:22 +0530)]
Minor change
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
jitendrapurohit [Tue, 6 Dec 2016 06:38:28 +0000 (12:08 +0530)]
replace cj with $ and fix validation error
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 …
jitendrapurohit [Thu, 1 Dec 2016 13:01:54 +0000 (18:31 +0530)]
CRM-19226: Fix loginUrl token in drupal
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.
jitendrapurohit [Wed, 30 Nov 2016 11:29:29 +0000 (16:59 +0530)]
additional fixes
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.
projects / civicrm-core.git / log