Tim Otten [Tue, 13 Oct 2015 15:36:10 +0000 (16:36 +0100)]
CRM-13803 - hook_navigationMenu - Infer navID/parentID
This topic has previously been discussed a bit in
https://issues.civicrm.org/jira/browse/CRM-13803 and
https://github.com/civicrm/civihr/pull/190 . Long-story short: when an
extension adds a new nav item, it must compute navID and parentID, and many
extensions do this a buggy way.
With this revision, an extension can simply omit the navID and parentID.
The navID will be computed (as the next available ID), and the parentID will
be inferred (based on the navID in the actual parent).
Dave Greenberg [Mon, 12 Oct 2015 23:35:36 +0000 (16:35 -0700)]
Merge pull request #6936 from eileenmcnaughton/CRM-14720
CRM-14720 - smart groups based on postal code numeric ranges cause fatal
Dave Greenberg [Mon, 12 Oct 2015 21:47:20 +0000 (14:47 -0700)]
Merge pull request #6885 from jitendrapurohit/CRM-17286improvements
CRM-17286 - add 'Soft Credit For Contact ID' to the 'default' (Primar…
colemanw [Mon, 12 Oct 2015 16:50:52 +0000 (12:50 -0400)]
Merge pull request #6937 from colemanw/const
CRM-13823 - Cleanup duplicate constants
Kurund Jalmi [Mon, 12 Oct 2015 16:12:55 +0000 (17:12 +0100)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-12-16-00-15
Conflicts:
CRM/Contribute/Form/Contribution.php
Coleman Watts [Mon, 12 Oct 2015 13:23:12 +0000 (09:23 -0400)]
CRM-13823 - Cleanup duplicate constants
Monish Deb [Mon, 12 Oct 2015 12:11:01 +0000 (17:41 +0530)]
Merge pull request #6933 from aydun/CRM-17376
Fix CRM-17376, Apply brackets fix from CRM-16961 to reports
jitendrapurohit [Mon, 12 Oct 2015 10:21:36 +0000 (15:51 +0530)]
warning fix
jitendrapurohit [Mon, 12 Oct 2015 09:42:37 +0000 (15:12 +0530)]
more fixes for CRM-17286
Yashodha Chaku [Mon, 12 Oct 2015 08:48:35 +0000 (14:18 +0530)]
Merge pull request #6905 from mattwire/CRM-17346
Fix warning when user doesn't have edit permissions
eileenmcnaughton [Mon, 12 Oct 2015 07:30:33 +0000 (07:30 +0000)]
CRM-14720 add extra test for '=' queries
Eileen [Wed, 21 May 2014 09:07:52 +0000 (05:07 -0400)]
CRM-14720 - smart groups based on postal code numeric ranges cause fatal
eileenmcnaughton [Mon, 12 Oct 2015 04:14:24 +0000 (04:14 +0000)]
CRM-14720 add test for postal smart groups
colemanw [Mon, 12 Oct 2015 02:36:28 +0000 (22:36 -0400)]
Merge pull request #6935 from colemanw/CRM-17365
CRM-17365 - Update upgrade message for 4.7
Coleman Watts [Mon, 12 Oct 2015 00:10:04 +0000 (20:10 -0400)]
CRM-17365 - Update upgrade message for 4.7
aydun [Sun, 11 Oct 2015 21:51:33 +0000 (22:51 +0100)]
Fix CRM-17376, Apply brackets fix from CRM-16961 to reports
Kurund Jalmi [Sun, 11 Oct 2015 14:04:10 +0000 (15:04 +0100)]
Merge pull request #6912 from yashodha/CRM-17351
CRM-17351: Unable to mark price set field as inactive
colemanw [Sun, 11 Oct 2015 13:32:55 +0000 (09:32 -0400)]
Merge pull request #6926 from kcristiano/CRM-16408-Oct
CRM-16408 Installer changes rebased to 4.7.alpha4. Prepopulate DB fr…
Tim Otten [Sun, 11 Oct 2015 12:38:23 +0000 (13:38 +0100)]
Merge pull request #6930 from futurefirst/master-crm-15078
CRM-15078: make sure logging schema is updated on extension installation
David Knoll [Sun, 11 Oct 2015 11:18:35 +0000 (12:18 +0100)]
CRM-15078: make sure logging schema is updated on extension installation
Tim Otten [Sun, 11 Oct 2015 09:26:42 +0000 (10:26 +0100)]
Merge pull request #6928 from totten/master-docs
CRM-15867 - Add 'docs' folder (Markdown/mkdocs)
Tim Otten [Sat, 3 Oct 2015 19:03:33 +0000 (15:03 -0400)]
docs/ - Update navigation, file structure, requirements
Kevin Cristiano [Sun, 11 Oct 2015 02:08:45 +0000 (22:08 -0400)]
CRM-16408 Installer changes rebased to 4.7.alpha4. Prepopulate DB from wp-confif.php while allowing override. Redirect to CiviCRM admin page after successful install. Store user files in /uploads. Updates to remove hardcoded references to wp-content directory.
----------------------------------------
* CRM-16408: Installer rewrite
https://issues.civicrm.org/jira/browse/CRM-16408
Eileen McNaughton [Sun, 11 Oct 2015 01:50:00 +0000 (14:50 +1300)]
Merge pull request #6896 from jake-mw/CRM-16669-master
CRM-16669 - ensure financialType is loaded for credit card and non-cr…
Eileen McNaughton [Sun, 11 Oct 2015 01:49:16 +0000 (14:49 +1300)]
Merge pull request #6895 from jake-mw/CRM-16669
CRM-16669 - ensure financialType is loaded for cc transactions
colemanw [Sat, 10 Oct 2015 16:47:14 +0000 (12:47 -0400)]
Merge pull request #6922 from eileenmcnaughton/CRM-17000
CRM-17000 bypass separatevalues for getfields for performance
colemanw [Sat, 10 Oct 2015 16:36:32 +0000 (12:36 -0400)]
Merge pull request #6547 from colemanw/CRM-17004
CRM-17004 - Remove Moneris from core
Kurund Jalmi [Sat, 10 Oct 2015 16:09:20 +0000 (17:09 +0100)]
Merge pull request #6923 from eileenmcnaughton/CRM-17120
CRM-17120 remove last instance of call to uncached CRM_Core_OptionGro…
eileen [Sat, 10 Oct 2015 03:50:19 +0000 (16:50 +1300)]
CRM-17120 remove last instance of call to uncached CRM_Core_OptionGroup::optionLabel fn
I searched & didn't find any other instances of this function
Coleman Watts [Fri, 9 Oct 2015 23:52:37 +0000 (19:52 -0400)]
CRM-17293 - Fix bad merge
eileen [Fri, 9 Oct 2015 23:29:22 +0000 (12:29 +1300)]
CRM-17000 bypass separatevalues for getfields for performance
Coleman Watts [Thu, 8 Oct 2015 19:39:49 +0000 (15:39 -0400)]
CRM-17004 - Fix upgrade query for removing payment processors
colemanw [Fri, 9 Oct 2015 21:52:05 +0000 (17:52 -0400)]
Merge pull request #6918 from colemanw/apiExplorer
apiExplorer - Encorage 'return' to be an array for php & js
Kurund Jalmi [Fri, 9 Oct 2015 15:25:22 +0000 (16:25 +0100)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-09-16-14-05
Conflicts:
CRM/Core/Payment/Form.php
Kurund Jalmi [Fri, 9 Oct 2015 15:03:54 +0000 (16:03 +0100)]
Merge pull request #6921 from kurund/CRM-16785
CRM-16785, exclude code coverage
Kurund Jalmi [Fri, 9 Oct 2015 14:59:50 +0000 (15:59 +0100)]
CRM-16785, exclude code coverage
----------------------------------------
* CRM-16785: non-free file "packages/PHP/CodeCoverage/Report/HTML/Renderer/Template/highcharts.js"
https://issues.civicrm.org/jira/browse/CRM-16785
Eileen McNaughton [Fri, 9 Oct 2015 06:31:02 +0000 (19:31 +1300)]
Merge pull request #6917 from eileenmcnaughton/CRM-17144
CRM-17144 add developer tab to lybunt
Coleman Watts [Fri, 9 Oct 2015 00:30:51 +0000 (20:30 -0400)]
apiExplorer - Encorage 'return' to be an array for php & js
colemanw [Thu, 8 Oct 2015 23:37:19 +0000 (19:37 -0400)]
Merge pull request #6617 from colemanw/CRM-17102
CRM-17102 - Better navigation for ACL screens
eileen [Thu, 8 Oct 2015 21:37:31 +0000 (10:37 +1300)]
CRM-17144 add developer tab to lybunt
Change-Id: Ifd21ea255bebd6a218eb4693ea7bfa386360f348
Dave Greenberg [Thu, 8 Oct 2015 20:37:07 +0000 (13:37 -0700)]
Merge pull request #6888 from davecivicrm/CRM-16725
CRM-16725 - Add Preview PDF button to PDF Letter task so users can re…
Monish Deb [Thu, 8 Oct 2015 17:08:43 +0000 (22:38 +0530)]
Merge pull request #6915 from jitendrapurohit/CRMtestfixes
CRM-master test fix
Coleman Watts [Thu, 8 Oct 2015 16:56:59 +0000 (12:56 -0400)]
CRM-17004 - Fix upgrade order
Coleman Watts [Fri, 21 Aug 2015 00:51:35 +0000 (20:51 -0400)]
CRM-17004 - Remove Moneris from core
yashodha [Thu, 8 Oct 2015 13:53:28 +0000 (19:23 +0530)]
CRM-17351: remove whitespace
----------------------------------------
* CRM-17351: Unable to mark price set field as inactive
https://issues.civicrm.org/jira/browse/CRM-17351
jitendrapurohit [Thu, 8 Oct 2015 13:18:22 +0000 (18:48 +0530)]
CRM-master test fix
colemanw [Thu, 8 Oct 2015 13:07:30 +0000 (09:07 -0400)]
Merge pull request #6909 from colemanw/CRM-12527
CRM-12527 - Additional header fixes
colemanw [Thu, 8 Oct 2015 13:06:36 +0000 (09:06 -0400)]
Merge pull request #6913 from eileenmcnaughton/CRM-17075-more
CRM-17075 further fix to handling entity reference in search form
Monish Deb [Thu, 8 Oct 2015 12:06:00 +0000 (17:36 +0530)]
Merge pull request #6911 from monishdeb/CRM-17353
CRM-17353 fix - Membership Dashboard has links with eg status1,2,3 wh…
Yashodha Chaku [Thu, 8 Oct 2015 11:40:58 +0000 (17:10 +0530)]
Merge pull request #6914 from yashodha/fix-version
Update version to 4.7.alpha4
yashodha [Thu, 8 Oct 2015 11:06:30 +0000 (16:36 +0530)]
CRM-17351: more fixes for unsetting option
----------------------------------------
* CRM-17351: Unable to mark price set field as inactive
https://issues.civicrm.org/jira/browse/CRM-17351
yashodha [Thu, 8 Oct 2015 08:44:04 +0000 (14:14 +0530)]
version fix
Yashodha Chaku [Thu, 8 Oct 2015 08:31:19 +0000 (14:01 +0530)]
Merge pull request #6898 from yashodha/CRM-17299
CRM-17299: Yes or No custom fields not displayed correctly in table
eileenmcnaugton [Thu, 8 Oct 2015 04:53:05 +0000 (17:53 +1300)]
CRM-17075 hack back in handling for membership_type_id as temp fix
eileenmcnaugton [Thu, 8 Oct 2015 02:33:52 +0000 (15:33 +1300)]
CRM-17075 further fix to handling entity reference in search form
This represents another step towards the logic of standardised saving & handling in the query layer
and letting the form layer interpret that to a form
jitendrapurohit [Thu, 8 Oct 2015 07:20:56 +0000 (12:50 +0530)]
additional fix
yashodha [Thu, 8 Oct 2015 06:44:18 +0000 (12:14 +0530)]
CRM-17351: Unable to mark price set field as inactive
----------------------------------------
* CRM-17351: Unable to mark price set field as inactive
https://issues.civicrm.org/jira/browse/CRM-17351
monishdeb [Thu, 8 Oct 2015 04:55:08 +0000 (10:25 +0530)]
CRM-17353 fix - Membership Dashboard has links with eg status1,2,3 which do not cause filter to be applied
https://issues.civicrm.org/jira/browse/CRM-17353
Coleman Watts [Thu, 8 Oct 2015 02:01:09 +0000 (22:01 -0400)]
CRM-16725 - Add status msg when downloading PDF
Coleman Watts [Thu, 8 Oct 2015 01:38:41 +0000 (21:38 -0400)]
CRM-16725 - Remove global download behavior from popups
It was problematic to have the button change run globally.
Now it's just in the spot that needs it.
If other spots need something similar it would be good to find a way to reuse the code.
Coleman Watts [Tue, 6 Oct 2015 00:56:34 +0000 (20:56 -0400)]
CRM-16725 - Change preview button label/icon
Eileen McNaughton [Wed, 7 Oct 2015 23:02:35 +0000 (12:02 +1300)]
Merge pull request #6824 from eileenmcnaughton/CRM-17293
CRM-17293 align payment processor interface between 4.6 & 4.7
Eileen McNaughton [Wed, 7 Oct 2015 23:01:28 +0000 (12:01 +1300)]
Merge pull request #6877 from saurabhbatra96/comment-fixes-utils
Comment fixes for CRM/Utils directory
Eileen McNaughton [Wed, 7 Oct 2015 22:58:37 +0000 (11:58 +1300)]
Merge pull request #6873 from saurabhbatra96/comment-fixes-pledge
Comment fixes for CRM/Pledge directory.
Dave Greenberg [Sat, 3 Oct 2015 20:09:15 +0000 (16:09 -0400)]
CRM-16725 - Add Preview PDF button to PDF Letter task so users can review PDF without creating activity.
----------------------------------------
* CRM-16725:
https://issues.civicrm.org/jira/browse/CRM-16725
Coleman Watts [Wed, 7 Oct 2015 18:51:50 +0000 (14:51 -0400)]
Merge branch 4.6 into master
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
colemanw [Wed, 7 Oct 2015 18:49:25 +0000 (14:49 -0400)]
Merge pull request #6910 from colemanw/pdf
Fix template checkboxes in Print PDF form
Coleman Watts [Wed, 7 Oct 2015 18:41:55 +0000 (14:41 -0400)]
Fix template checkboxes in Print PDF form
Coleman Watts [Wed, 7 Oct 2015 18:05:35 +0000 (14:05 -0400)]
CRM-12527 - Additional header fixes
Dave Greenberg [Wed, 7 Oct 2015 17:19:51 +0000 (10:19 -0700)]
Merge pull request #6866 from eileenmcnaughton/CRM-17318
CRM-17318 add getPaymentDescript to Core_Payment class …
CiviCRM [Wed, 7 Oct 2015 12:58:14 +0000 (05:58 -0700)]
Update version to 4.6.10
Kurund Jalmi [Wed, 7 Oct 2015 11:27:15 +0000 (12:27 +0100)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-07-14-23-03
Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Core/Payment/BaseIPN.php
CRM/Extension/Manager/Payment.php
CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl
README.txt
sql/civicrm_generated.mysql
templates/CRM/common/success.tpl
tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
Monish Deb [Wed, 7 Oct 2015 09:21:45 +0000 (14:51 +0530)]
Merge pull request #6908 from jitendrapurohit/CRM-17348
CRM-17348 - add Advcheckbox in addfield()
Yashodha Chaku [Wed, 7 Oct 2015 08:17:04 +0000 (13:47 +0530)]
Merge pull request #6869 from seamuslee001/CRM-17309_master
CRM-17309 Classify no MX record bounce pattern as a DNS Bounce
jitendrapurohit [Wed, 7 Oct 2015 07:29:43 +0000 (12:59 +0530)]
fix for enable/disable relationship
jitendrapurohit [Wed, 7 Oct 2015 07:18:22 +0000 (12:48 +0530)]
minor fix
jitendrapurohit [Wed, 7 Oct 2015 06:51:30 +0000 (12:21 +0530)]
CRM-17348 - add Advcheckbox in addfield()
yashodha [Wed, 7 Oct 2015 06:48:01 +0000 (12:18 +0530)]
make sure it works for non-boolean options as well
colemanw [Wed, 7 Oct 2015 01:35:29 +0000 (21:35 -0400)]
Merge pull request #6549 from pradpnayak/CRM-16620
--CRM-16620, replaced 'nothing' to NULL
colemanw [Wed, 7 Oct 2015 01:03:28 +0000 (21:03 -0400)]
Merge pull request #6533 from BorislavZlatanov/patch-1
Skip loop iteration if 'element_name' field is not set
colemanw [Wed, 7 Oct 2015 00:46:15 +0000 (20:46 -0400)]
Merge pull request #6882 from eileenmcnaughton/CRM-17334
CRM-17334 ensure installments is passed to membership rocessing if set
colemanw [Wed, 7 Oct 2015 00:41:08 +0000 (20:41 -0400)]
Merge pull request #6902 from colemanw/CRM-13823
CRM-13823 - Add php version check
colemanw [Wed, 7 Oct 2015 00:38:32 +0000 (20:38 -0400)]
Merge pull request #6835 from seamuslee001/CRM-17075
CRM-17075 fix searching on membership type as entity reference in adv…
colemanw [Wed, 7 Oct 2015 00:36:34 +0000 (20:36 -0400)]
Merge pull request #6897 from jitendrapurohit/CRMtestfixes
4.6 - CRM Test Fixes
Dave Greenberg [Wed, 7 Oct 2015 00:36:25 +0000 (17:36 -0700)]
Merge pull request #6887 from davecivicrm/CRM-14898
CRM-14898 - Modify action links on membership selector to make it eas…
colemanw [Wed, 7 Oct 2015 00:35:11 +0000 (20:35 -0400)]
Merge pull request #6899 from colemanw/crmDatepicker
crmDatepicker fixes and documentation
colemanw [Wed, 7 Oct 2015 00:05:16 +0000 (20:05 -0400)]
Merge pull request #6875 from colemanw/CRM-17323
CRM-17323 - Add sid token to registration/membership links
Dave Greenberg [Wed, 7 Oct 2015 00:01:23 +0000 (17:01 -0700)]
CRM-14898 - Webtest fixes for action link change.
----------------------------------------
* CRM-14898: Take "Renew" out of More or make it more prominent somehow
https://issues.civicrm.org/jira/browse/CRM-14898
Dave Greenberg [Tue, 6 Oct 2015 23:58:55 +0000 (16:58 -0700)]
Merge pull request #6431 from JMAConsulting/CRM-16526
Crm 16526
Matthew Wire [Tue, 6 Oct 2015 23:08:59 +0000 (00:08 +0100)]
Fix warning when user doesn't have edit permissions
colemanw [Tue, 6 Oct 2015 21:26:46 +0000 (17:26 -0400)]
Merge pull request #6853 from eileenmcnaughton/CRM-17256-46
CRM-17256 populate created_id on report creation
Dave Greenberg [Tue, 6 Oct 2015 19:15:19 +0000 (12:15 -0700)]
Merge pull request #6904 from davecivicrm/CRM-17344
CRM-17344 - Fix footer button markup in Manage Reports Template.
Dave Greenberg [Tue, 6 Oct 2015 19:14:14 +0000 (12:14 -0700)]
CRM-17344 - Fix footer button markup in Manage Reports Template.
----------------------------------------
* CRM-17344: buttons without text on Manage Reports page
https://issues.civicrm.org/jira/browse/CRM-17344
Dave Greenberg [Tue, 6 Oct 2015 19:02:19 +0000 (12:02 -0700)]
Merge pull request #6889 from davecivicrm/CRM-17175
CRM-17175 - Support passing of custom field value in force mode to Ac…
Dave Greenberg [Tue, 6 Oct 2015 18:59:40 +0000 (11:59 -0700)]
Merge pull request #6891 from davecivicrm/CRM-17340
CRM-17340 - Fix handling of Amount label for back-office quick config…
Dave Greenberg [Tue, 6 Oct 2015 18:55:44 +0000 (11:55 -0700)]
Merge pull request #6893 from seamuslee001/CRM-17341
CRM-17341 Include Hold date in the display of Emails on contact records to show…
colemanw [Tue, 6 Oct 2015 18:55:40 +0000 (14:55 -0400)]
Merge pull request #6903 from colemanw/CRM-14748
CRM-14748 - Clarify rest url in api explorer
Coleman Watts [Tue, 6 Oct 2015 18:46:07 +0000 (14:46 -0400)]
CRM-14748 - Clarify rest url in api explorer
Coleman Watts [Tue, 6 Oct 2015 18:42:01 +0000 (14:42 -0400)]
CRM-13823 - Add php version check
colemanw [Tue, 6 Oct 2015 18:34:12 +0000 (14:34 -0400)]
Merge pull request #6883 from eileenmcnaughton/CRM-17355
CRM-17335 toward eliminating use of leaky static
projects / civicrm-core.git / log