colemanw [Fri, 16 Oct 2015 17:15:57 +0000 (13:15 -0400)]
Merge pull request #6957 from jdax/CRM_13823_Admin_Status_Page
CRM 13823 admin status page
colemanw [Fri, 16 Oct 2015 02:56:28 +0000 (22:56 -0400)]
Merge pull request #6978 from eileenmcnaughton/comments
comment fixes
colemanw [Fri, 16 Oct 2015 02:52:07 +0000 (22:52 -0400)]
Merge pull request #6852 from seamuslee001/CRM-17303
CRM-17303 Fix to ensure you cannot schedule Mailings for in the past
eileenmcnaugton [Fri, 16 Oct 2015 01:46:01 +0000 (14:46 +1300)]
comment fixes
Seamus Lee [Fri, 2 Oct 2015 22:25:52 +0000 (22:25 +0000)]
Fix old tests to reflect new validation and add new test to verify that new validation function works
Js Hint fixes
Js Hint fixes
Js Hint fixes
Fix typo found by Dave
Seamus Lee [Thu, 1 Oct 2015 00:54:46 +0000 (00:54 +0000)]
Remove debugging
js hint fixes
js hint fixes
Seamus Lee [Thu, 1 Oct 2015 00:49:49 +0000 (00:49 +0000)]
Shift validation testing to radioDate from crmUI
Minor fixes
Seamus Lee [Wed, 30 Sep 2015 04:12:16 +0000 (04:12 +0000)]
CRM-17303 Fix to ensure you cannot schedule Mailings for in the past
jshint fixes
colemanw [Thu, 15 Oct 2015 17:48:13 +0000 (13:48 -0400)]
Merge pull request #6973 from joannechester/CRM-17407
CRM-17407 renaming recaptcha keys
colemanw [Thu, 15 Oct 2015 17:45:06 +0000 (13:45 -0400)]
Merge pull request #6974 from colemanw/idHelp
Change 'help' id to a class
Nikki Murray [Thu, 15 Oct 2015 16:04:57 +0000 (12:04 -0400)]
CRM-13823 Fixing ts()
Nikki Murray [Thu, 15 Oct 2015 15:42:13 +0000 (11:42 -0400)]
CRM-13823 Adding ts()
Nikki Murray [Thu, 15 Oct 2015 15:39:05 +0000 (11:39 -0400)]
CRM-13823 Removing debug lines
Coleman Watts [Thu, 15 Oct 2015 15:36:13 +0000 (11:36 -0400)]
CRM-17176 - More improvements to reports menu reset ui
Coleman Watts [Thu, 15 Oct 2015 15:20:38 +0000 (11:20 -0400)]
Change 'help' id to a class
colemanw [Thu, 15 Oct 2015 15:09:40 +0000 (11:09 -0400)]
Merge pull request #6793 from Stoob/patch-2
chagne description to match new field label
Eileen McNaughton [Thu, 15 Oct 2015 14:54:04 +0000 (03:54 +1300)]
Merge pull request #6968 from eileenmcnaughton/CRM-17256-paypal
CRM-17256 further fixes on paypal express
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
joannechester [Thu, 15 Oct 2015 14:02:34 +0000 (01:02 +1100)]
CRM-17407 renaming recaptcha keys
Nikki Murray [Thu, 15 Oct 2015 13:35:37 +0000 (09:35 -0400)]
CRM-13823 Fixing 'id' in System.php
eileenmcnaugton [Thu, 15 Oct 2015 12:48:57 +0000 (01:48 +1300)]
CRM-17256 fix payment being by-passed for membership
eileenmcnaugton [Thu, 15 Oct 2015 12:31:49 +0000 (01:31 +1300)]
CRM-17256 credit card failure message not displayed
eileenmcnaugton [Thu, 15 Oct 2015 12:29:51 +0000 (01:29 +1300)]
CRM-17256 fix e-notices on country & state
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
eileenmcnaugton [Thu, 15 Oct 2015 10:03:51 +0000 (23:03 +1300)]
CRM-17256 fixes to paypal-pro going down the paypal express path in confirm
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
eileenmcnaugton [Thu, 15 Oct 2015 08:56:42 +0000 (21:56 +1300)]
CRM-17256 remove duplicate call to preProcessPayment
eileenmcnaugton [Thu, 15 Oct 2015 08:47:02 +0000 (21:47 +1300)]
CRM-17256 paypal fixes on validate
Improve determination of whether the processor is using payment express
eileenmcnaugton [Thu, 15 Oct 2015 08:43:17 +0000 (21:43 +1300)]
Add comments about deprecation
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…
Nikki Murray [Wed, 14 Oct 2015 20:39:44 +0000 (16:39 -0400)]
CRM-13823 Fixing tests to work with is_visible
Nikki Murray [Wed, 14 Oct 2015 20:30:59 +0000 (16:30 -0400)]
CRM-13823 Fixing in API
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
Nikki Murray [Wed, 14 Oct 2015 18:10:11 +0000 (14:10 -0400)]
fixing semicolon for stylecheck
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
Nikki Murray [Wed, 14 Oct 2015 17:26:19 +0000 (13:26 -0400)]
Fixing missing semicolon to pass stylecheck
Nikki Murray [Wed, 14 Oct 2015 17:16:28 +0000 (13:16 -0400)]
cache on page load, get max visible severity, show appropriate footer
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
Nikki Murray [Tue, 13 Oct 2015 18:33:55 +0000 (14:33 -0400)]
Adding link in Multiple Alerts box to status page
Nikki Murray [Tue, 13 Oct 2015 17:07:20 +0000 (13:07 -0400)]
fixing list of locations
Nikki Murray [Tue, 13 Oct 2015 17:06:52 +0000 (13:06 -0400)]
changing name of ctrl
Nikki Murray [Tue, 13 Oct 2015 14:44:05 +0000 (10:44 -0400)]
adding in arrays for statuspage
Nikki Murray [Tue, 13 Oct 2015 14:43:41 +0000 (10:43 -0400)]
moving files from extension into namespaced ang file
Nikki [Thu, 8 Oct 2015 20:35:38 +0000 (16:35 -0400)]
Adding is_visible spec, removing show hushed
Nikki [Thu, 8 Oct 2015 20:35:00 +0000 (16:35 -0400)]
Since is if it is hushed, is_visible should be inverse
Nikki [Thu, 8 Oct 2015 20:34:05 +0000 (16:34 -0400)]
since $messge returns if it's hushed or not, is visible should return opposite
Nikki Murray [Mon, 5 Oct 2015 13:21:54 +0000 (09:21 -0400)]
Updating API for is_visible
Nikki Murray [Wed, 30 Sep 2015 21:13:30 +0000 (17:13 -0400)]
fixing typos and refactoring on isVisible()
Nikki Murray [Wed, 30 Sep 2015 20:31:33 +0000 (16:31 -0400)]
changing api to allow for searching for hushed status alerts
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
projects / civicrm-core.git / log