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
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
Dave Greenberg [Mon, 1 Sep 2014 15:31:00 +0000 (08:31 -0700)]
Merge pull request #4014 from jitendrapurohit/WebtestFix4.5.0
WebTest Fixes 4.5
Jitendra Purohit [Mon, 1 Sep 2014 13:43:04 +0000 (19:13 +0530)]
WebTest Fixes 4.5
colemanw [Mon, 1 Sep 2014 13:42:37 +0000 (14:42 +0100)]
Merge pull request #4013 from colemanw/CRM-15215
CRM-15215 - Fix api address validation
Coleman Watts [Mon, 1 Sep 2014 12:50:06 +0000 (13:50 +0100)]
CRM-15215 - Fix api address validation
Pradeep Nayak [Mon, 1 Sep 2014 10:51:39 +0000 (16:21 +0530)]
-- CRM-15206, fixed display of line item on edit contribution form
----------------------------------------
* CRM-15206: Edit Contribution form for Membership shows wrong line item
https://issues.civicrm.org/jira/browse/CRM-15206
Eileen McNaughton [Mon, 1 Sep 2014 04:21:31 +0000 (16:21 +1200)]
CRM-15213 fix spelling of renewal
Eileen McNaughton [Mon, 1 Sep 2014 02:18:11 +0000 (14:18 +1200)]
CRM-15210 fix fatal on merge exports of non primary addresses
The relationship check is preventing the fields from being transformed
to the correct field names in contacts not-to-be-merged
The possibility of the object not existing is adequately handled further down in the
function. The check was added during svn-days but after 4.2.4
I no longer seem to be able to access what commit introduced it
Chris Burgess [Mon, 1 Sep 2014 01:39:15 +0000 (13:39 +1200)]
Fix CRM-13113. Do not try to foreach() an empty array.
colemanw [Sun, 31 Aug 2014 10:55:07 +0000 (11:55 +0100)]
Merge pull request #4006 from colemanw/crmurl
Fix edge-case handling in CRM.url
Coleman Watts [Sun, 31 Aug 2014 10:33:35 +0000 (11:33 +0100)]
Fix edge-case handling in CRM.url - CLEAR YOUR CACHES FOLKS
This fixes potential collisions between placeholder strings and the site's url,
such as "init" and "placeholder".
colemanw [Sun, 31 Aug 2014 09:21:21 +0000 (10:21 +0100)]
Merge pull request #4005 from civicrm/4.5
Partially revert
5dac229eb87
Coleman Watts [Sun, 31 Aug 2014 09:14:15 +0000 (10:14 +0100)]
Partially revert
5dac229eb87
colemanw [Sun, 31 Aug 2014 09:01:55 +0000 (10:01 +0100)]
Merge pull request #4003 from civicrm/4.5
Merge branch 4.5 into master
colemanw [Sun, 31 Aug 2014 09:01:26 +0000 (10:01 +0100)]
Merge pull request #4004 from civicrm/4.4
Merge branch 4.4 into 4.5
Tim Otten [Sun, 31 Aug 2014 00:37:25 +0000 (17:37 -0700)]
Merge pull request #3997 from totten/4.5-gencode-tmpdir
GenCode - Create fewer tempdirs, and create them more securely
Dave Greenberg [Sun, 31 Aug 2014 00:07:33 +0000 (17:07 -0700)]
Merge pull request #4002 from davecivicrm/CRM-15197a
CRM-15197 - Additional Pledge test fixes.
Dave Greenberg [Sun, 31 Aug 2014 00:06:56 +0000 (17:06 -0700)]
CRM-15197 - Additional Pledge test fixes.
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
Dave Greenberg [Sun, 31 Aug 2014 00:02:34 +0000 (17:02 -0700)]
CRM-15197 - Additional Pledge test fixes.
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
Dave Greenberg [Sat, 30 Aug 2014 23:37:12 +0000 (16:37 -0700)]
Merge pull request #4000 from davecivicrm/CRM-15197a
CRM-15197 - Pledge test fixes: disable pop-ups and fix link text for Rec...
Dave Greenberg [Sat, 30 Aug 2014 23:35:31 +0000 (16:35 -0700)]
CRM-15197 - Pledge test fixes: disable pop-ups and fix link text for Record Payment since it was changed in 4.5.
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
Dave Greenberg [Sat, 30 Aug 2014 17:18:57 +0000 (10:18 -0700)]
Merge pull request #3883 from eileenmcnaughton/CRM-14398
CRM-14398 fix campaign in exports
Dave Greenberg [Sat, 30 Aug 2014 17:02:21 +0000 (10:02 -0700)]
Merge pull request #3994 from lcdservices/CRM-15201
CRM-15201 fix case get related contacts query
Monish Deb [Sat, 30 Aug 2014 15:17:48 +0000 (20:47 +0530)]
Merge pull request #3998 from monishdeb/45-webtest-fix
4.5 Webtests fixes
monishdeb [Sat, 30 Aug 2014 15:16:07 +0000 (20:46 +0530)]
4.5 Webtests fixes
Tim Otten [Sat, 30 Aug 2014 03:27:24 +0000 (20:27 -0700)]
CRM_Core_CodeGen_Util_Smarty - Only generate one instance of Smarty (with one temp dir)
Tim Otten [Sat, 30 Aug 2014 03:08:29 +0000 (20:08 -0700)]
CRM_Core_CodeGen_Util_File - Better tempdir creation
Dave Greenberg [Fri, 29 Aug 2014 20:45:05 +0000 (13:45 -0700)]
Merge pull request #3993 from colemanw/CRM-15058
CRM-15058 - Cleanup and js bug fixes in ScheduleReminder forms
Coleman Watts [Fri, 29 Aug 2014 16:14:15 +0000 (17:14 +0100)]
CRM-15058 - Remove unneeded code
Coleman Watts [Fri, 29 Aug 2014 15:38:03 +0000 (16:38 +0100)]
CRM-15058 - Cleanup and js bug fixes in ScheduleReminder forms
Brian Shaughnessy [Fri, 29 Aug 2014 16:10:47 +0000 (12:10 -0400)]
CRM-15201 fix case get related contacts query
Eileen McNaughton [Fri, 29 Aug 2014 04:55:11 +0000 (16:55 +1200)]
CRM-14398 ... export issues
Dave Greenberg [Thu, 28 Aug 2014 23:08:28 +0000 (16:08 -0700)]
Merge pull request #3991 from colemanw/CRM-13966
CRM-13966 - Improve event selection in reports
Dave Greenberg [Thu, 28 Aug 2014 22:35:08 +0000 (15:35 -0700)]
Merge pull request #3990 from davecivicrm/CRM-15158
CRM-15158 - Fix handling of payments in Refund workflows.
Tim Otten [Thu, 28 Aug 2014 21:19:24 +0000 (14:19 -0700)]
Merge pull request #3983 from totten/4.5-memblock-err
api_v3_SyntaxConformanceTest - Work-around problem with MembershipBlock
Coleman Watts [Thu, 28 Aug 2014 20:50:38 +0000 (21:50 +0100)]
CRM-13966 - Improve event selection in reports
colemanw [Thu, 28 Aug 2014 20:59:36 +0000 (21:59 +0100)]
Merge pull request #3992 from colemanw/Prevent
Prevent double confirm box when deleting attachments
Coleman Watts [Thu, 28 Aug 2014 20:59:24 +0000 (21:59 +0100)]
Prevent double confirm box when deleting attachments
Dave Greenberg [Thu, 28 Aug 2014 20:14:49 +0000 (13:14 -0700)]
CRM-15158 - Fix handling of payments in Refund workflows.
----------------------------------------
* CRM-15158:
https://issues.civicrm.org/jira/browse/CRM-15158
Dave Greenberg [Thu, 28 Aug 2014 18:48:38 +0000 (11:48 -0700)]
Merge pull request #3989 from colemanw/CRM-15198
CRM-15198 - Fix error messages when unable to delete financial type
Coleman Watts [Thu, 28 Aug 2014 16:55:13 +0000 (17:55 +0100)]
Fix strings and messages
Coleman Watts [Thu, 28 Aug 2014 16:30:04 +0000 (17:30 +0100)]
CRM-15198 - Fix error messages when unable to delete financial type
colemanw [Thu, 28 Aug 2014 15:54:19 +0000 (16:54 +0100)]
Merge pull request #3987 from colemanw/menuHeight
More accurate dialog size calculations
Coleman Watts [Thu, 28 Aug 2014 15:52:34 +0000 (16:52 +0100)]
More accurate dialog size calculations
Coleman Watts [Thu, 28 Aug 2014 15:19:08 +0000 (16:19 +0100)]
Event participant form code cleanup
colemanw [Thu, 28 Aug 2014 14:50:13 +0000 (15:50 +0100)]
Merge pull request #3986 from colemanw/String
String fixes
Coleman Watts [Thu, 28 Aug 2014 14:48:55 +0000 (15:48 +0100)]
String fixes
colemanw [Thu, 28 Aug 2014 14:36:35 +0000 (15:36 +0100)]
Merge pull request #3972 from colemanw/CRM-15193
CRM-15193 - Support front/back end modes in CRM.url
Coleman Watts [Thu, 28 Aug 2014 13:38:34 +0000 (14:38 +0100)]
CRM-15193 - Ensure profile create links go to the backend
Coleman Watts [Wed, 27 Aug 2014 22:33:29 +0000 (23:33 +0100)]
Reset cacheCode when flushing dynamic resources
Coleman Watts [Wed, 27 Aug 2014 22:22:50 +0000 (23:22 +0100)]
Add cacheCode to dynamic resource urls
Coleman Watts [Wed, 27 Aug 2014 22:06:34 +0000 (23:06 +0100)]
CRM-15193 - Support front/back end modes in CRM.url
Kurund Jalmi [Thu, 28 Aug 2014 13:31:10 +0000 (19:01 +0530)]
Merge pull request #3985 from jitendrapurohit/Webtest-4.5.0
Webtest Fix 4.5
Jitendra Purohit [Thu, 28 Aug 2014 13:24:00 +0000 (18:54 +0530)]
Webtest Fix 4.5
CiviCRM [Thu, 28 Aug 2014 12:39:09 +0000 (18:09 +0530)]
CRM-15171: fix variables in Register.php
Coleman Watts [Thu, 28 Aug 2014 11:35:37 +0000 (12:35 +0100)]
Additional check to see if profileCreate links are empty
Tim Otten [Thu, 28 Aug 2014 07:42:10 +0000 (00:42 -0700)]
Merge pull request #3981 from totten/4.5-log-error
CRM_Core_ErrorTest - Fix local failiure (observed in OS X 10.7, MAMP 2.x)
Yashodha Chaku [Thu, 28 Aug 2014 06:47:13 +0000 (12:17 +0530)]
Merge pull request #3982 from yashodha/HR-402
HR-402: fix for notices on case status
Tim Otten [Thu, 28 Aug 2014 06:32:51 +0000 (23:32 -0700)]
api_v3_SyntaxConformanceTest - Work-around problem with MembershipBlock
Tim Otten [Thu, 28 Aug 2014 06:11:09 +0000 (23:11 -0700)]
Merge pull request #3980 from totten/4.5-component-tests
CRM_Core_BAO_SettingTest - Fix setting leakage which breaks CRM_Core_BAO_SettingTest
CiviCRM [Thu, 28 Aug 2014 05:54:05 +0000 (11:24 +0530)]
HR-402: fix for notices on case status
Tim Otten [Thu, 28 Aug 2014 05:18:52 +0000 (22:18 -0700)]
CRM_Core_ErrorTest - Fix local failiure (observed in OS X 10.7, MAMP 2.x)
Tim Otten [Thu, 28 Aug 2014 05:20:56 +0000 (22:20 -0700)]
Merge pull request #3979 from eileenmcnaughton/CRM-15196
CRM-15196 mysql 5.6 is too strict on altering columns which have fks
projects / civicrm-core.git / log