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
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
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
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
Kurund Jalmi [Tue, 13 Oct 2015 10:38:54 +0000 (11:38 +0100)]
fixes for CRM-16719
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…
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
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
Eileen McNaughton [Fri, 9 Oct 2015 20:46:04 +0000 (09:46 +1300)]
CRM-11338 further fix on fee amount
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…
projects / civicrm-core.git / log