civicrm-core.git
10 years agoJS updates to support HR-337
Coleman Watts [Fri, 11 Apr 2014 01:22:17 +0000 (21:22 -0400)]
JS updates to support HR-337

10 years agoMerge pull request #2863 from jitendrapurohit/AddParticipationTest_Fix
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

10 years agoMerge pull request #2868 from totten/master-revert-tz
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"

10 years agoRevert "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.

10 years agoMerge pull request #2821 from totten/master-timezone
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

10 years agoAdd Participation test Fix
jitendrapurohit [Wed, 9 Apr 2014 15:03:56 +0000 (20:33 +0530)]
Add Participation test Fix

10 years agoMerge pull request #2832 from jitendrapurohit/Web_Tests_Fixes
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

10 years agoMerge pull request #2687 from giant-rabbit/event_info_custom_validation
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...

10 years agoMerge pull request #2857 from davecivicrm/CRM-13973a
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 ...

10 years agoCRM-13973 - Fix bugs in Change Selections form - admin price fields not displayed...
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

10 years agoMerge pull request #2856 from colemanw/js
colemanw [Tue, 8 Apr 2014 20:02:36 +0000 (16:02 -0400)]
Merge pull request #2856 from colemanw/js

Centralize wysiwyg code for livepage

10 years agoCentralize wysiwyg code for livepage
Coleman Watts [Tue, 8 Apr 2014 20:01:58 +0000 (16:01 -0400)]
Centralize wysiwyg code for livepage

10 years agoMerge pull request #2853 from colemanw/js
colemanw [Tue, 8 Apr 2014 19:19:17 +0000 (15:19 -0400)]
Merge pull request #2853 from colemanw/js

profileBuilder work

10 years agoMerge pull request #2846 from hhermsen/patch-1
Dave Greenberg [Tue, 8 Apr 2014 18:30:38 +0000 (11:30 -0700)]
Merge pull request #2846 from hhermsen/patch-1

Duplicate code

10 years agoMerge pull request #2847 from monishdeb/HR-331
colemanw [Tue, 8 Apr 2014 18:08:28 +0000 (14:08 -0400)]
Merge pull request #2847 from monishdeb/HR-331

HR-331- TabHeader fix

10 years agoMerge pull request #2850 from jitendrapurohit/WebFixes
Kurund Jalmi [Tue, 8 Apr 2014 15:02:07 +0000 (08:02 -0700)]
Merge pull request #2850 from jitendrapurohit/WebFixes

Web tests Fixes

10 years agoProfileBuilder - general updates for 4.5
Coleman Watts [Tue, 8 Apr 2014 14:44:17 +0000 (10:44 -0400)]
ProfileBuilder - general updates for 4.5

10 years agoProfileBuilder - fix undefined var error
Coleman Watts [Tue, 8 Apr 2014 14:43:59 +0000 (10:43 -0400)]
ProfileBuilder - fix undefined var error

10 years agoWeb tests Fixes
jitendrapurohit [Tue, 8 Apr 2014 14:02:47 +0000 (19:32 +0530)]
Web tests Fixes

10 years agoHR-331, TabHeader fix
monishdeb [Tue, 8 Apr 2014 10:15:05 +0000 (15:45 +0530)]
HR-331, TabHeader fix

10 years agoDuplicate code
Harm Hermsen [Tue, 8 Apr 2014 09:52:57 +0000 (11:52 +0200)]
Duplicate code

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-07-15-32-51
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

10 years agoMerge pull request #2840 from kurund/git-hook-fixes
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

10 years agocommit hook fixes
kurund [Mon, 7 Apr 2014 22:26:11 +0000 (15:26 -0700)]
commit hook fixes

10 years agoMerge pull request #2828 from totten/master-api-kernel
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

10 years agoMerge pull request #2838 from eileenmcnaughton/CRM-14419
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

10 years agoMerge pull request #2839 from davecivicrm/CRM-13891testFixes
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...

10 years agoMerge pull request #2743 from eileenmcnaughton/CRM-14319-mini-fix
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

10 years agoE-notice fix, next_sched_contribution
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

10 years agoCRM-14420 - api contribution.completetransaction should accept 'trxn_id' as a param
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

10 years agoCRM-14419 - e-notice on activity.getcount when contact_id is not passed in
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

10 years agoMerge pull request #2805 from rnao/CRM-14389
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 ...

10 years agoCRM-13891 - test fixes, replace hard-coded IDs with name lookups and accommodate...
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

10 years agoCoreResources - Look fo non-mini js file when in debug mode
Coleman Watts [Mon, 7 Apr 2014 18:23:08 +0000 (14:23 -0400)]
CoreResources - Look fo non-mini js file when in debug mode

10 years agoMerge pull request #2830 from eileenmcnaughton/patch-1
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

10 years agoWeb Test Fixes
jitendrapurohit [Mon, 7 Apr 2014 14:21:33 +0000 (19:51 +0530)]
Web Test Fixes

