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.
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
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
Pradeep Nayak [Wed, 3 Sep 2014 14:10:18 +0000 (19:40 +0530)]
-- CRM-15055, fixed code for message template as the line item was not rendered properly
----------------------------------------
* 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
Jitendra Purohit [Wed, 3 Sep 2014 13:24:48 +0000 (18:54 +0530)]
Webtest Fix
Coleman Watts [Wed, 3 Sep 2014 11:12:38 +0000 (12:12 +0100)]
CRM-15225 - Add comment to explain the fix
Coleman Watts [Wed, 3 Sep 2014 10:49:26 +0000 (11:49 +0100)]
CRM-15225 - Fix handling of chainSelect on billing forms
Coleman Watts [Wed, 3 Sep 2014 10:47:22 +0000 (11:47 +0100)]
Minor cleanup
Coleman Watts [Wed, 3 Sep 2014 10:46:01 +0000 (11:46 +0100)]
Comment fix
Pradeep Nayak [Sat, 30 Aug 2014 22:10:25 +0000 (03:40 +0530)]
--CRM-15055, code cleanup
Pradeep Nayak [Sat, 30 Aug 2014 21:58:18 +0000 (03:28 +0530)]
-- CRM-15055, handled creation of line item via membership api and import
----------------------------------------
* 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
Pradeep Nayak [Sat, 30 Aug 2014 20:41:50 +0000 (02:11 +0530)]
-- CRM-15055, handled IPN request for status change
----------------------------------------
* 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
Pradeep Nayak [Sat, 30 Aug 2014 20:41:05 +0000 (02:11 +0530)]
-- CRM-15055, handled 0 Membership fee to create line items
----------------------------------------
* 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
Pradeep Nayak [Sat, 30 Aug 2014 14:02:48 +0000 (19:32 +0530)]
--CRM-15055, code changes to handle separate membership
Pradeep Nayak [Sat, 30 Aug 2014 14:02:13 +0000 (19:32 +0530)]
--CRM-15055, more work to create line item from font end
Pradeep Nayak [Sat, 30 Aug 2014 14:01:40 +0000 (19:31 +0530)]
-- CRM-15055, fixed for multiple membership
----------------------------------------
* 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
Pradeep Nayak [Sat, 30 Aug 2014 14:01:04 +0000 (19:31 +0530)]
-- CRM-15055, create line item for membership wne no contribution is recorded
----------------------------------------
* 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
Pradeep Nayak [Sat, 30 Aug 2014 14:00:30 +0000 (19:30 +0530)]
--CRM-15055, CRM-15178, fixed code to save line items when a contribution is saved for contribution
----------------------------------------
* CRM-15178: Correct line_item entity reference for memberships when Separate Payments is true
https://issues.civicrm.org/jira/browse/CRM-15178
Pradeep Nayak [Sat, 30 Aug 2014 13:59:46 +0000 (19:29 +0530)]
-- CRM-15188, fixed code to provide line item ref to correct component id
----------------------------------------
* CRM-15188: line_item entity refs to membership rather than contrib on non-membership lines of membership price sets
https://issues.civicrm.org/jira/browse/CRM-15188
Coleman Watts [Wed, 3 Sep 2014 08:03:35 +0000 (09:03 +0100)]
CRM-13863 - Add icons to confirmation dialog buttons
Coleman Watts [Wed, 3 Sep 2014 08:02:15 +0000 (09:02 +0100)]
CRM-13863 - Show form buttons as part of the dialog
joannechester [Wed, 3 Sep 2014 04:05:40 +0000 (14:05 +1000)]
Update Date.php
joannechester [Wed, 3 Sep 2014 03:54:22 +0000 (13:54 +1000)]
Update Date.php
joannechester [Wed, 3 Sep 2014 03:41:20 +0000 (13:41 +1000)]
Update Date.php
joannechester [Wed, 3 Sep 2014 03:33:45 +0000 (13:33 +1000)]
Update Date.php
Dave Greenberg [Wed, 3 Sep 2014 01:58:09 +0000 (18:58 -0700)]
Merge pull request #4028 from davecivicrm/CRM-15226
CRM-15226 - label improvements.
Dave Greenberg [Wed, 3 Sep 2014 01:57:16 +0000 (18:57 -0700)]
CRM-15226 - label improvements.
----------------------------------------
* CRM-15226:
https://issues.civicrm.org/jira/browse/CRM-15226
Dave Greenberg [Wed, 3 Sep 2014 00:11:41 +0000 (17:11 -0700)]
Merge pull request #4025 from pradpnayak/CRM-14853
-- CRM-14853, change payment instrument id when contribution status is c...
Dave Greenberg [Tue, 2 Sep 2014 22:04:18 +0000 (15:04 -0700)]
Merge pull request #4012 from pradpnayak/CRM-15206
-- CRM-15206, fixed display of line item on edit contribution form
Dave Greenberg [Tue, 2 Sep 2014 21:33:23 +0000 (14:33 -0700)]
Merge pull request #4026 from davecivicrm/CRM-15205
CRM-15205 - replaces PR 4001 with rebuilt civicrm_generated.mysql file.
Dave Greenberg [Tue, 2 Sep 2014 21:31:38 +0000 (14:31 -0700)]
CRM-15205 - replaces PR 4001 with rebuilt civicrm_generated.mysql file.
----------------------------------------
* CRM-15205:
https://issues.civicrm.org/jira/browse/CRM-15205
Pradeep Nayak [Tue, 2 Sep 2014 20:35:03 +0000 (02:05 +0530)]
-- CRM-14853, change payment instrument id when contribution status is changed from In-progress/Pending to Completed
----------------------------------------
* CRM-14853: Bookkeeping report represents payment type incorrectly
https://issues.civicrm.org/jira/browse/CRM-14853
Kurund Jalmi [Tue, 2 Sep 2014 19:41:16 +0000 (01:11 +0530)]
Merge pull request #4023 from jitendrapurohit/WebtestFix4.5.0
Webtest Fix 4.5.0
Kurund Jalmi [Tue, 2 Sep 2014 19:09:43 +0000 (00:39 +0530)]
Merge pull request #4024 from kurund/version-fixes
version fixes for beta9
kurund [Tue, 2 Sep 2014 19:07:33 +0000 (00:37 +0530)]
fixes for beta9
colemanw [Tue, 2 Sep 2014 14:10:06 +0000 (15:10 +0100)]
Merge pull request #4022 from colemanw/CRM-15220
CRM-15220 - Fix malformed url in grant menu
Jitendra Purohit [Tue, 2 Sep 2014 13:21:54 +0000 (18:51 +0530)]
Webtest 4.5.0
Coleman Watts [Tue, 2 Sep 2014 12:52:09 +0000 (13:52 +0100)]
CRM-15220 - Add status options to grant menu
Coleman Watts [Tue, 2 Sep 2014 12:29:31 +0000 (13:29 +0100)]
CRM-15220 - Fix malformed url in grant menu
colemanw [Tue, 2 Sep 2014 12:20:21 +0000 (13:20 +0100)]
Merge pull request #4021 from colemanw/CRM-15218
CRM-15218 - Update non-standard profile names
Coleman Watts [Tue, 2 Sep 2014 11:36:26 +0000 (12:36 +0100)]
CRM-15218 - Update non-standard profile names
Yashodha Chaku [Tue, 2 Sep 2014 09:43:39 +0000 (15:13 +0530)]
Merge pull request #3984 from yashodha/CRM-15171
CRM-15171: fix variables in Register.php
Kurund Jalmi [Tue, 2 Sep 2014 08:06:33 +0000 (13:36 +0530)]
Merge pull request #4017 from demeritcowboy/CRM-15211
CRM-15211
Coleman Watts [Mon, 1 Sep 2014 21:58:52 +0000 (22:58 +0100)]
Fix undefined index warning
DemeritCowboy [Mon, 1 Sep 2014 21:56:57 +0000 (17:56 -0400)]
CRM-15211 fix outdated permission
DemeritCowboy [Mon, 1 Sep 2014 21:22:06 +0000 (17:22 -0400)]
CRM-15211 fix outdated permission
colemanw [Mon, 1 Sep 2014 19:10:19 +0000 (20:10 +0100)]
Merge pull request #4016 from colemanw/Fix
Fix dynamicResourcepath for windows systems (again)
Coleman Watts [Mon, 1 Sep 2014 19:09:06 +0000 (20:09 +0100)]
Fix dynamicResourcepath for windows systems (again)
kurund [Mon, 1 Sep 2014 17:19:07 +0000 (22:49 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-01-22-48-29
Coleman Watts [Mon, 1 Sep 2014 15:54:23 +0000 (16:54 +0100)]
Merge branch 'fuzionnz-CRM-13113' into 4.5
colemanw [Mon, 1 Sep 2014 15:49:14 +0000 (16:49 +0100)]
Merge pull request #4009 from eileenmcnaughton/CRM-15210
CRM-15210 fix fatal on merge exports of non primary addresses
colemanw [Mon, 1 Sep 2014 15:46:11 +0000 (16:46 +0100)]
Merge pull request #4011 from eileenmcnaughton/CRM-15213
CRM-15213 fix spelling of renewal
Coleman Watts [Mon, 1 Sep 2014 15:45:05 +0000 (16:45 +0100)]
Minor cleanup
projects / civicrm-core.git / log