Tim Otten [Fri, 21 Mar 2014 23:28:12 +0000 (16:28 -0700)]
CRM-14370 - API Kernel - DRY exception-handling; fix inconsistencies
Tim Otten [Fri, 21 Mar 2014 05:55:35 +0000 (22:55 -0700)]
CRM-14370 - API Kernel - Extract XDebugSubscriber
Tim Otten [Fri, 21 Mar 2014 05:44:47 +0000 (22:44 -0700)]
CRM-14370 - API Kernel - Extract TransactionSubscriber
Tim Otten [Fri, 21 Mar 2014 05:34:30 +0000 (22:34 -0700)]
CRM-14370 - API Kernel - Dispatch events
Tim Otten [Fri, 21 Mar 2014 04:24:41 +0000 (21:24 -0700)]
CRM-14370 - civicrm_api, CiviUnitTestCase - Move main logic to Civi\API\Kernel
Also: Allow test-classes to use different API handlers (eg $apiKernel->run() instead of civicrm_api())
Conflicts:
Civi/Core/Container.php
Tim Otten [Sun, 6 Apr 2014 04:10:55 +0000 (21:10 -0700)]
CRM-14370 - Backport container and classloader (from doctrine => master)
Tim Otten [Mon, 24 Mar 2014 23:24:40 +0000 (16:24 -0700)]
SyntaxConformanceTest - Fix for entities which don't support delete
Tim Otten [Fri, 4 Apr 2014 07:48:52 +0000 (00:48 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-48-43
Tim Otten [Fri, 4 Apr 2014 07:48:17 +0000 (00:48 -0700)]
Merge pull request #2820 from totten/4.4-tz-opt
CRM-14423 - CiviUnitTestCase - Only run env checks, not security checks, during unit-tests.
Tim Otten [Fri, 4 Apr 2014 07:39:03 +0000 (00:39 -0700)]
CRM-14423 - CiviUnitTestCase - Only run env checks, not security checks, during unit-tests.
The security checks are more I/O intensive.
Tim Otten [Fri, 4 Apr 2014 07:09:06 +0000 (00:09 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-08-28
Conflicts:
CRM/Core/Page.php
Tim Otten [Fri, 4 Apr 2014 07:08:17 +0000 (00:08 -0700)]
Merge pull request #2819 from totten/4.4-tz-alert
CRM-14423 - Alert admins/developers if env is misconfigured
Tim Otten [Fri, 4 Apr 2014 07:07:02 +0000 (00:07 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-03-23-46-36
Conflicts:
CRM/Activity/Page/AJAX.php
CRM/Member/Form/Membership.php
js/rest.js
templates/CRM/Campaign/Form/Task/Interview.tpl
Tim Otten [Fri, 4 Apr 2014 05:16:10 +0000 (22:16 -0700)]
CRM-14423 - Run env checks before executing tests
Tim Otten [Fri, 4 Apr 2014 04:37:58 +0000 (21:37 -0700)]
CRM-14423 - CRM_Utils_Check_Env - Add check for other environmental configuration issues
Tim Otten [Fri, 4 Apr 2014 04:36:48 +0000 (21:36 -0700)]
CRM-14423 - Extract class CRM_Utils_Check from CRM_Utils_Check_Security
Dave Greenberg [Fri, 4 Apr 2014 03:15:17 +0000 (20:15 -0700)]
Merge pull request #2818 from davecivicrm/CRM-14417
CRM-14417 - Remove all non-relevant statuses from the contribution statu...
Dave Greenberg [Fri, 4 Apr 2014 03:13:58 +0000 (20:13 -0700)]
CRM-14417 - Remove all non-relevant statuses from the contribution status drop-down when creating a new event registration.
----------------------------------------
* CRM-14417:
http://issues.civicrm.org/jira/browse/CRM-14417
colemanw [Thu, 3 Apr 2014 23:16:04 +0000 (19:16 -0400)]
Merge pull request #2817 from colemanw/custom
HR-322 - Ensure customFieldOptions hook is always called for custom fields
Coleman Watts [Thu, 3 Apr 2014 23:13:37 +0000 (19:13 -0400)]
HR-322 - Ensure customFieldOptions hook is always called for custom fields
Tim Otten [Thu, 3 Apr 2014 21:44:34 +0000 (14:44 -0700)]
Merge pull request #2816 from totten/master-grouporgtest
api_v3_GroupOrganizationTest - Fix error
Tim Otten [Thu, 3 Apr 2014 21:42:10 +0000 (14:42 -0700)]
api_v3_GroupOrganizationTest - Fix error
Was producing error because expression
($result['values'][0]['organization_id']) was invalid. The test content
didn't meet the description/name and seemed weird.
Coleman Watts [Thu, 3 Apr 2014 21:03:13 +0000 (17:03 -0400)]
CRM-14288 - Remove obsolete custom field hack
colemanw [Thu, 3 Apr 2014 19:41:16 +0000 (15:41 -0400)]
Merge pull request #2793 from monishdeb/HR-322
HR-322, extend customFieldOptions hook to support Select options buildup with no associated option group
colemanw [Thu, 3 Apr 2014 19:34:35 +0000 (15:34 -0400)]
Merge pull request #2812 from eileenmcnaughton/CRM-14220
Crm 14220 & CRM-14419 api enotice fix & extra param
colemanw [Thu, 3 Apr 2014 19:33:23 +0000 (15:33 -0400)]
Merge pull request #2799 from PoonamNalawade/HR_321
--HR-321 Simplify case-activity forms and add case_status as a url param
Coleman Watts [Thu, 3 Apr 2014 19:31:39 +0000 (15:31 -0400)]
Update comments
colemanw [Thu, 3 Apr 2014 19:16:56 +0000 (15:16 -0400)]
Merge pull request #2815 from colemanw/js
Js popup fixes
Coleman Watts [Thu, 3 Apr 2014 19:11:52 +0000 (15:11 -0400)]
CRM-13863 - Improve buffering of crmPopup events
Coleman Watts [Thu, 3 Apr 2014 19:11:08 +0000 (15:11 -0400)]
Fix js popup bug
colemanw [Thu, 3 Apr 2014 18:04:22 +0000 (14:04 -0400)]
Merge pull request #2814 from jitendrapurohit/Webtest_Fix
Web Test Fix
Dave Greenberg [Thu, 3 Apr 2014 17:40:30 +0000 (10:40 -0700)]
Merge pull request #2784 from mepps/add-phone-to-relationship-report
Added phone number to relationship report
Dave Greenberg [Thu, 3 Apr 2014 17:26:25 +0000 (10:26 -0700)]
Merge pull request #2810 from pratik-joshi/crm-14379-fix
CRM-14379
Dave Greenberg [Thu, 3 Apr 2014 17:18:39 +0000 (10:18 -0700)]
Merge pull request #2811 from pratik-joshi/CRM-14342
CRM-14342 : introduced generalized assignProfiles function to be used in confirm and thank you pages
jitendrapurohit [Thu, 3 Apr 2014 15:02:08 +0000 (20:32 +0530)]
Web Test Fix
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
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
Pratik Joshi [Thu, 3 Apr 2014 11:04:20 +0000 (16:34 +0530)]
CRM-14342 : introduced generalized assignProfiles function to be used in confirm and thank you pages
pratik-joshi [Thu, 3 Apr 2014 06:11:57 +0000 (11:41 +0530)]
Merge pull request #2804 from atif-shaikh/webtest_fixes
Webtest Fix
Poonam [Thu, 3 Apr 2014 06:01:07 +0000 (11:31 +0530)]
--HR-321 Changed label
Poonam [Wed, 2 Apr 2014 06:16:50 +0000 (11:46 +0530)]
--HR-321 Simplify case-activity forms and add case_status as a url param
Pratik Joshi [Thu, 3 Apr 2014 05:42:39 +0000 (11:12 +0530)]
CRM-14379
colemanw [Thu, 3 Apr 2014 01:01:24 +0000 (21:01 -0400)]
Merge pull request #2808 from colemanw/popups
popup/ajax work
Coleman Watts [Wed, 2 Apr 2014 21:33:42 +0000 (17:33 -0400)]
CRM-13966 - Refactor ScheduleReminders tokeninput to select2
Coleman Watts [Wed, 2 Apr 2014 21:32:52 +0000 (17:32 -0400)]
CRM-13966 - Fix gitlist api bug
Coleman Watts [Wed, 2 Apr 2014 19:08:09 +0000 (15:08 -0400)]
CRM-13966 - Refactor activityToCase tokeninput to select2
Coleman Watts [Wed, 2 Apr 2014 18:36:12 +0000 (14:36 -0400)]
CRM-13863 - Add CRM.refreshParent helper
colemanw [Wed, 2 Apr 2014 15:49:47 +0000 (11:49 -0400)]
Merge pull request #2807 from colemanw/popups
CRM-13863 - Fix for save & new
Coleman Watts [Wed, 2 Apr 2014 15:49:13 +0000 (11:49 -0400)]
Fix reference to crmSnippet data
Coleman Watts [Wed, 2 Apr 2014 15:48:50 +0000 (11:48 -0400)]
CRM-13863 - Fix for save & new - force reset of original url
Coleman Watts [Wed, 2 Apr 2014 15:41:13 +0000 (11:41 -0400)]
CRM-13863 - Fix for save & new - buffer the crmPopupFormSuccess event
colemanw [Wed, 2 Apr 2014 15:04:24 +0000 (11:04 -0400)]
Merge pull request #2806 from jitendrapurohit/Web_Test_Fix
Web Test Fix
jitendrapurohit [Wed, 2 Apr 2014 14:48:36 +0000 (20:18 +0530)]
Web Test Fix
Atif Shaikh [Wed, 2 Apr 2014 13:59:02 +0000 (19:29 +0530)]
Webtest Fix
Kurund Jalmi [Wed, 2 Apr 2014 12:24:38 +0000 (17:54 +0530)]
Merge pull request #2802 from atif-shaikh/UpgradeFix
Upgrade Fix from 4.4 to 4.5
Atif Shaikh [Wed, 2 Apr 2014 11:29:32 +0000 (16:59 +0530)]
Upgrade Fix from 4.4 to 4.5
monishdeb [Wed, 2 Apr 2014 10:54:57 +0000 (16:24 +0530)]
HR-322 minor change
Coleman Watts [Tue, 1 Apr 2014 23:50:33 +0000 (19:50 -0400)]
Localize dashboard text
colemanw [Tue, 1 Apr 2014 23:46:23 +0000 (19:46 -0400)]
Merge pull request #2797 from colemanw/master
Move dashboard.css out of packages and fix icon css
Coleman Watts [Tue, 1 Apr 2014 21:52:52 +0000 (17:52 -0400)]
Move dashboard.css out of packages and fix icon css
Dave Greenberg [Tue, 1 Apr 2014 17:38:42 +0000 (10:38 -0700)]
Merge pull request #2781 from monishdeb/CRM-13981
CRM-13981 multilingual fix
Dave Greenberg [Tue, 1 Apr 2014 17:36:42 +0000 (10:36 -0700)]
Merge pull request #2772 from monishdeb/CRM-14377
CRM-14377 fix
colemanw [Tue, 1 Apr 2014 17:10:02 +0000 (13:10 -0400)]
Merge pull request #2795 from jitendrapurohit/APITestHandling
SyntaxConformanceTest handling For Encoding and Decoding
colemanw [Tue, 1 Apr 2014 17:07:48 +0000 (13:07 -0400)]
Merge pull request #2686 from eileenmcnaughton/CRM-14148
CRM-14148 fix half hour timezones for d7
Coleman Watts [Tue, 1 Apr 2014 17:06:57 +0000 (13:06 -0400)]
Merge branch 'rcsheets-docstring-cleanup'
Conflicts:
CRM/Utils/Array.php
Coleman Watts [Tue, 1 Apr 2014 17:04:49 +0000 (13:04 -0400)]
Icon tweak
colemanw [Tue, 1 Apr 2014 16:38:25 +0000 (12:38 -0400)]
Merge pull request #2747 from colemanw/4.4
Backport CRM.api3 to 4.4
colemanw [Tue, 1 Apr 2014 16:37:43 +0000 (12:37 -0400)]
Merge pull request #2791 from eileenmcnaughton/CRM-14399-master
CRM-14399 fix test, add right number of extra params
colemanw [Tue, 1 Apr 2014 16:23:12 +0000 (12:23 -0400)]
Merge pull request #2796 from colemanw/master
Dialog & select2 improvements
Coleman Watts [Tue, 1 Apr 2014 16:21:33 +0000 (12:21 -0400)]
Dialog & select2 improvements
jitendrapurohit [Tue, 1 Apr 2014 14:15:43 +0000 (19:45 +0530)]
SyntaxConformanceTest handling Encoding and Decoding
monishdeb [Tue, 1 Apr 2014 10:38:05 +0000 (16:08 +0530)]
HR-322, extend customFieldOptions hook to support Select options buildup with no associate option group
Eileen McNaughton [Tue, 1 Apr 2014 07:51:13 +0000 (20:51 +1300)]
CRM-14399 fix test, add right number of extra params
Tim Otten [Tue, 1 Apr 2014 02:09:44 +0000 (19:09 -0700)]
Merge pull request #2790 from eileenmcnaughton/CRM-14399-master
CRM-14399 4.5 signature for hook
Eileen McNaughton [Tue, 1 Apr 2014 00:40:35 +0000 (13:40 +1300)]
CRM-14399 4.5 signature for hook (somehow got reverted when I prepared the PR I guess)
Tim Otten [Tue, 1 Apr 2014 00:20:52 +0000 (17:20 -0700)]
Merge pull request #2789 from eileenmcnaughton/CRM-14399-master
CRM-14399 this is probably safer & less like to wind up @colemanw than t...
Eileen McNaughton [Tue, 1 Apr 2014 00:17:50 +0000 (13:17 +1300)]
CRM-14399 this is probably safer & less like to wind up @colemanw than the prev version on this line
Tim Otten [Tue, 1 Apr 2014 00:15:53 +0000 (17:15 -0700)]
Merge pull request #2785 from eileenmcnaughton/CRM-14399-master
CRM-14399 add alterCalculatedMembershipStatus hook
Eileen McNaughton [Tue, 1 Apr 2014 00:12:09 +0000 (13:12 +1300)]
CRM-14399 one more call to getMembershipStatusByDate + update add function call to be more standard
Tim Otten [Mon, 31 Mar 2014 22:33:34 +0000 (15:33 -0700)]
Merge pull request #2787 from totten/master-gencode-escape
GenCode - Apply SQL-escaping to table comments
Tim Otten [Mon, 31 Mar 2014 22:31:27 +0000 (15:31 -0700)]
GenCode - Apply SQL-escaping to table comments
Fix regression stemming from
9e64deca
Eileen McNaughton [Fri, 28 Mar 2014 03:58:49 +0000 (16:58 +1300)]
CRM-14399 add alterCalculatedMembershipStatus hook
Conflicts:
api/v3/MembershipStatus.php
Maggie [Mon, 31 Mar 2014 21:13:23 +0000 (17:13 -0400)]
Added phone number to relationship report
Dave Greenberg [Mon, 31 Mar 2014 16:05:31 +0000 (09:05 -0700)]
Merge pull request #2775 from ErichBSchulz/patch-3
correct record_type_id description
Dave Greenberg [Mon, 31 Mar 2014 15:45:00 +0000 (08:45 -0700)]
Merge pull request #2778 from eileenmcnaughton/message_fix
fix error message to make more sense
monishdeb [Mon, 31 Mar 2014 14:36:10 +0000 (20:06 +0530)]
CRM-13981 multilingual fix
----------------------------------------
* CRM-13981:
http://issues.civicrm.org/jira/browse/CRM-13981
pratik-joshi [Mon, 31 Mar 2014 12:35:17 +0000 (18:05 +0530)]
Merge pull request #2779 from jaapjansma/CRM-14397
fix for CRM-14397
Jaap Jansma [Mon, 31 Mar 2014 08:46:09 +0000 (10:46 +0200)]
fix for CRM-14397
Signed-off-by: Jaap Jansma <info@edeveloper.nl>
Eileen McNaughton [Mon, 31 Mar 2014 04:17:39 +0000 (17:17 +1300)]
fix error message to make more sense
colemanw [Mon, 31 Mar 2014 02:18:31 +0000 (22:18 -0400)]
Merge pull request #2777 from colemanw/accordions
js work
Coleman Watts [Mon, 31 Mar 2014 02:15:12 +0000 (22:15 -0400)]
CRM-14408 - get rid of unnecessary calls to crmAccordions
Coleman Watts [Mon, 31 Mar 2014 02:02:22 +0000 (22:02 -0400)]
CRM-14408 - handle accordions automatically
Coleman Watts [Mon, 31 Mar 2014 01:40:26 +0000 (21:40 -0400)]
Add dialog resize button
Coleman Watts [Mon, 31 Mar 2014 00:45:21 +0000 (20:45 -0400)]
Improve dialog titlebar button style
Coleman Watts [Mon, 31 Mar 2014 00:22:18 +0000 (20:22 -0400)]
CRM-14407 - Fixup case custom tpl
colemanw [Sun, 30 Mar 2014 22:41:39 +0000 (18:41 -0400)]
Merge pull request #2776 from colemanw/caseCustom
CRM-14407 - Fix case custom field popup
Coleman Watts [Sun, 30 Mar 2014 22:41:09 +0000 (18:41 -0400)]
CRM-14407 - Fix case custom field popup
Coleman Watts [Sun, 30 Mar 2014 18:30:47 +0000 (14:30 -0400)]
Tweak to CRM.popup
Erich [Sun, 30 Mar 2014 02:44:23 +0000 (12:44 +1000)]
correct record_type_id description
fixed per further discussion http://forum.civicrm.org/index.php/topic,31282.msg136415.html#msg136415 with Eileen
kurund [Sat, 29 Mar 2014 18:25:35 +0000 (23:55 +0530)]
removed unwanted file
projects / civicrm-core.git / log