colemanw [Fri, 11 Apr 2014 21:27:54 +0000 (17:27 -0400)]
Merge pull request #2880 from colemanw/master
Update action-menu styles
Coleman Watts [Fri, 11 Apr 2014 21:26:40 +0000 (17:26 -0400)]
Update action-menu styles
colemanw [Fri, 11 Apr 2014 19:44:26 +0000 (15:44 -0400)]
Merge pull request #2879 from colemanw/master
TabHeader.js - extend to support HR-320
Coleman Watts [Fri, 11 Apr 2014 19:43:31 +0000 (15:43 -0400)]
TabHeader.js - extend to support HR-320
Kurund Jalmi [Fri, 11 Apr 2014 15:42:28 +0000 (08:42 -0700)]
Merge pull request #2877 from jitendrapurohit/Priceset_Webtest
Web Test Fix
colemanw [Fri, 11 Apr 2014 15:09:55 +0000 (11:09 -0400)]
Merge pull request #2872 from PoonamNalawade/HR_321
--HR-321 Simplify case-activity forms and add case_status as a url param
colemanw [Fri, 11 Apr 2014 15:08:40 +0000 (11:08 -0400)]
Merge pull request #2878 from colemanw/js
JS updates to support HR-337
jitendrapurohit [Fri, 11 Apr 2014 12:20:49 +0000 (17:50 +0530)]
Web Test Fix
Coleman Watts [Fri, 11 Apr 2014 01:22:17 +0000 (21:22 -0400)]
JS updates to support HR-337
Dave Greenberg [Thu, 10 Apr 2014 20:38:44 +0000 (13:38 -0700)]
Merge pull request #2875 from davecivicrm/CRM-14451
CRM-14451 - remove undefined / un-used variable.
Dave Greenberg [Thu, 10 Apr 2014 20:37:16 +0000 (13:37 -0700)]
CRM-14451 - remove undefined / un-used variable.
----------------------------------------
* CRM-14451:
https://issues.civicrm.org/jira/browse/CRM-14451
Dave Greenberg [Thu, 10 Apr 2014 19:41:30 +0000 (12:41 -0700)]
Merge pull request #2870 from kurund/CRM-14352
fixes for duplicate relationship error, CRM-14352
Kurund Jalmi [Thu, 10 Apr 2014 19:35:31 +0000 (12:35 -0700)]
Merge pull request #2873 from jitendrapurohit/PriceSet_Webtests
Webtest Fix
dlobo [Thu, 10 Apr 2014 17:33:11 +0000 (10:33 -0700)]
Merge pull request #2858 from totten/4.4-wp-breadcrumb-cacheclear
CRM-14439 - Fix WP breadcrumbs by forcibly pre-computing them with "wp-admin/admin.php"
dlobo [Thu, 10 Apr 2014 17:32:35 +0000 (10:32 -0700)]
Merge pull request #2859 from totten/4.4-wp-breadcrumb-forceBackend
CRM-14439 - Fix WP breadcrumbs by setting forceBackend=1 and consistently respecting that option
dlobo [Thu, 10 Apr 2014 17:26:39 +0000 (10:26 -0700)]
Merge pull request #2833 from lcdservices/CRM-14208b
CRM-14208 additional includes for J3.2.1+
jitendrapurohit [Thu, 10 Apr 2014 14:27:27 +0000 (19:57 +0530)]
Webtest Fix
Poonam [Thu, 10 Apr 2014 13:58:30 +0000 (19:28 +0530)]
--HR-321 Simplify case-activity forms and add case_status as a url param
Pratik Joshi [Thu, 10 Apr 2014 13:24:22 +0000 (18:54 +0530)]
CRM-13973-comment : handled 'Refunded' status logic during Status edit of a contribution
Pratik Joshi [Thu, 10 Apr 2014 12:34:00 +0000 (18:04 +0530)]
CRM-13973-comment : intial financial_item entry of multiple entires being recorded during 'cancelled' status update on contribution (linked to participant) has amount = total_amount (which is incorrect)
Pratik Joshi [Wed, 9 Apr 2014 10:17:40 +0000 (15:47 +0530)]
CRM-13973 : #comment-59275 fix
Divya Jose [Thu, 10 Apr 2014 06:46:35 +0000 (12:16 +0530)]
--HR-329 Fix datatable DOM collision
kurund [Thu, 10 Apr 2014 04:31:36 +0000 (21:31 -0700)]
fixes for duplicate relationship error, CRM-14352
----------------------------------------
* CRM-14352: Fatal error: Relationship already exists when contact with duplicate relationships registers for an event
https://issues.civicrm.org/jira/browse/CRM-14352
Kurund Jalmi [Wed, 9 Apr 2014 22:03:51 +0000 (15:03 -0700)]
Merge pull request #2863 from jitendrapurohit/AddParticipationTest_Fix
Add Participation test Fix
kurund [Wed, 9 Apr 2014 21:45:51 +0000 (14:45 -0700)]
CRM-14438 and CRM-13996 fix to populate prev/next cache when sorting in advanced search using profile search view
----------------------------------------
* CRM-14438: Can't select contact records from custom search profile when sorted by Current Employer
https://issues.civicrm.org/jira/browse/CRM-14438
* CRM-13996: Advanced Search; Sorting of Results displayed in a custom profile fails and Advanced Search must be reset
https://issues.civicrm.org/jira/browse/CRM-13996
Tim Otten [Wed, 9 Apr 2014 20:39:11 +0000 (13:39 -0700)]
Merge pull request #2868 from totten/master-revert-tz
Revert "CRM-14423 - Call setMySQLTimeZone as part of Civi's bootstrap"
Tim Otten [Wed, 9 Apr 2014 20:38:14 +0000 (13:38 -0700)]
Revert "CRM-14423 - Call setMySQLTimeZone as part of Civi's bootstrap"
This reverts commit
309cd470a1c69b44b2d4c0651b62950a7223ddcc.
Dave Greenberg [Wed, 9 Apr 2014 20:36:57 +0000 (13:36 -0700)]
Merge pull request #2867 from davecivicrm/CRM-14450
CRM-14450 - fix notice on additional participants form.
Dave Greenberg [Wed, 9 Apr 2014 20:34:57 +0000 (13:34 -0700)]
CRM-14450 - fix notice on additional participants form.
----------------------------------------
* CRM-14450:
https://issues.civicrm.org/jira/browse/CRM-14450
Tim Otten [Wed, 9 Apr 2014 19:55:48 +0000 (12:55 -0700)]
Merge pull request #2821 from totten/master-timezone
CRM-14423 - Call setMySQLTimeZone during bootstrap on all CMS's
Kurund Jalmi [Wed, 9 Apr 2014 19:07:51 +0000 (12:07 -0700)]
Merge pull request #2866 from davecivicrm/CRM-14442
CRM-14442 - prevent presence of Direct Debit (payment_type=2) payment pr...
Dave Greenberg [Wed, 9 Apr 2014 19:05:27 +0000 (12:05 -0700)]
CRM-14442 - prevent presence of Direct Debit (payment_type=2) payment processors from breaking the back-office Submit Credit Card Contribution form.
----------------------------------------
* CRM-14442:
https://issues.civicrm.org/jira/browse/CRM-14442
monishdeb [Wed, 9 Apr 2014 15:25:21 +0000 (20:55 +0530)]
CRM-13283 fix - Number of terms does not update the end date of membership
https://issues.civicrm.org/jira/browse/CRM-13283
jitendrapurohit [Wed, 9 Apr 2014 15:03:56 +0000 (20:33 +0530)]
Add Participation test Fix
pratik-joshi [Wed, 9 Apr 2014 06:09:19 +0000 (11:39 +0530)]
Merge pull request #2832 from jitendrapurohit/Web_Tests_Fixes
Web Tests Fixes
Eileen McNaughton [Wed, 9 Apr 2014 05:22:43 +0000 (17:22 +1200)]
CRM-14446 contact api.getfields declare birth_date & deceased_date high low filters so they will accept strtotime strings
----------------------------------------
* CRM-14446:
https://issues.civicrm.org/jira/browse/CRM-14446
Eileen [Wed, 9 Apr 2014 03:57:51 +0000 (03:57 +0000)]
CRM-14446 contact.get api tests + fix on date filters
----------------------------------------
* CRM-14446: Contact.get api - birth_date & deceased_date fixes
https://issues.civicrm.org/jira/browse/CRM-14446
Kurund Jalmi [Wed, 9 Apr 2014 04:04:14 +0000 (21:04 -0700)]
Merge pull request #2843 from kurund/CRM-14427
CRM-14427
Tim Otten [Wed, 9 Apr 2014 03:03:40 +0000 (20:03 -0700)]
CRM_Utils_System_WordPress::url - Simplify deep if/else/string-concatenation. Fix forceBackend.
Tim Otten [Wed, 9 Apr 2014 00:41:18 +0000 (17:41 -0700)]
CRM_Utils_System_WordPress::url - Change code-branch for case "!isset($path)&&!isset($query)"
Tim Otten [Tue, 8 Apr 2014 23:46:10 +0000 (16:46 -0700)]
CRM_Utils_System_WordPress::url - Change code-branch for caes "isset($path)&&isset($query)"
In the other usages of $script and $base, there's a decision to use $script XOR $base as the effective
base-URL. However, in this branch, the values are concatenated to form the effective base-URL -- which
shouldn't produce a valid base-URL. (Note: In this context, we're evaluating conditons of isset($path) and
isset($query) which should have no bearing on the validity of $script or $base as a base-URL.)
Brian Shaughnessy [Wed, 9 Apr 2014 01:34:08 +0000 (21:34 -0400)]
CRM-14208 move joomlaBase outside of condition clause
Dave Greenberg [Wed, 9 Apr 2014 01:05:59 +0000 (18:05 -0700)]
Merge pull request #2835 from lcdservices/CRM-14334
CRM-14334 merge records: allow empty value to overwrite existing value
Tim Otten [Tue, 8 Apr 2014 23:23:00 +0000 (16:23 -0700)]
CRM-14439 - CRM_Core_Invoke::rebuildMenuAndCaches - Change order
Currently, CRM_Core_Menu::store() truncates "civicrm_menu" and then refills
it; then, CRM_Core_Config::clearCaches (by-way-of clearDBCache) truncates
"civicrm_menu" without refilling. This seems pointless. (For CRM-14439,
this has the effect of producing an empty menu table after running setup.sh
-- so the table is eventually filled at some uncontrolled future point.)
The evident intent of "rebuildMenuAndCaches" is to truncate and then refill
the table, so this patch does that.
----------------------------------------
* CRM-14439: WP demo - Access denied when visiting breadcrumb links from field listing
https://issues.civicrm.org/jira/browse/CRM-14439
Tim Otten [Tue, 8 Apr 2014 23:21:32 +0000 (16:21 -0700)]
CRM-14439 - CRM_Core_Menu - For breadcrumbs, set forceBackend=1
----------------------------------------
* CRM-14439: WP demo - Access denied when visiting breadcrumb links from field listing
https://issues.civicrm.org/jira/browse/CRM-14439
dlobo [Tue, 8 Apr 2014 20:53:55 +0000 (13:53 -0700)]
Merge pull request #2687 from giant-rabbit/event_info_custom_validation
CRM-14310 - Fix issue with custom validation not firing on Event Info an...
Dave Greenberg [Tue, 8 Apr 2014 20:43:58 +0000 (13:43 -0700)]
Merge pull request #2857 from davecivicrm/CRM-13973a
CRM-13973 - Fix bugs in Change Selections form - admin price fields not ...
Dave Greenberg [Tue, 8 Apr 2014 20:42:46 +0000 (13:42 -0700)]
CRM-13973 - Fix bugs in Change Selections form - admin price fields not displayed and protected property accessed causing fatal.
----------------------------------------
* CRM-13973:
https://issues.civicrm.org/jira/browse/CRM-13973
Dave Greenberg [Tue, 8 Apr 2014 20:20:16 +0000 (13:20 -0700)]
Merge pull request #2855 from mlutfy/4.4-crm14444
CRM-14444: templates/CRM/Report/Form/Layout/Table.tpl: right-align report cells that are T_FLOAT.
colemanw [Tue, 8 Apr 2014 20:02:36 +0000 (16:02 -0400)]
Merge pull request #2856 from colemanw/js
Centralize wysiwyg code for livepage
Coleman Watts [Tue, 8 Apr 2014 20:01:58 +0000 (16:01 -0400)]
Centralize wysiwyg code for livepage
Mathieu Lutfy [Tue, 8 Apr 2014 19:57:54 +0000 (15:57 -0400)]
CRM-14444: templates/CRM/Report/Form/Layout/Table.tpl: right-align report cells that are T_FLOAT.
colemanw [Tue, 8 Apr 2014 19:19:17 +0000 (15:19 -0400)]
Merge pull request #2853 from colemanw/js
profileBuilder work
dlobo [Tue, 8 Apr 2014 19:15:45 +0000 (12:15 -0700)]
Merge pull request #2854 from dlobo/CRM-14390
CRM-14390 - Inherit CMS language don't work in WordPress
Donald A. Lobo [Tue, 8 Apr 2014 19:14:16 +0000 (12:14 -0700)]
CRM-14390 - Inherit CMS language don't work in WordPress
https://issues.civicrm.org/jira/browse/CRM-14390
Dave Greenberg [Tue, 8 Apr 2014 18:30:38 +0000 (11:30 -0700)]
Merge pull request #2846 from hhermsen/patch-1
Duplicate code
colemanw [Tue, 8 Apr 2014 18:08:28 +0000 (14:08 -0400)]
Merge pull request #2847 from monishdeb/HR-331
HR-331- TabHeader fix
Kurund Jalmi [Tue, 8 Apr 2014 17:20:29 +0000 (10:20 -0700)]
Merge pull request #2851 from kurund/CRM-14393
fixes for CRM-14393
kurund [Tue, 8 Apr 2014 17:19:35 +0000 (10:19 -0700)]
fixes for CRM-14393
----------------------------------------
* CRM-14393: State not showing in advanced search
https://issues.civicrm.org/jira/browse/CRM-14393
Dave Greenberg [Tue, 8 Apr 2014 16:50:28 +0000 (09:50 -0700)]
Merge pull request #2848 from eileenmcnaughton/CRM-14389
CRM-14389 membership api - add test for fix + alter to 'correct fix'
Kurund Jalmi [Tue, 8 Apr 2014 15:02:07 +0000 (08:02 -0700)]
Merge pull request #2850 from jitendrapurohit/WebFixes
Web tests Fixes
Coleman Watts [Tue, 8 Apr 2014 14:44:17 +0000 (10:44 -0400)]
ProfileBuilder - general updates for 4.5
Coleman Watts [Tue, 8 Apr 2014 14:43:59 +0000 (10:43 -0400)]
ProfileBuilder - fix undefined var error
jitendrapurohit [Tue, 8 Apr 2014 14:02:47 +0000 (19:32 +0530)]
Web tests Fixes
Eileen [Tue, 8 Apr 2014 12:17:34 +0000 (12:17 +0000)]
CRM-14389 membership api - add test for fix
----------------------------------------
* CRM-14389: Get memberships api ignores membership_type_id if contact_id is present
https://issues.civicrm.org/jira/browse/CRM-14389
monishdeb [Tue, 8 Apr 2014 10:15:05 +0000 (15:45 +0530)]
HR-331, TabHeader fix
Harm Hermsen [Tue, 8 Apr 2014 09:52:57 +0000 (11:52 +0200)]
Duplicate code
elcapo [Tue, 8 Apr 2014 07:48:59 +0000 (09:48 +0200)]
Create new API entity: ActivityContact (#CRM-14414)
Tim Otten [Tue, 8 Apr 2014 05:11:11 +0000 (22:11 -0700)]
Merge pull request #2844 from totten/4.4-handlePaymentNotification
CRM-14396 - add module extension support to handlePaymentNotification
Eileen McNaughton [Thu, 27 Mar 2014 00:38:14 +0000 (13:38 +1300)]
CRM-14396 - add module extension support to handlePaymentNotification
kurund [Tue, 8 Apr 2014 00:43:27 +0000 (17:43 -0700)]
notice fixes
kurund [Tue, 8 Apr 2014 00:14:16 +0000 (17:14 -0700)]
fix for CRM-14427
----------------------------------------
* CRM-14427: PCP account creation fails if contact already exists
https://issues.civicrm.org/jira/browse/CRM-14427
kurund [Mon, 7 Apr 2014 23:19:50 +0000 (16:19 -0700)]
notice fixes
Tim Otten [Mon, 7 Apr 2014 22:34:43 +0000 (15:34 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-07-15-32-51
Conflicts:
api/v3/Membership.php
Kurund Jalmi [Mon, 7 Apr 2014 22:30:10 +0000 (15:30 -0700)]
Merge pull request #2840 from kurund/git-hook-fixes
commit hook fixes
kurund [Mon, 7 Apr 2014 22:26:11 +0000 (15:26 -0700)]
commit hook fixes
Tim Otten [Mon, 7 Apr 2014 22:24:29 +0000 (15:24 -0700)]
Merge pull request #2828 from totten/master-api-kernel
CRM-14370 - Backport API Kernel to 4.5
colemanw [Mon, 7 Apr 2014 22:13:29 +0000 (18:13 -0400)]
Merge pull request #2838 from eileenmcnaughton/CRM-14419
Crm 14220 & CRM-14419 api enotice fix & extra param + e-notice
Dave Greenberg [Mon, 7 Apr 2014 21:18:45 +0000 (14:18 -0700)]
Merge pull request #2839 from davecivicrm/CRM-13891testFixes
CRM-13891 - test fixes, replace hard-coded IDs with name lookups and acc...
dlobo [Mon, 7 Apr 2014 21:16:33 +0000 (14:16 -0700)]
Merge pull request #2743 from eileenmcnaughton/CRM-14319-mini-fix
CRM-14319 - alter job api to not limit scheduled reminders
Eileen McNaughton [Mon, 7 Apr 2014 05:49:42 +0000 (17:49 +1200)]
E-notice fix, next_sched_contribution
Field was renamed to reflect in built handling around suffix '_date' but this instance missed
Eileen McNaughton [Thu, 3 Apr 2014 10:39:21 +0000 (23:39 +1300)]
CRM-14420 - api contribution.completetransaction should accept 'trxn_id' as a param
Eileen McNaughton [Thu, 3 Apr 2014 08:13:06 +0000 (21:13 +1300)]
CRM-14419 - e-notice on activity.getcount when contact_id is not passed in
dlobo [Mon, 7 Apr 2014 21:02:01 +0000 (14:02 -0700)]
Merge pull request #2805 from rnao/CRM-14389
CRM-14389 - CiviMember API - Fixes a membership get API regression that ...
Dave Greenberg [Mon, 7 Apr 2014 20:57:55 +0000 (13:57 -0700)]
CRM-13891 - test fixes, replace hard-coded IDs with name lookups and accommodate option group with more than 10 options.
----------------------------------------
* CRM-13891:
http://issues.civicrm.org/jira/browse/CRM-13891
Brian Shaughnessy [Mon, 7 Apr 2014 19:11:49 +0000 (15:11 -0400)]
CRM-14334 merge records: allow empty value to overwrite existing value
Coleman Watts [Mon, 7 Apr 2014 18:23:08 +0000 (14:23 -0400)]
CoreResources - Look fo non-mini js file when in debug mode
Dave Greenberg [Mon, 7 Apr 2014 16:17:47 +0000 (09:17 -0700)]
Merge pull request #2830 from eileenmcnaughton/patch-1
E-notice fix, next_sched_contribution
Brian Shaughnessy [Mon, 7 Apr 2014 14:31:53 +0000 (10:31 -0400)]
CRM-14208 additional includes for J3.2.1+
jitendrapurohit [Mon, 7 Apr 2014 14:21:33 +0000 (19:51 +0530)]
Web Test Fixes
Eileen McNaughton [Mon, 7 Apr 2014 05:49:42 +0000 (17:49 +1200)]
E-notice fix, next_sched_contribution
Field was renamed to reflect in built handling around suffix '_date' but this instance missed
Dave Greenberg [Mon, 7 Apr 2014 02:35:31 +0000 (19:35 -0700)]
Merge pull request #2823 from monishdeb/CRM-13833
CRM-13833 Soft-Credit Import fix
Kurund Jalmi [Mon, 7 Apr 2014 02:09:07 +0000 (19:09 -0700)]
Merge pull request #2822 from jitendrapurohit/WebTestsFix
Web Tests Fix
Tim Otten [Sun, 6 Apr 2014 09:24:08 +0000 (02:24 -0700)]
CRM-14370 - Extract ChainSubscriber; move helper function
This allows us to change the timing of chained invocation, positioning the
it after WrapperAdapter but before TransactionSubscriber (like it was
originally). This fixes a regression in
api_v3_OptionGroupTest::testGetOptionCreateSuccess
Tim Otten [Sun, 6 Apr 2014 09:03:55 +0000 (02:03 -0700)]
CRM-14370 - Fix incorrect type reference and other warnings.
This had caused a regressino in api_v3_OptionGroupTest::testGetOptionCreateFailOnDuplicate
Tim Otten [Wed, 2 Apr 2014 21:46:08 +0000 (14:46 -0700)]
api_v3_UtilsTest - Fix regression
Tim Otten [Fri, 28 Mar 2014 00:23:16 +0000 (17:23 -0700)]
CRM_Core_BAO_Setting - Generate better errors
Tim Otten [Wed, 2 Apr 2014 04:40:29 +0000 (21:40 -0700)]
Add Civi_AllTests
Tim Otten [Sat, 29 Mar 2014 01:34:22 +0000 (18:34 -0700)]
CRM-14370 - TransactionSubscriber - Be more defensive
Tim Otten [Fri, 28 Mar 2014 23:35:26 +0000 (16:35 -0700)]
CRM-14370 - API Kernel - Add test for event lifecycle