Monish Deb [Mon, 19 Oct 2015 09:45:55 +0000 (15:15 +0530)]
Merge pull request #7002 from monishdeb/CRM-17396
CRM-17396 fix - Editing a membership price set breaks auto-renew func…
Yashodha Chaku [Mon, 19 Oct 2015 09:34:07 +0000 (15:04 +0530)]
Merge pull request #6982 from eileenmcnaughton/CRM-17412
CRM-17412 strict notice fix
Yashodha Chaku [Mon, 19 Oct 2015 08:45:19 +0000 (14:15 +0530)]
Merge pull request #7003 from yashodha/CRM-17414
CRM-17414: Add to and from dates to the Relationship Report filter
Eileen McNaughton [Mon, 19 Oct 2015 08:12:11 +0000 (21:12 +1300)]
Merge pull request #6995 from saurabhbatra96/CRM-16842
CRM-16842 add EntityBatch API (fixed).
yashodha [Mon, 19 Oct 2015 06:41:36 +0000 (12:11 +0530)]
CRM-17414: fix comments
----------------------------------------
* CRM-17414: Add to and from dates to the Relationship Report filter
https://issues.civicrm.org/jira/browse/CRM-17414
yashodha [Mon, 19 Oct 2015 06:38:13 +0000 (12:08 +0530)]
CRM-17414: minor fixes
----------------------------------------
* CRM-17414: Add to and from dates to the Relationship Report filter
https://issues.civicrm.org/jira/browse/CRM-17414
Yashodha Chaku [Mon, 19 Oct 2015 06:28:13 +0000 (11:58 +0530)]
Merge pull request #6983 from yashodha/CRM-17354
CRM-17354: Tell a Friend email field should be trimmed
yashodha [Mon, 19 Oct 2015 06:17:18 +0000 (11:47 +0530)]
CRM-17414: Add to and from dates to the Relationship Report filter
----------------------------------------
* CRM-17414: Add to and from dates to the Relationship Report filter
https://issues.civicrm.org/jira/browse/CRM-17414
monishdeb [Mon, 19 Oct 2015 05:48:12 +0000 (11:18 +0530)]
CRM-17396 fix - Editing a membership price set breaks auto-renew functionality
https://issues.civicrm.org/jira/browse/CRM-17396
Monish Deb [Mon, 19 Oct 2015 04:49:03 +0000 (10:19 +0530)]
Merge pull request #6970 from monishdeb/CRM-17396
CRM-17396 fix - Editing a membership price set breaks auto-renew functionality
colemanw [Mon, 19 Oct 2015 02:23:35 +0000 (22:23 -0400)]
Merge pull request #6999 from colemanw/CRM-17416
CRM-17416 - Handle wysiwyg latency and add lazy-loading
colemanw [Mon, 19 Oct 2015 00:54:05 +0000 (20:54 -0400)]
Merge pull request #6992 from colemanw/icons
Icon and css updates/cleanup
Coleman Watts [Mon, 19 Oct 2015 00:06:11 +0000 (20:06 -0400)]
Make clientside CRM.config.resourceBase absolute
Coleman Watts [Mon, 19 Oct 2015 00:02:39 +0000 (20:02 -0400)]
Remove unused wysiwyg settings from angular callback
Coleman Watts [Sun, 18 Oct 2015 21:16:34 +0000 (17:16 -0400)]
Lazy-load ckeditor.js
Dave Greenberg [Sun, 18 Oct 2015 22:50:20 +0000 (15:50 -0700)]
Merge pull request #6989 from seamuslee001/CRM-17415
CRM-17415 Add in URL filtering to Click through report
Eileen McNaughton [Sun, 18 Oct 2015 22:06:13 +0000 (11:06 +1300)]
Merge pull request #6993 from eileenmcnaughton/tests
minor test classes tidy-up.
Eileen McNaughton [Sun, 18 Oct 2015 22:05:32 +0000 (11:05 +1300)]
Merge pull request #6996 from eileenmcnaughton/t
minor test class tidy-up
eileenmcnaugton [Sun, 18 Oct 2015 07:52:57 +0000 (20:52 +1300)]
minor test classes idy-up.
We have been moving from the create helper classes taking a range of parameters to them taking an array which
is merged with the defaults the functions provide in order to create the entity
eileenmcnaughton [Sun, 18 Oct 2015 20:45:13 +0000 (20:45 +0000)]
minor test class tidy-up
Coleman Watts [Sun, 18 Oct 2015 19:25:51 +0000 (15:25 -0400)]
crm.ckeditor.js code cleanup
Coleman Watts [Sun, 18 Oct 2015 19:11:54 +0000 (15:11 -0400)]
CRM-17416 - Wait for wysiwyg to be ready
Saurabh Batra [Sun, 18 Oct 2015 16:11:40 +0000 (21:41 +0530)]
CRM-16842 add EntityBatch API fixed.
----------------------------------------
* CRM-16842:
https://issues.civicrm.org/jira/browse/CRM-16842
Coleman Watts [Sat, 17 Oct 2015 18:59:07 +0000 (14:59 -0400)]
Cleanup css files and remove unused styles
Coleman Watts [Sat, 17 Oct 2015 21:22:45 +0000 (17:22 -0400)]
CRM-16415 - Move hamburger menu icon to left side
Seamus Lee [Sat, 17 Oct 2015 22:28:43 +0000 (22:28 +0000)]
Fix Template file
Coleman Watts [Sat, 17 Oct 2015 18:58:47 +0000 (14:58 -0400)]
CRM-16415 - Replace editable icons
Coleman Watts [Sat, 17 Oct 2015 18:14:26 +0000 (14:14 -0400)]
CRM-16415 - UI icon updates
colemanw [Sat, 17 Oct 2015 17:40:38 +0000 (13:40 -0400)]
Merge pull request #6991 from kcristiano/CRM-16421
CRM-16421 Rid Code base of references to 'wp-content'
Kevin Cristiano [Sat, 17 Oct 2015 17:35:08 +0000 (13:35 -0400)]
CRM-16421 Rid Code base of references to 'wp-content'
----------------------------------------
* CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository
https://issues.civicrm.org/jira/browse/CRM-16421
colemanw [Sat, 17 Oct 2015 02:04:54 +0000 (22:04 -0400)]
Merge pull request #6988 from colemanw/CRM-16415
CRM-16415 - Action icon updates
Seamus Lee [Fri, 16 Oct 2015 22:50:29 +0000 (22:50 +0000)]
PHPCS fixes
Seamus Lee [Fri, 16 Oct 2015 22:31:58 +0000 (22:31 +0000)]
CRM-17415 Add in URL filtering to Click through report
Coleman Watts [Fri, 16 Oct 2015 21:27:10 +0000 (17:27 -0400)]
CRM-16415 - Add icon to message template selector
Coleman Watts [Fri, 16 Oct 2015 20:48:42 +0000 (16:48 -0400)]
CRM-16415 - master accordion header help-icon color
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
yashodha [Fri, 16 Oct 2015 09:41:30 +0000 (15:11 +0530)]
CRM-17354: Tell a Friend email field should be trimmed
----------------------------------------
* CRM-17354: Tell a Friend email field should be trimmed
https://issues.civicrm.org/jira/browse/CRM-17354
eileenmcnaugton [Fri, 16 Oct 2015 03:15:03 +0000 (16:15 +1300)]
CRM-17412 strict notice fix
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
Coleman Watts [Thu, 15 Oct 2015 19:50:30 +0000 (15:50 -0400)]
CRM-16415 - Convert action menu icons
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
monishdeb [Thu, 15 Oct 2015 11:15:22 +0000 (16:45 +0530)]
CRM-17396 fix - Editing a membership price set breaks auto-renew functionality
https://issues.civicrm.org/jira/browse/CRM-17396
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
projects / civicrm-core.git / log