10 years agoE-notice fix, next_sched_contribution
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

10 years agoMerge pull request #2823 from monishdeb/CRM-13833
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

10 years agoMerge pull request #2822 from jitendrapurohit/WebTestsFix
Kurund Jalmi [Mon, 7 Apr 2014 02:09:07 +0000 (19:09 -0700)]
Merge pull request #2822 from jitendrapurohit/WebTestsFix

Web Tests Fix

10 years agoCRM-14370 - Extract ChainSubscriber; move helper function
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

10 years agoCRM-14370 - Fix incorrect type reference and other warnings.
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

10 years agoapi_v3_UtilsTest - Fix regression
Tim Otten [Wed, 2 Apr 2014 21:46:08 +0000 (14:46 -0700)]
api_v3_UtilsTest - Fix regression

10 years agoCRM_Core_BAO_Setting - Generate better errors
Tim Otten [Fri, 28 Mar 2014 00:23:16 +0000 (17:23 -0700)]
CRM_Core_BAO_Setting - Generate better errors

10 years agoAdd Civi_AllTests
Tim Otten [Wed, 2 Apr 2014 04:40:29 +0000 (21:40 -0700)]
Add Civi_AllTests

10 years agoCRM-14370 - TransactionSubscriber - Be more defensive
Tim Otten [Sat, 29 Mar 2014 01:34:22 +0000 (18:34 -0700)]
CRM-14370 - TransactionSubscriber - Be more defensive

10 years agoCRM-14370 - API Kernel - Add test for event lifecycle
Tim Otten [Fri, 28 Mar 2014 23:35:26 +0000 (16:35 -0700)]
CRM-14370 - API Kernel - Add test for event lifecycle

10 years agoCRM-14370 - API Kernel - Implement getEntityNames, getActionNames
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

10 years agoSyntaxConformanceTest - Accept some variation in capitalizaiton of errors
Tim Otten [Fri, 28 Mar 2014 10:24:43 +0000 (03:24 -0700)]
SyntaxConformanceTest - Accept some variation in capitalizaiton of errors

10 years agoCRM-14370 - API Kernel - Move request parser to its own class
Tim Otten [Fri, 28 Mar 2014 08:34:13 +0000 (01:34 -0700)]
CRM-14370 - API Kernel - Move request parser to its own class

10 years agoCRM-14370 - Move helper functions into classes
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

10 years agoCRM-14370 - API Kernel - Add UnauthorizedException, NotImplementedException
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

10 years agoCRM-14370 - Convert _civicrm_api3_api_check_permission to Civi\API\Subscriber\Permiss...
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

10 years agoCRM-14370 - API Kernel - Move dispatch into helpers
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

10 years agocivicrm_api3_create_error - Simplify
Tim Otten [Wed, 26 Mar 2014 06:09:19 +0000 (23:09 -0700)]
civicrm_api3_create_error - Simplify

10 years agoCRM-14370 - API Kernel - Parse options/data/chains for v4
Tim Otten [Thu, 27 Mar 2014 23:04:45 +0000 (16:04 -0700)]
CRM-14370 - API Kernel - Parse options/data/chains for v4

10 years agoCRM-14370 - API Kernel - Add ProviderInterface. Extract MagicFunctionProvider.
Tim Otten [Mon, 24 Mar 2014 22:47:56 +0000 (15:47 -0700)]
CRM-14370 - API Kernel - Add ProviderInterface. Extract MagicFunctionProvider.

10 years agoCRM-14370 - API Kernel - Extract createRequest()
Tim Otten [Mon, 24 Mar 2014 22:47:04 +0000 (15:47 -0700)]
CRM-14370 - API Kernel - Extract createRequest()

10 years agoCRM-14370 - API Kernel - Extract WrapperAdapter
Tim Otten [Sat, 22 Mar 2014 01:37:59 +0000 (18:37 -0700)]
CRM-14370 - API Kernel - Extract WrapperAdapter

10 years agoCRM-14370 - API Kernel - Extract APIv3SchemaAdapter
Tim Otten [Sat, 22 Mar 2014 01:13:16 +0000 (18:13 -0700)]
CRM-14370 - API Kernel - Extract APIv3SchemaAdapter

10 years agoCRM-14370 - API Kernel - Move authorization to listener
Tim Otten [Sat, 22 Mar 2014 00:25:58 +0000 (17:25 -0700)]
CRM-14370 - API Kernel - Move authorization to listener

10 years agoCRM-14370 - API Kernel - Extract I18nSubscriber
Tim Otten [Sat, 22 Mar 2014 00:06:56 +0000 (17:06 -0700)]
CRM-14370 - API Kernel - Extract I18nSubscriber

10 years agoCRM-14370 - API Kernel - Fix short-circuiting which breaks formatters/exceptions...
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

10 years agoCRM-14370 - API Kernel - DRY result formatting
Tim Otten [Fri, 21 Mar 2014 23:51:52 +0000 (16:51 -0700)]
CRM-14370 - API Kernel - DRY result formatting

