Coleman Watts [Thu, 17 Apr 2014 17:46:54 +0000 (13:46 -0400)]
HR-316 - Add generic form regions
colemanw [Sat, 12 Apr 2014 13:22:40 +0000 (09:22 -0400)]
Merge pull request #2881 from colemanw/snippet
HR-316 - Add crmRegion support to snippets and remove old div
colemanw [Sat, 12 Apr 2014 12:23:23 +0000 (08:23 -0400)]
Merge pull request #2871 from divya-jose/HR-329-new
--HR-329 Fix datatable DOM collision
Kurund Jalmi [Sat, 12 Apr 2014 01:38:34 +0000 (18:38 -0700)]
Merge pull request #2884 from yashodha/HR-330
HR-330 : case status should return filter=0 by default
yashodha [Sat, 12 Apr 2014 00:51:22 +0000 (06:21 +0530)]
HR-330 : case status should return filter=0 by default
Coleman Watts [Fri, 11 Apr 2014 21:52:27 +0000 (17:52 -0400)]
HR-316 - Add crmRegion support to snippets and remove old div
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
Kurund Jalmi [Thu, 10 Apr 2014 19:35:31 +0000 (12:35 -0700)]
Merge pull request #2873 from jitendrapurohit/PriceSet_Webtests
Webtest Fix
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
Divya Jose [Thu, 10 Apr 2014 06:46:35 +0000 (12:16 +0530)]
--HR-329 Fix datatable DOM collision
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
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.
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
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
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
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
colemanw [Tue, 8 Apr 2014 19:19:17 +0000 (15:19 -0400)]
Merge pull request #2853 from colemanw/js
profileBuilder work
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 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
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
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
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
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
Tim Otten [Fri, 28 Mar 2014 10:46:10 +0000 (03:46 -0700)]
CRM-14370 - API Kernel - Implement getEntityNames, getActionNames
Conflicts:
Civi/API/Provider/DoctrineCrudProvider.php
Civi/API/Registry.php
Civi/Core/Container.php
tests/phpunit/Civi/API/Provider/DoctrineCrudProviderTest.php
Tim Otten [Fri, 28 Mar 2014 10:24:43 +0000 (03:24 -0700)]
SyntaxConformanceTest - Accept some variation in capitalizaiton of errors
Tim Otten [Fri, 28 Mar 2014 08:34:13 +0000 (01:34 -0700)]
CRM-14370 - API Kernel - Move request parser to its own class
Tim Otten [Fri, 28 Mar 2014 06:38:19 +0000 (23:38 -0700)]
CRM-14370 - Move helper functions into classes
In particular:
* civicrm_get_api_version => Kernel::parseVersion
* _civicrm_api_resolve => MagicFunctionProvider::resolve
* _civicrm_api_loadEntity => MagicFunctionProvider::loadEntity
* civicrm_api_get_function_name => MagicFunctionProvider::getFunctionName
* civicrm_api3_generic_getActions (partial) => MagicFunctionProvider::getActionNames
Conflicts:
Civi/Core/Container.php
Tim Otten [Fri, 28 Mar 2014 06:20:35 +0000 (23:20 -0700)]
CRM-14370 - API Kernel - Add UnauthorizedException, NotImplementedException
Conflicts:
tests/phpunit/Civi/API/Provider/DoctrineCrudProviderTest.php
Tim Otten [Fri, 28 Mar 2014 00:27:41 +0000 (17:27 -0700)]
CRM-14370 - Convert _civicrm_api3_api_check_permission to Civi\API\Subscriber\PermissionCheck
Also: Restrict old permissions checks to APIv3
Conflicts:
Civi/Core/Container.php
Tim Otten [Fri, 28 Mar 2014 04:45:16 +0000 (21:45 -0700)]
CRM-14370 - API Kernel - Move dispatch into helpers
Also: Use constants for error codes
Tim Otten [Wed, 26 Mar 2014 06:09:19 +0000 (23:09 -0700)]
civicrm_api3_create_error - Simplify
Tim Otten [Thu, 27 Mar 2014 23:04:45 +0000 (16:04 -0700)]
CRM-14370 - API Kernel - Parse options/data/chains for v4
Tim Otten [Mon, 24 Mar 2014 22:47:56 +0000 (15:47 -0700)]
CRM-14370 - API Kernel - Add ProviderInterface. Extract MagicFunctionProvider.
Tim Otten [Mon, 24 Mar 2014 22:47:04 +0000 (15:47 -0700)]
CRM-14370 - API Kernel - Extract createRequest()
Tim Otten [Sat, 22 Mar 2014 01:37:59 +0000 (18:37 -0700)]
CRM-14370 - API Kernel - Extract WrapperAdapter
Tim Otten [Sat, 22 Mar 2014 01:13:16 +0000 (18:13 -0700)]
CRM-14370 - API Kernel - Extract APIv3SchemaAdapter
Tim Otten [Sat, 22 Mar 2014 00:25:58 +0000 (17:25 -0700)]
CRM-14370 - API Kernel - Move authorization to listener
Tim Otten [Sat, 22 Mar 2014 00:06:56 +0000 (17:06 -0700)]
CRM-14370 - API Kernel - Extract I18nSubscriber
Tim Otten [Sat, 22 Mar 2014 01:56:23 +0000 (18:56 -0700)]
CRM-14370 - API Kernel - Fix short-circuiting which breaks formatters/exceptions-handlers
Tim Otten [Fri, 21 Mar 2014 23:51:52 +0000 (16:51 -0700)]
CRM-14370 - API Kernel - DRY result formatting
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
Dave Greenberg [Sun, 6 Apr 2014 00:30:46 +0000 (17:30 -0700)]
Merge pull request #2825 from monishdeb/CRM-13981
CRM-13981 QA fixes
Dave Greenberg [Sun, 6 Apr 2014 00:16:02 +0000 (17:16 -0700)]
Merge pull request #2824 from monishdeb/CRM-14377
CRM-14377 minor fix and improvement in SC and PCP panes in Contribution Form
monishdeb [Sat, 5 Apr 2014 16:21:10 +0000 (21:51 +0530)]
CRM-13981 QA fixes
----------------------------------------
* CRM-13981:
http://issues.civicrm.org/jira/browse/CRM-13981
monishdeb [Sat, 5 Apr 2014 13:43:28 +0000 (19:13 +0530)]
CRM-14377 minor fix and improvement in SC and PCP panes in Contribution Form
----------------------------------------
* CRM-14377:
http://issues.civicrm.org/jira/browse/CRM-14377
monishdeb [Sat, 5 Apr 2014 12:53:45 +0000 (18:23 +0530)]
CRM-13833 Soft-Credit Import fix
----------------------------------------
* CRM-13833:
http://issues.civicrm.org/jira/browse/CRM-13833
jitendrapurohit [Fri, 4 Apr 2014 12:20:28 +0000 (17:50 +0530)]
Web Tests Fix
Tim Otten [Fri, 4 Apr 2014 08:01:47 +0000 (01:01 -0700)]
CRM-14423 - Call setMySQLTimeZone as part of Civi's bootstrap
Tim Otten [Fri, 4 Apr 2014 07:27:41 +0000 (00:27 -0700)]
CRM-14423 - CRM_Utils_System - Simplify time-zone lookups
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
projects / civicrm-core.git / log