Dave Greenberg [Tue, 9 Sep 2014 19:21:23 +0000 (12:21 -0700)]
Merge pull request #4054 from eileenmcnaughton/CRM-15237
CRM-15237 enotice on report
Monish Deb [Tue, 9 Sep 2014 13:52:39 +0000 (19:22 +0530)]
Merge pull request #4086 from monishdeb/CRM-15250
Tested and confirmed
monishdeb [Tue, 9 Sep 2014 12:21:14 +0000 (17:51 +0530)]
CRM-15250 fix - membership created and marked current when transaction declined (authorize.net)
https://issues.civicrm.org/jira/browse/CRM-15250
Kurund Jalmi [Tue, 9 Sep 2014 11:46:35 +0000 (17:16 +0530)]
Merge pull request #4082 from monishdeb/CRM-14784
CRM-14784 fix - The update greetings job times out without saving to the...
Yashodha Chaku [Tue, 9 Sep 2014 11:16:48 +0000 (16:46 +0530)]
Merge pull request #4084 from rohankatkar/CRM_15264
Fix for CRM-15264
Rohan Katkar [Tue, 9 Sep 2014 09:55:19 +0000 (15:25 +0530)]
Fix for CRM-15264
Kurund Jalmi [Tue, 9 Sep 2014 07:53:14 +0000 (13:23 +0530)]
Merge pull request #4075 from rohankatkar/webtest4
Webtest fix
Rohan Katkar [Tue, 9 Sep 2014 07:50:11 +0000 (13:20 +0530)]
Additional fix in webtest
Rohan Katkar [Tue, 9 Sep 2014 04:03:09 +0000 (09:33 +0530)]
Webtest fix
monishdeb [Tue, 9 Sep 2014 07:16:57 +0000 (12:46 +0530)]
CRM-14784 fix - The update greetings job times out without saving to the database
https://issues.civicrm.org/jira/browse/CRM-14784
Kurund Jalmi [Tue, 9 Sep 2014 06:55:09 +0000 (12:25 +0530)]
Merge pull request #4073 from kurund/CRM-15181-fixes
CRM-15181 fixes
Kurund Jalmi [Tue, 9 Sep 2014 06:14:15 +0000 (11:44 +0530)]
Merge pull request #4079 from kurund/CRM-15265
CRM-15265, fixed set defaults in profile edit mode
kurund [Tue, 9 Sep 2014 06:09:05 +0000 (11:39 +0530)]
CRM-15265, fix set defaults in profile edit mode
----------------------------------------
* CRM-15265: Defaults not working in profile edit mode
https://issues.civicrm.org/jira/browse/CRM-15265
Dave Greenberg [Tue, 9 Sep 2014 00:00:44 +0000 (17:00 -0700)]
Merge pull request #4074 from davecivicrm/CRM-15197b
CRM-15197 - webtest fix for WebTest_Event_AddPricesetTest.testParticipan...
Dave Greenberg [Mon, 8 Sep 2014 23:59:46 +0000 (16:59 -0700)]
CRM-15197 - webtest fix for WebTest_Event_AddPricesetTest.testParticipantWithDateSpecificPriceSet and also fixing possible timeouts caused by Similar Contact warning
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
kurund [Mon, 8 Sep 2014 18:38:50 +0000 (00:08 +0530)]
CRM-15181, setdefault fixes for state/country
----------------------------------------
* CRM-15181: on behalf of profile: adv multi-select fails with preset options
https://issues.civicrm.org/jira/browse/CRM-15181
kurund [Mon, 8 Sep 2014 17:25:01 +0000 (22:55 +0530)]
CRM-15181, adv select fixes, for onbehalf profile
----------------------------------------
* CRM-15181: on behalf of profile: adv multi-select fails with preset options
https://issues.civicrm.org/jira/browse/CRM-15181
Kurund Jalmi [Mon, 8 Sep 2014 15:24:58 +0000 (20:54 +0530)]
Merge pull request #4072 from jitendrapurohit/WebtestFix4.5.0
Web Test Fix 4.5.0
kurund [Mon, 8 Sep 2014 15:20:44 +0000 (20:50 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-08-20-42-29
Conflicts:
CRM/Contribute/Form/Contribution/Main.php
templates/CRM/Price/Page/Field.tpl
Dave Greenberg [Mon, 8 Sep 2014 14:32:42 +0000 (07:32 -0700)]
Merge pull request #4070 from eileenmcnaughton/4.5
Fix some spelling errors (death to referAnce)
Jitendra Purohit [Mon, 8 Sep 2014 13:06:40 +0000 (18:36 +0530)]
Web Test Fix
Eileen McNaughton [Mon, 8 Sep 2014 00:25:32 +0000 (12:25 +1200)]
comment fix & spelling fix
Eileen McNaughton [Mon, 8 Sep 2014 00:23:27 +0000 (12:23 +1200)]
comment fixes, formatting, duplicate array key
Eileen McNaughton [Mon, 8 Sep 2014 00:12:56 +0000 (12:12 +1200)]
Fix some spelling errors (death to referAnce)
colemanw [Sun, 7 Sep 2014 23:50:32 +0000 (19:50 -0400)]
Merge pull request #4069 from colemanw/confirm
CRM.confirm - support loading remote content
Coleman Watts [Sun, 7 Sep 2014 23:49:50 +0000 (19:49 -0400)]
Improve confirm message for disabling relationships
Coleman Watts [Sun, 7 Sep 2014 23:47:44 +0000 (19:47 -0400)]
CRM.confirm - support loading remote content
Coleman Watts [Sun, 7 Sep 2014 20:50:16 +0000 (16:50 -0400)]
'huge-dialog' size is unnecessary now that height auto-adjusts
colemanw [Sun, 7 Sep 2014 16:12:57 +0000 (12:12 -0400)]
Merge pull request #4067 from colemanw/CRM-15233
CRM-15233 - Fixes for i18n popups
Coleman Watts [Sun, 7 Sep 2014 13:31:22 +0000 (09:31 -0400)]
CRM-15233 - Fixes for i18n popups
colemanw [Sat, 6 Sep 2014 18:47:35 +0000 (14:47 -0400)]
Merge pull request #4064 from colemanw/CRM-15249
CRM-15249 - ProfileSelector view cleanup and css fix
Coleman Watts [Sat, 6 Sep 2014 18:46:52 +0000 (14:46 -0400)]
Prevent profile preview triggering validation errors
Coleman Watts [Sat, 6 Sep 2014 17:32:05 +0000 (13:32 -0400)]
CRM-15249 - ProfileSelector view cleanup and css fix
Tim Otten [Sat, 6 Sep 2014 01:13:57 +0000 (18:13 -0700)]
Merge pull request #4062 from totten/4.4-setupsh-dbport
(Backport) Added support for non-default MySQL host and port.
colemanw [Sat, 6 Sep 2014 01:04:16 +0000 (21:04 -0400)]
Merge pull request #4063 from colemanw/buttonFixes
Ajax button fixes
Coleman Watts [Sat, 6 Sep 2014 01:00:47 +0000 (21:00 -0400)]
Fixes and cleanup for file-on-case
Coleman Watts [Sat, 6 Sep 2014 01:00:16 +0000 (21:00 -0400)]
Add icon to 'file-on-case' button
Coleman Watts [Sat, 6 Sep 2014 00:59:12 +0000 (20:59 -0400)]
CRM-13863 - Tweak popup button icons and fix enter-to-submit
Dave Greenberg [Sat, 6 Sep 2014 00:46:29 +0000 (17:46 -0700)]
Merge pull request #4061 from mlutfy/4.5-crm15246
CRM-15246: special character escape fix
Peter Haight [Thu, 2 Jan 2014 00:10:21 +0000 (16:10 -0800)]
Added support for non-default MySQL host and port.
When I run tests over the MySQL RAM server, I'm usually running the MySQL RAM
server on a different port and I need this script in order to get that all
working in civicrm-project.
Coleman Watts [Fri, 5 Sep 2014 23:48:38 +0000 (19:48 -0400)]
Fix criteria for showing dialog drag handles
colemanw [Fri, 5 Sep 2014 22:50:17 +0000 (18:50 -0400)]
Merge pull request #4060 from colemanw/caseView
Case view improvements
Mathieu Lutfy [Fri, 5 Sep 2014 22:46:55 +0000 (18:46 -0400)]
CRM-15246: in templates/CRM/Core/Calendar/Rss.tpl, escape special chars using 'html' instead of 'htmlall', which breaks non-usascii characters in the RSS feed.
Coleman Watts [Fri, 5 Sep 2014 22:35:30 +0000 (18:35 -0400)]
Case view improvements
Yashodha Chaku [Fri, 5 Sep 2014 12:42:44 +0000 (18:12 +0530)]
Merge pull request #4058 from yashodha/version-fixes
version fixes
CiviCRM [Fri, 5 Sep 2014 12:53:52 +0000 (18:23 +0530)]
version fixes
Yashodha Chaku [Fri, 5 Sep 2014 11:10:04 +0000 (16:40 +0530)]
Merge pull request #4055 from rohankatkar/webtest2
Webtest fix.
Kurund Jalmi [Fri, 5 Sep 2014 08:35:51 +0000 (14:05 +0530)]
Merge pull request #4057 from monishdeb/CRM-15086
CRM-15086 upgrade fix
Yashodha Chaku [Fri, 5 Sep 2014 08:24:44 +0000 (13:54 +0530)]
Merge pull request #4056 from monishdeb/CRM-15235
CRM-15235 fix - Multiple term membership price field option ignores term...
monishdeb [Fri, 5 Sep 2014 08:17:08 +0000 (13:47 +0530)]
CRM-15086 upgrade fix
----------------------------------------
* CRM-15086: civicrm_data.tpl: batch types, status, etc option values were mistakenly put in {ts}
https://issues.civicrm.org/jira/browse/CRM-15086
monishdeb [Fri, 5 Sep 2014 06:36:39 +0000 (12:06 +0530)]
CRM-15235 fix - Multiple term membership price field option ignores terms in back-office
https://issues.civicrm.org/jira/browse/CRM-15235
Rohan Katkar [Fri, 5 Sep 2014 03:41:50 +0000 (09:11 +0530)]
Webtest fix.
Eileen McNaughton [Fri, 5 Sep 2014 02:08:46 +0000 (14:08 +1200)]
whitespace only
Eileen McNaughton [Fri, 5 Sep 2014 02:07:08 +0000 (14:07 +1200)]
CRM-15237 also fix e-notices on event summary report
Eileen McNaughton [Fri, 5 Sep 2014 01:54:04 +0000 (13:54 +1200)]
CRM-15237 whitespace only
Eileen McNaughton [Fri, 5 Sep 2014 01:50:33 +0000 (13:50 +1200)]
CRM-15237 fix enotice
Tim Otten [Thu, 4 Sep 2014 23:37:11 +0000 (16:37 -0700)]
Merge pull request #4052 from mlutfy/4.5-crm15233
CRM-15233: Fix for i18n popups.
Mathieu Lutfy [Thu, 4 Sep 2014 23:34:06 +0000 (19:34 -0400)]
CRM-15233: Fix for i18n popups.
Dave Greenberg [Thu, 4 Sep 2014 22:48:48 +0000 (15:48 -0700)]
Merge pull request #4048 from pradpnayak/CRM-15204
Crm 15204
Dave Greenberg [Thu, 4 Sep 2014 20:44:14 +0000 (13:44 -0700)]
Merge pull request #4031 from joannechester/Report-relative-dates
CRM-15227 new set of relative date filters
Dave Greenberg [Thu, 4 Sep 2014 19:27:27 +0000 (12:27 -0700)]
Merge pull request #4051 from monishdeb/CRM-15229
CRM-15229 fix - Regression or change in message template for membership?
Kurund Jalmi [Thu, 4 Sep 2014 17:40:42 +0000 (23:10 +0530)]
Merge pull request #4049 from atif-shaikh/CRM-15182
CRM-15182 - on behalf of: preloaded org is not preserved
Kurund Jalmi [Thu, 4 Sep 2014 17:39:53 +0000 (23:09 +0530)]
Merge pull request #4050 from jitendrapurohit/WebtestFix4.5.0
Webtest Fix
monishdeb [Thu, 4 Sep 2014 14:17:59 +0000 (19:47 +0530)]
CRM-15229 fix - Regression or change in message template for membership?
https://issues.civicrm.org/jira/browse/CRM-15229
Jitendra Purohit [Thu, 4 Sep 2014 13:33:11 +0000 (19:03 +0530)]
Webtest Fix
atif-shaikh [Thu, 4 Sep 2014 12:48:24 +0000 (18:18 +0530)]
CRM-15182 enhancement - on behalf of: preloaded org is not preserved
https://issues.civicrm.org/jira/browse/CRM-15182
atif-shaikh [Thu, 4 Sep 2014 12:12:38 +0000 (17:42 +0530)]
CRM-15182 - on behalf of: preloaded org is not preserved
https://issues.civicrm.org/jira/browse/CRM-15182
Pradeep Nayak [Thu, 4 Sep 2014 11:31:13 +0000 (17:01 +0530)]
-- CRM-15204, fixed syntax errors
----------------------------------------
* CRM-15204: Upgrade to fix bad line item
https://issues.civicrm.org/jira/browse/CRM-15204
Yashodha Chaku [Thu, 4 Sep 2014 11:15:17 +0000 (16:45 +0530)]
Merge pull request #4043 from rohankatkar/webtest
Fix for Webtest
Rohan Katkar [Thu, 4 Sep 2014 10:18:36 +0000 (15:48 +0530)]
Additional fixes.
Rohan Katkar [Thu, 4 Sep 2014 03:55:47 +0000 (09:25 +0530)]
Fix for Webtest
Yashodha Chaku [Thu, 4 Sep 2014 09:23:26 +0000 (14:53 +0530)]
Merge pull request #4045 from divya-jose/datatable_issue
--fix for datatable error when date field is blank in custom data
Divya Jose [Thu, 4 Sep 2014 07:04:41 +0000 (12:34 +0530)]
--fix for datatable error when date field is blank in custom data
Pradeep Nayak [Thu, 4 Sep 2014 06:39:10 +0000 (12:09 +0530)]
-- CRM-15204, code cleanup ann removed duplicate code
----------------------------------------
* CRM-15204: Upgrade to fix bad line item
https://issues.civicrm.org/jira/browse/CRM-15204
Pradeep Nayak [Wed, 3 Sep 2014 22:31:46 +0000 (04:01 +0530)]
-- CRM-15204, upgrade code to handle bugs related to CRM-15055
----------------------------------------
* CRM-15204: Upgrade to fix bad line item
https://issues.civicrm.org/jira/browse/CRM-15204
* CRM-15055: Line item for membership entity should be created even when Record Payment is not checked
https://issues.civicrm.org/jira/browse/CRM-15055
Eileen McNaughton [Thu, 4 Sep 2014 01:50:56 +0000 (13:50 +1200)]
Merge pull request #4035 from eileenmcnaughton/CRM-14824
CRM-14824 fix intemittant bug on priceset processing
Eileen McNaughton [Thu, 4 Sep 2014 01:45:31 +0000 (13:45 +1200)]
Merge pull request #4019 from eileenmcnaughton/CRM-14877
ACL's not working correctly for select all options in export, CRM-14877
Dave Greenberg [Wed, 3 Sep 2014 23:53:08 +0000 (16:53 -0700)]
Merge pull request #4029 from joannechester/Relative-date-filters-undeclared-variables-fix
CRM-15227 fix e-notices re undeclared variables
Dave Greenberg [Wed, 3 Sep 2014 23:52:55 +0000 (16:52 -0700)]
Merge pull request #4030 from joannechester/Relative-date-word-change
CRM-15227 wording change to match other descriptions
Dave Greenberg [Wed, 3 Sep 2014 23:40:45 +0000 (16:40 -0700)]
Merge pull request #4041 from colemanw/buttons
Visual improvements to dialog buttons and overlay
Dave Greenberg [Wed, 3 Sep 2014 23:37:46 +0000 (16:37 -0700)]
Merge pull request #4042 from eileenmcnaughton/CRM-15207
CRM-15207 attempt to fix tests
Dave Greenberg [Wed, 3 Sep 2014 22:53:17 +0000 (15:53 -0700)]
Merge pull request #4037 from jitendrapurohit/WebtestFix4.5.0
Webtest Fix 4.5.0
Dave Greenberg [Wed, 3 Sep 2014 22:04:38 +0000 (15:04 -0700)]
Merge pull request #4040 from davecivicrm/CRM-15207
CRM-15207 - cherry-pick code changes to fix the Membership separate paym...
Eileen McNaughton [Wed, 3 Sep 2014 21:59:44 +0000 (09:59 +1200)]
CRM-15207 cleanup lines moved to fin entities
Eileen McNaughton [Wed, 3 Sep 2014 10:09:41 +0000 (22:09 +1200)]
CRM-15207 add additional payment processor test
Eileen McNaughton [Wed, 3 Sep 2014 09:37:49 +0000 (21:37 +1200)]
CRM-15207 membership payment incorrectly recorded
Eileen McNaughton [Wed, 3 Sep 2014 09:24:31 +0000 (21:24 +1200)]
CRM-15207 add test for membership situation
Eileen McNaughton [Wed, 3 Sep 2014 08:12:37 +0000 (20:12 +1200)]
CRM-15207 improvements to test setup
Eileen McNaughton [Wed, 3 Sep 2014 05:07:17 +0000 (17:07 +1200)]
CRM-15207 test fix - rebuild default contribution price set
Coleman Watts [Wed, 3 Sep 2014 21:53:29 +0000 (22:53 +0100)]
CRM-13863 - Ensure dialog is unblocked on form errors
Coleman Watts [Wed, 3 Sep 2014 21:36:46 +0000 (22:36 +0100)]
CRM-13863 - Better-looking overlay
Coleman Watts [Wed, 3 Sep 2014 21:29:14 +0000 (22:29 +0100)]
CRM-13863 - Fix blockUI to completely block dialogs
Dave Greenberg [Wed, 3 Sep 2014 21:26:54 +0000 (14:26 -0700)]
Merge pull request #4039 from pradpnayak/CRM-15055
--CRM-15055, fixed date formatting issue in message template for line-it...
Coleman Watts [Wed, 3 Sep 2014 21:24:23 +0000 (22:24 +0100)]
CRM-13863 - Civi style for profile designer buttons
Coleman Watts [Wed, 3 Sep 2014 21:23:03 +0000 (22:23 +0100)]
CRM-13863 - Civi style for ui dialog buttons
Pradeep Nayak [Wed, 3 Sep 2014 20:44:42 +0000 (02:14 +0530)]
--CRM-15055, fixed date formatting issue in message template for line-item
Dave Greenberg [Wed, 3 Sep 2014 20:32:57 +0000 (13:32 -0700)]
CRM-15207 - cherry-pick code changes to fix the Membership separate payment bug. The modifications to CiviUnitTestCase.php are causing test failures and need to be reworked.
----------------------------------------
* CRM-15207:
https://issues.civicrm.org/jira/browse/CRM-15207
Dave Greenberg [Wed, 3 Sep 2014 20:18:48 +0000 (13:18 -0700)]
Merge pull request #3999 from pradpnayak/CRM-15055
Crm 15055
Dave Greenberg [Wed, 3 Sep 2014 18:15:04 +0000 (11:15 -0700)]
Merge pull request #4036 from colemanw/CRM-15225
CRM-15225 - Fix handling of chainSelect on billing forms
Dave Greenberg [Wed, 3 Sep 2014 17:49:36 +0000 (10:49 -0700)]
Merge pull request #4033 from totten/4.4-admin-forcebackend
CRM-14973 - CRM_Core_Menu::buildAdminLinks - Force backend URLs
projects / civicrm-core.git / log