10 years agoCRM-14370 - API Kernel - DRY exception-handling; fix inconsistencies
Tim Otten [Fri, 21 Mar 2014 23:28:12 +0000 (16:28 -0700)]
CRM-14370 - API Kernel - DRY exception-handling; fix inconsistencies

10 years agoCRM-14370 - API Kernel - Extract XDebugSubscriber
Tim Otten [Fri, 21 Mar 2014 05:55:35 +0000 (22:55 -0700)]
CRM-14370 - API Kernel - Extract XDebugSubscriber

10 years agoCRM-14370 - API Kernel - Extract TransactionSubscriber
Tim Otten [Fri, 21 Mar 2014 05:44:47 +0000 (22:44 -0700)]
CRM-14370 - API Kernel - Extract TransactionSubscriber

10 years agoCRM-14370 - API Kernel - Dispatch events
Tim Otten [Fri, 21 Mar 2014 05:34:30 +0000 (22:34 -0700)]
CRM-14370 - API Kernel - Dispatch events

10 years agoCRM-14370 - civicrm_api, CiviUnitTestCase - Move main logic to Civi\API\Kernel
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

10 years agoCRM-14370 - Backport container and classloader (from doctrine => master)
Tim Otten [Sun, 6 Apr 2014 04:10:55 +0000 (21:10 -0700)]
CRM-14370 - Backport container and classloader (from doctrine => master)

10 years agoSyntaxConformanceTest - Fix for entities which don't support delete
Tim Otten [Mon, 24 Mar 2014 23:24:40 +0000 (16:24 -0700)]
SyntaxConformanceTest - Fix for entities which don't support delete

10 years agoMerge pull request #2825 from monishdeb/CRM-13981
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

10 years agoMerge pull request #2824 from monishdeb/CRM-14377
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

10 years agoCRM-13981 QA fixes
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

10 years agoCRM-14377 minor fix and improvement in SC and PCP panes in Contribution Form
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

10 years agoCRM-13833 Soft-Credit Import fix
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

10 years agoWeb Tests Fix
jitendrapurohit [Fri, 4 Apr 2014 12:20:28 +0000 (17:50 +0530)]
Web Tests Fix

10 years agoCRM-14423 - Call setMySQLTimeZone as part of Civi's bootstrap
Tim Otten [Fri, 4 Apr 2014 08:01:47 +0000 (01:01 -0700)]
CRM-14423 - Call setMySQLTimeZone as part of Civi's bootstrap

10 years agoCRM-14423 - CRM_Utils_System - Simplify time-zone lookups
Tim Otten [Fri, 4 Apr 2014 07:27:41 +0000 (00:27 -0700)]
CRM-14423 - CRM_Utils_System - Simplify time-zone lookups

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-48-43
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

10 years agoMerge pull request #2820 from totten/4.4-tz-opt
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.

10 years agoCRM-14423 - CiviUnitTestCase - Only run env checks, not security checks, during unit...
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.

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-08-28
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

10 years agoMerge pull request #2819 from totten/4.4-tz-alert
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

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-03-23-46-36
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

10 years agoCRM-14423 - Run env checks before executing tests
Tim Otten [Fri, 4 Apr 2014 05:16:10 +0000 (22:16 -0700)]
CRM-14423 - Run env checks before executing tests

10 years agoCRM-14423 - CRM_Utils_Check_Env - Add check for other environmental configuration...
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

10 years agoCRM-14423 - Extract class CRM_Utils_Check from CRM_Utils_Check_Security
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

10 years agoMerge pull request #2818 from davecivicrm/CRM-14417
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...

10 years agoCRM-14417 - Remove all non-relevant statuses from the contribution status drop-down...
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

10 years agoMerge pull request #2817 from colemanw/custom
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

10 years agoHR-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

10 years agoMerge pull request #2816 from totten/master-grouporgtest
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

10 years agoapi_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.

10 years agoCRM-14288 - Remove obsolete custom field hack
Coleman Watts [Thu, 3 Apr 2014 21:03:13 +0000 (17:03 -0400)]
CRM-14288 - Remove obsolete custom field hack

10 years agoMerge pull request #2793 from monishdeb/HR-322
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

10 years agoMerge pull request #2812 from eileenmcnaughton/CRM-14220
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

10 years agoMerge pull request #2799 from PoonamNalawade/HR_321
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

10 years agoUpdate comments
Coleman Watts [Thu, 3 Apr 2014 19:31:39 +0000 (15:31 -0400)]
Update comments

10 years agoMerge pull request #2815 from colemanw/js
colemanw [Thu, 3 Apr 2014 19:16:56 +0000 (15:16 -0400)]
Merge pull request #2815 from colemanw/js

Js popup fixes

10 years agoCRM-13863 - Improve buffering of crmPopup events
Coleman Watts [Thu, 3 Apr 2014 19:11:52 +0000 (15:11 -0400)]
CRM-13863 - Improve buffering of crmPopup events