colemanw [Thu, 15 Oct 2015 14:08:50 +0000 (10:08 -0400)]
Merge pull request #6964 from colemanw/CRM-17176
CRM-17176 - Improve report-menu-cleanup button
Monish Deb [Thu, 15 Oct 2015 12:28:30 +0000 (17:58 +0530)]
Merge pull request #6966 from seamuslee001/CRM-17364-alternate
Alternate commit for CRM-17364. Minor wording changes and change to t…
Yashodha Chaku [Thu, 15 Oct 2015 11:49:13 +0000 (17:19 +0530)]
Merge pull request #6969 from yashodha/CRM-17392
CRM-17392: Charts do not appear on dashboard
yashodha [Thu, 15 Oct 2015 09:20:30 +0000 (14:50 +0530)]
CRM-17392: Charts do not appear on dashboard
----------------------------------------
* CRM-17392: Charts do not appear on dashboard
https://issues.civicrm.org/jira/browse/CRM-17392
Seamus Lee [Thu, 15 Oct 2015 05:40:40 +0000 (05:40 +0000)]
Alternate commit for CRM-17364. Minor wording changes and change to the way where clause is handled
Coleman Watts [Thu, 15 Oct 2015 01:13:29 +0000 (21:13 -0400)]
CRM-17176 - Improve report-menu-cleanup button
Dave Greenberg [Wed, 14 Oct 2015 21:30:12 +0000 (14:30 -0700)]
Merge pull request #6960 from davecivicrm/CRM-17305
CRM-17305 - Fix handling of processor fees in Participant Listing rep…
colemanw [Wed, 14 Oct 2015 19:47:44 +0000 (15:47 -0400)]
Merge pull request #6746 from systopia/CRM-17218
fixed number format problem with PayPal fee calculation
colemanw [Wed, 14 Oct 2015 19:42:52 +0000 (15:42 -0400)]
Merge pull request #6942 from monishdeb/CRM-17383
CRM-17383 fix - Smart group form values broken in 4.7
colemanw [Wed, 14 Oct 2015 18:54:35 +0000 (14:54 -0400)]
Merge pull request #6927 from eileenmcnaughton/CRM-17256-paypal
Crm 17256 paypal
colemanw [Wed, 14 Oct 2015 18:51:27 +0000 (14:51 -0400)]
Merge pull request #6940 from kcristiano/CRM-16421
CRM-16408 add check for prior and current location for $alreadyInstalled variable
colemanw [Wed, 14 Oct 2015 18:36:59 +0000 (14:36 -0400)]
Merge pull request #6955 from eileenmcnaughton/test
enable single value alter test for job api
Dave Greenberg [Wed, 14 Oct 2015 18:20:34 +0000 (11:20 -0700)]
Merge pull request #6958 from joannechester/CRM-17381
CRM-17381-removing-more-batch-updates
colemanw [Wed, 14 Oct 2015 18:04:15 +0000 (14:04 -0400)]
Merge pull request #6959 from colemanw/CRM-16415
CRM-16415 - Help icons
Coleman Watts [Wed, 14 Oct 2015 18:03:43 +0000 (14:03 -0400)]
CRM-16415 - Syntax fix
Coleman Watts [Wed, 14 Oct 2015 17:39:05 +0000 (13:39 -0400)]
CRM-16415 - Help icons
joannechester [Wed, 14 Oct 2015 17:15:41 +0000 (04:15 +1100)]
CRM-17381-removing-more-batch-updates
monishdeb [Wed, 14 Oct 2015 16:25:17 +0000 (21:55 +0530)]
format fix
Tim Otten [Wed, 14 Oct 2015 16:22:52 +0000 (17:22 +0100)]
Merge pull request #6943 from totten/master-navmenu
CRM-13803 - hook_navigationMenu - Infer navID/parentID
monishdeb [Wed, 14 Oct 2015 16:11:13 +0000 (21:41 +0530)]
Added test-case for Custom Search - Household and State
monishdeb [Tue, 13 Oct 2015 14:22:33 +0000 (19:52 +0530)]
ensure CRM_Contact_BAO_SavedSearch::getFormValues is only used to fetch as Search Form default
monishdeb [Tue, 13 Oct 2015 13:11:12 +0000 (18:41 +0530)]
CRM-17383 fix - Smart group form values broken in 4.7
https://issues.civicrm.org/jira/browse/CRM-17383
Kurund Jalmi [Wed, 14 Oct 2015 10:25:14 +0000 (11:25 +0100)]
Merge pull request #6953 from joannechester/CRM-17381
Crm 17381
Kurund Jalmi [Wed, 14 Oct 2015 10:21:42 +0000 (11:21 +0100)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-14-11-04-09
Conflicts:
CRM/Core/Payment/PayPalImpl.php
sql/civicrm_generated.mysql
tests/phpunit/api/v3/SyntaxConformanceTest.php
xml/templates/civicrm_sample.tpl
Kurund Jalmi [Wed, 14 Oct 2015 09:25:32 +0000 (10:25 +0100)]
Merge pull request #6954 from kurund/CRM-17393
worked on CRM-17393
Kurund Jalmi [Wed, 14 Oct 2015 09:25:09 +0000 (10:25 +0100)]
Merge pull request #6950 from totten/4.6-report-dashlet
CRM-17328 - Fix dashlet/report ID mappings
CiviCRM [Wed, 14 Oct 2015 09:13:42 +0000 (02:13 -0700)]
Update version to 4.7.alpha5
joannechester [Wed, 14 Oct 2015 09:06:46 +0000 (20:06 +1100)]
remove-unused-asort
joannechester [Wed, 14 Oct 2015 08:54:03 +0000 (19:54 +1100)]
fixing-task-sort-order
eileen [Sat, 10 Oct 2015 02:13:37 +0000 (15:13 +1300)]
enable single value alter test for job api
Kurund Jalmi [Wed, 14 Oct 2015 00:41:57 +0000 (01:41 +0100)]
Merge pull request #6949 from totten/master-report-dashlet
CRM-17328 - Fix dashlet/report ID mappings
colemanw [Wed, 14 Oct 2015 00:35:53 +0000 (20:35 -0400)]
Merge pull request #6951 from colemanw/CRM-16415
CRM-16415 - Fix icons in popups
Kurund Jalmi [Wed, 14 Oct 2015 00:22:34 +0000 (01:22 +0100)]
worked on CRM-17393
joannechester [Wed, 14 Oct 2015 00:02:36 +0000 (01:02 +0100)]
Update AssignUsersToRolesTest.php
text change
joannechester [Tue, 13 Oct 2015 23:44:04 +0000 (10:44 +1100)]
renaming-batch-update
Dave Greenberg [Tue, 13 Oct 2015 22:06:54 +0000 (15:06 -0700)]
CRM-17305 - Fix handling of processor fees in Participant Listing report.
----------------------------------------
* CRM-17305: Contribution fees are affecting reporting of total paid and balanace
https://issues.civicrm.org/jira/browse/CRM-17305
Coleman Watts [Tue, 13 Oct 2015 21:54:44 +0000 (17:54 -0400)]
CRM-16415 - Fix icons in popups
Tim Otten [Tue, 13 Oct 2015 21:47:06 +0000 (22:47 +0100)]
CRM-17328 - Fix dashlet/report ID mappings
civibuild has been failing to configure the dashboard because some ID's are
invalid, and some ID's are no longer pointing to the originally prescribed
reports.
Tim Otten [Tue, 13 Oct 2015 21:30:18 +0000 (22:30 +0100)]
CRM-17328 - Fix dashlet/report ID mappings
civibuild has been failing to configure the dashboard because some ID's are
invalid, and some ID's are no longer pointing to the originally prescribed
reports.
colemanw [Tue, 13 Oct 2015 20:46:00 +0000 (16:46 -0400)]
Merge pull request #6934 from colemanw/CRM-11782
CRM-11782 - Fix search by contact_type
joannechester [Tue, 13 Oct 2015 20:44:19 +0000 (07:44 +1100)]
smart-group-changes
colemanw [Tue, 13 Oct 2015 20:41:04 +0000 (16:41 -0400)]
Merge pull request #6947 from colemanw/crmButton
CRM-16415 - Use crmButton more consistently
Stephanie Gray [Wed, 30 Sep 2015 19:47:39 +0000 (15:47 -0400)]
CRM-16415 - convert button to crmButton, convert single url variable to path plus query in array to fix issue with encoded &
Stephanie Gray [Wed, 30 Sep 2015 18:30:01 +0000 (14:30 -0400)]
CRM-16415 - convert button to crmButton - Campaign/Page/Petition.tpl
Stephanie Gray [Wed, 30 Sep 2015 18:07:35 +0000 (14:07 -0400)]
CRM-16415 - convert button to crmButton - Campaign/Form/Search/Campaign.tpl
Stephanie Gray [Wed, 30 Sep 2015 17:41:57 +0000 (13:41 -0400)]
CRM-16415 - removed extra space in crmButton call - ACL.tpl, ACLBasic.tpl
Stephanie Gray [Wed, 30 Sep 2015 16:23:40 +0000 (12:23 -0400)]
CRM-16415 - updated crmButton so that there is no empty space if there are no additional classes specified
Stephanie Gray [Wed, 30 Sep 2015 15:18:53 +0000 (11:18 -0400)]
CRM-16415 - convert button to crmButton - Batch/Form/Search.tpl
Stephanie Gray [Wed, 30 Sep 2015 14:56:57 +0000 (10:56 -0400)]
CRM-16415 - convert button to crmButton - Badge/Form/Layout.tpl
Stephanie Gray [Tue, 29 Sep 2015 22:23:04 +0000 (18:23 -0400)]
CRM-16415 - convert button to crmButton - Navigation.tpl
Stephanie Gray [Tue, 29 Sep 2015 21:44:09 +0000 (17:44 -0400)]
CRM-16415 - convert button to crmButton - LabelFormats.tpl
colemanw [Tue, 13 Oct 2015 18:08:54 +0000 (14:08 -0400)]
Merge pull request #6811 from agh1/fa-icons
Replace jQuery UI sprites with Font Awesome
Kurund Jalmi [Tue, 13 Oct 2015 17:48:42 +0000 (18:48 +0100)]
Merge pull request #6941 from kurund/CRM-16719
fixes for CRM-16719
Andrew Hunt [Tue, 13 Oct 2015 17:47:27 +0000 (13:47 -0400)]
CRM-16415 Font Awesome dashlet controls
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Tue, 13 Oct 2015 17:22:38 +0000 (13:22 -0400)]
CRM-16415 merge stuff in old commit
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Tue, 13 Oct 2015 17:15:14 +0000 (13:15 -0400)]
CRM-16415 New icon after going through
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Tue, 13 Oct 2015 16:39:23 +0000 (12:39 -0400)]
CRM-16415 Last icons to replace
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Tue, 13 Oct 2015 16:16:47 +0000 (12:16 -0400)]
CRM-16415 Icons for standard save/cancel buttons
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Tue, 13 Oct 2015 15:08:34 +0000 (11:08 -0400)]
CRM-16415 Wrenches, undos, and go-backs
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Tue, 13 Oct 2015 14:34:04 +0000 (10:34 -0400)]
CRM-16415 Grips for moving
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Sat, 3 Oct 2015 19:41:30 +0000 (15:41 -0400)]
CRM-16415 done with wrenches
----------------------------------------
* CRM-16415:
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Thu, 1 Oct 2015 03:48:33 +0000 (23:48 -0400)]
CRM-16415 Print icons and more
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Wed, 30 Sep 2015 21:13:36 +0000 (17:13 -0400)]
CRM-16415 have font awesome handle ui-icon with fa- class
based on http://stackoverflow.com/a/
17493936
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Wed, 30 Sep 2015 20:46:10 +0000 (16:46 -0400)]
CRM-16415 Pencils - Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Wed, 30 Sep 2015 19:53:17 +0000 (15:53 -0400)]
CRM-16415 helpicon class now uses font awesome
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Wed, 30 Sep 2015 19:00:09 +0000 (15:00 -0400)]
CRM-16415 ang: more icons in angularland
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Wed, 30 Sep 2015 18:38:24 +0000 (14:38 -0400)]
CRM-16415 ang: all jQuery UI icons gone from angular
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Wed, 30 Sep 2015 17:03:01 +0000 (13:03 -0400)]
CRM- 16415 ang: handle crm-i class for fontawesome icons
Andrew Hunt [Mon, 28 Sep 2015 04:59:03 +0000 (00:59 -0400)]
CRM-16415 Replacing plus-circle icon
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Mon, 28 Sep 2015 03:03:36 +0000 (23:03 -0400)]
CRM-16415 fa-times instead of ui-icon-close
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Mon, 28 Sep 2015 01:08:59 +0000 (21:08 -0400)]
CRM-16415 smarty crmButton uses and many instances of close
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Sun, 27 Sep 2015 21:39:14 +0000 (17:39 -0400)]
CRM-16415 Font Awesome Use class crm-i instead of fa
This allows for independence from a site's theme's implementation of Font Awesome. If they theme .fa.fa-something, that won't screw up .crm-i.fa-something.
----------------------------------------
* CRM-16415:
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Sun, 27 Sep 2015 20:54:00 +0000 (16:54 -0400)]
CRM-16415 Replaced .ui-icon-alert
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Sun, 27 Sep 2015 19:42:23 +0000 (15:42 -0400)]
CRM-16415 include Font Awesome CSS
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Kurund Jalmi [Tue, 13 Oct 2015 16:44:15 +0000 (17:44 +0100)]
skip this report for stats testing: CRM-16719
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).
Kurund Jalmi [Tue, 13 Oct 2015 14:42:09 +0000 (15:42 +0100)]
fixes for CRM-16719
Kurund Jalmi [Tue, 13 Oct 2015 14:38:09 +0000 (15:38 +0100)]
fixes for CRM-16719
eileenmcnaugton [Tue, 13 Oct 2015 14:18:48 +0000 (03:18 +1300)]
CRM-17256 further fix to pay-later with billing_required
eileenmcnaugton [Tue, 13 Oct 2015 13:39:58 +0000 (02:39 +1300)]
CRM-17256 fix for paylater billing_required
This commit sets up pay-later as a payment processor class in limited capacity to allow it to cope
with the field loading for billing_required_for_pay_later contribution forms. I had hoped not to have to do this
in 4.7 but the address fields were not loading correctly on form-change :-(. This did allow me to remove quite a few
hacks that were in place to support the way the billing_for_pay_later was working though :-).
Note that a better solution than a check-box for billing-required-for-pay-later would be to allow joining a profile
of field that the paymnet processor should be 'encouraged' to provide on the payment form. ie. the payment processor could
then build the form to include the profile fields and those required (if any) by it's processor.
The code is written on the assumption the billing profile might be changed to a real profile at some point
eileenmcnaugton [Tue, 13 Oct 2015 13:15:27 +0000 (02:15 +1300)]
CRM-17256 don't validate cc fields if token has been entered
Kurund Jalmi [Tue, 13 Oct 2015 10:38:54 +0000 (11:38 +0100)]
fixes for CRM-16719
eileenmcnaugton [Tue, 13 Oct 2015 09:38:25 +0000 (22:38 +1300)]
enotice fix on paypal express
eileenmcnaugton [Tue, 13 Oct 2015 09:38:04 +0000 (22:38 +1300)]
CRM-17387 getBillingDefaults function not available to Membership Form
I think this might be some mix up in the history of merged & perhaps this function
might have been meant to go in favour of anohter.
But, the other places in the code that duplicate this are still present - so perhaps not tackled
eileenmcnaugton [Tue, 13 Oct 2015 09:06:22 +0000 (22:06 +1300)]
CRM-17256 move validation of billing fields to the payment processor
Note that this wasn't done previously due to trying to 'work around' the billing-for-pay later
but that doesn't turn out to be working properly at the moment so better to do the 'proper' fix for this
and for that than to keep trying to work around the way that code was working
eileenmcnaugton [Tue, 13 Oct 2015 09:02:07 +0000 (22:02 +1300)]
CRM-17256 use consistent retrieval of billing location type id
Yashodha Chaku [Tue, 13 Oct 2015 07:14:10 +0000 (12:44 +0530)]
Merge pull request #6900 from chanunc/4.6
Fix invoice email doesnot sent out when completed payment using Paypal
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…
Kevin Cristiano [Mon, 12 Oct 2015 20:28:04 +0000 (16:28 -0400)]
CRM-16408 add check for prior and current location for variable
----------------------------------------
* CRM-16408: Installer rewrite
https://issues.civicrm.org/jira/browse/CRM-16408
CRM-16408 add check for prior and current location for variable
----------------------------------------
* CRM-16408: Installer rewrite
https://issues.civicrm.org/jira/browse/CRM-16408
Dave Greenberg [Mon, 12 Oct 2015 21:02:33 +0000 (14:02 -0700)]
Merge pull request #6803 from eileenmcnaughton/CRM-11338-paypal-fee
CRM-11338 retrieve fee_amount from paypal
Dave Greenberg [Mon, 12 Oct 2015 20:54:27 +0000 (13:54 -0700)]
Merge pull request #6851 from eileenmcnaughton/CRM-17176-location-46
CRM-17306 fix location update action
Coleman Watts [Sun, 11 Oct 2015 23:22:10 +0000 (19:22 -0400)]
CRM-11782 - Fix search by contact_type
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
projects / civicrm-core.git / log