Kurund Jalmi [Thu, 29 May 2014 20:35:26 +0000 (02:05 +0530)]
Merge pull request #3388 from kurund/CRM-14474
CRM-14474
kurund [Thu, 29 May 2014 20:33:48 +0000 (02:03 +0530)]
fix code to work with api and UI, CRM-14474
----------------------------------------
* CRM-14474: Update CiviCase XML processor to load from DB *or* file
https://issues.civicrm.org/jira/browse/CRM-14474
kurund [Thu, 29 May 2014 20:22:17 +0000 (01:52 +0530)]
fix code to work with api and UI, CRM-14474
----------------------------------------
* CRM-14474: Update CiviCase XML processor to load from DB *or* file
https://issues.civicrm.org/jira/browse/CRM-14474
Kurund Jalmi [Thu, 29 May 2014 19:55:46 +0000 (01:25 +0530)]
Merge pull request #3387 from kurund/CRM-14480
CRM-14480
kurund [Thu, 29 May 2014 19:25:03 +0000 (00:55 +0530)]
new case type fixes, CRM-14480
----------------------------------------
* CRM-14480: Implement "Edit Case Type" screen
https://issues.civicrm.org/jira/browse/CRM-14480
kurund [Thu, 29 May 2014 16:44:41 +0000 (22:14 +0530)]
minor fixes CRM-14480
----------------------------------------
* CRM-14480: Implement "Edit Case Type" screen
https://issues.civicrm.org/jira/browse/CRM-14480
kurund [Thu, 29 May 2014 16:43:20 +0000 (22:13 +0530)]
allow creation of new case type CRM-14480
----------------------------------------
* CRM-14480: Implement "Edit Case Type" screen
https://issues.civicrm.org/jira/browse/CRM-14480
Yashodha Chaku [Thu, 29 May 2014 12:34:56 +0000 (18:04 +0530)]
Merge pull request #3386 from monishdeb/CRM-14107-fix
CRM-14107 additional fixes
CiviCRM [Thu, 29 May 2014 11:33:06 +0000 (17:03 +0530)]
CRM-14107 additional fixes
----------------------------------------
* CRM-14107: Implement Previous / Next navigation on contact summary pages when accessed from a custom search
https://issues.civicrm.org/jira/browse/CRM-14107
Yashodha Chaku [Thu, 29 May 2014 11:02:36 +0000 (16:32 +0530)]
Merge pull request #3363 from jitendrapurohit/CRM14315
CRM-14315
Yashodha Chaku [Thu, 29 May 2014 10:24:05 +0000 (15:54 +0530)]
Merge pull request #3385 from divya-jose/targetidissue_caseactivity
--fixes to store the target id for activity of case type
Divya Jose [Thu, 29 May 2014 07:18:12 +0000 (12:48 +0530)]
--fixes to store the target id for activity of case type
Kurund Jalmi [Thu, 29 May 2014 03:31:35 +0000 (09:01 +0530)]
Merge pull request #3384 from colemanw/value
Fix smarty crmDate function as used on frozen fields
Coleman Watts [Wed, 28 May 2014 17:59:44 +0000 (18:59 +0100)]
Fix smarty crmDate function as used on frozen fields
Eileen McNaughton [Wed, 28 May 2014 09:48:39 +0000 (21:48 +1200)]
Merge pull request #3382 from eileenmcnaughton/mailingtests
add a test to check mailing is sending
Eileen McNaughton [Wed, 28 May 2014 08:37:25 +0000 (20:37 +1200)]
mailing tests
Eileen McNaughton [Wed, 28 May 2014 08:01:16 +0000 (20:01 +1200)]
Merge pull request #3381 from eileenmcnaughton/CRM-14197
CRM-14197 remove rebase introduced error
Eileen McNaughton [Wed, 28 May 2014 08:00:31 +0000 (20:00 +1200)]
CRM-14197 remove rebase introduced error
Eileen McNaughton [Wed, 28 May 2014 07:48:30 +0000 (19:48 +1200)]
Merge pull request #3305 from eileenmcnaughton/CRM-14197-membership
CRM-14197 contribution form post process - set entity_id to membership id
Per discussions with @totten I am merging this as he felt that he could do relatively little QA on it & I could see that the constant rebasing of this work has been much riskier in terms of bugs than actual code changes & as I have already changed back-office flows we can't really go back.
The heart of this is the changes so that line_items have membership_id as the entity_id for memberships. rather than contribution id. The PRs leading up to this have been about getting to the point where the code made enough sense to make this change.
The key flow that still needs testing is around single vs multiple membership on the contribution page
Eileen McNaughton [Tue, 20 May 2014 08:10:06 +0000 (20:10 +1200)]
CRm-14197 where a participant_payment contribution has a single line item point it towards the contribution
Eileen McNaughton [Tue, 20 May 2014 07:48:23 +0000 (19:48 +1200)]
CRM-14197 make membership_payment create action take responsibility for setting entity_id for membership line items
Eileen McNaughton [Tue, 20 May 2014 02:23:57 +0000 (14:23 +1200)]
further consolidation on membership creation
comment fixes
enotice fix
further refactoring to pass more params into smaller functions to make fixing membership line items doable
Eileen McNaughton [Tue, 20 May 2014 01:49:44 +0000 (13:49 +1200)]
separate form level part of renewal from bao part using an outer wrapper function
separate form level part of renewal from bao part using an outer wrapper function
Eileen McNaughton [Wed, 28 May 2014 07:27:01 +0000 (19:27 +1200)]
Merge pull request #3380 from eileenmcnaughton/CRM-14197
a few comment fixes
Eileen McNaughton [Wed, 28 May 2014 07:24:15 +0000 (19:24 +1200)]
a few comment fixes
Kurund Jalmi [Wed, 28 May 2014 05:53:07 +0000 (11:23 +0530)]
Merge pull request #3360 from monishdeb/CRM-14107-fix
CRM-14107 fix - Implement Previous / Next navigation on contact summary ...
Kurund Jalmi [Wed, 28 May 2014 05:51:21 +0000 (11:21 +0530)]
Merge pull request #3379 from totten/master-casetype-ui
CRM-14726, etal - Updates to Case Type UI and API
Eileen McNaughton [Wed, 28 May 2014 04:54:16 +0000 (16:54 +1200)]
Merge pull request #3370 from eileenmcnaughton/CRM-14197
CRM-14197 refactor out smaller functions
Tim Otten [Wed, 28 May 2014 04:49:47 +0000 (21:49 -0700)]
crmCaseType - Fix loading number-ish Javascript data
In Firefox, the initial loading of some fields (like max_instances) failed
because the HTML widget had type "number" but the Javascript data wasn't
strictly numeric (ie it had type "string" with numeric content).
Tim Otten [Wed, 28 May 2014 04:39:53 +0000 (21:39 -0700)]
CRM-14726 - crmCaseType - Add simple <UL> listing of case-types
Yashodha Chaku [Wed, 28 May 2014 04:34:52 +0000 (10:04 +0530)]
Merge pull request #3373 from NileemaJadhav/CRM-master
HR-377 Fix to custom_data_entities() function not to have entities while related component is disabled
Tim Otten [Wed, 28 May 2014 04:34:48 +0000 (21:34 -0700)]
api/v3/CaseType - Fix generation of 'definition' when handling multiple case-types
Tim Otten [Wed, 28 May 2014 04:07:33 +0000 (21:07 -0700)]
Merge pull request #3368 from totten/master-case-sequence
CRM-14727 - Implement activity pipelines/sequences
Tim Otten [Wed, 28 May 2014 04:05:11 +0000 (21:05 -0700)]
CRM-14727 - crmCaseType - Use the "<sequence>" tag instead of "<pipeline>" tag
Tim Otten [Tue, 27 May 2014 19:55:59 +0000 (12:55 -0700)]
CRM-14727 - Move $isActive from SequenceListener to Events
When a case-change listener makes another change to a case, we don't want to
refire all the case-change listeners. $isActive helps avoid that (infinite)
recursion.
This commit has two important qualities:
1. The code is simpler. There's a single set() and single unset().
2. Developers of new case-change listeners don't need to worry
about recursion problems -- it's handled centrally.
Tim Otten [Tue, 27 May 2014 05:40:29 +0000 (22:40 -0700)]
CRM-14727 - Implement Civi\CCase\SequenceListener
Tim Otten [Tue, 27 May 2014 03:45:41 +0000 (20:45 -0700)]
CiviCaseTestCase - Allow specifying the XML file. Allow hook-XML to override core-XML.
Tim Otten [Tue, 27 May 2014 03:24:13 +0000 (20:24 -0700)]
api_v3_CaseTest - Move setup/teardown to CiviCaseTestCase
Tim Otten [Tue, 27 May 2014 01:34:19 +0000 (18:34 -0700)]
CRM-14727 - Fire case-change events which include Civi\CCase\Analyzer.
Notes:
* The key underlying event (hook_civicrm_post) is already fired, but you
have to bind to it a couple different ways (eg listen for a change to an
"Activity" and then check the "case_id").
* A key goal is to allow multiple event-listeners to use the same instance of $analyzer.
* One can bind to the case-change event in one of three ways: (a) hooks, (b) event-dispatcher, (c) CiviCase XML listeners.
Tim Otten [Mon, 26 May 2014 23:57:43 +0000 (16:57 -0700)]
CRM_Utils_Hook - Fire Symfony event dispatcher for hook_post and hook_pre.
Kurund Jalmi [Tue, 27 May 2014 20:02:43 +0000 (01:32 +0530)]
Merge pull request #3377 from kurund/ui-fixes
Ui fixes
kurund [Tue, 27 May 2014 20:01:50 +0000 (01:31 +0530)]
fixes to render multiple timelines, CRM-14725
----------------------------------------
* CRM-14725: Edit Case Type - Use AJAX load/save
https://issues.civicrm.org/jira/browse/CRM-14725
kurund [Tue, 27 May 2014 18:32:34 +0000 (00:02 +0530)]
advanced section fixes
Kurund Jalmi [Tue, 27 May 2014 18:20:00 +0000 (23:50 +0530)]
Merge pull request #3376 from kurund/CRM-14725
CRM-14725
kurund [Tue, 27 May 2014 18:19:02 +0000 (23:49 +0530)]
fixes for create mode - case type api, CRM-14725
----------------------------------------
* CRM-14725: Edit Case Type - Use AJAX load/save
https://issues.civicrm.org/jira/browse/CRM-14725
kurund [Tue, 27 May 2014 18:06:53 +0000 (23:36 +0530)]
get action fixes for activitysets, CRM-14725
----------------------------------------
* CRM-14725: Edit Case Type - Use AJAX load/save
https://issues.civicrm.org/jira/browse/CRM-14725
Kurund Jalmi [Tue, 27 May 2014 17:28:27 +0000 (22:58 +0530)]
Merge pull request #3375 from kurund/CRM-14725
fixes to create api, CRM-14725
kurund [Tue, 27 May 2014 17:26:09 +0000 (22:56 +0530)]
fixes to create api, CRM-14725
----------------------------------------
* CRM-14725: Edit Case Type - Use AJAX load/save
https://issues.civicrm.org/jira/browse/CRM-14725
Kurund Jalmi [Tue, 27 May 2014 17:01:26 +0000 (22:31 +0530)]
Merge pull request #3374 from kurund/CRM-14725
fixes for create api and also added conditional fetching of case type de...
kurund [Tue, 27 May 2014 17:00:50 +0000 (22:30 +0530)]
fixes for create api and also added conditional fetching of case type definition, CRM-14725
----------------------------------------
* CRM-14725: Edit Case Type - Use AJAX load/save
https://issues.civicrm.org/jira/browse/CRM-14725
Nileema [Tue, 27 May 2014 15:36:49 +0000 (21:06 +0530)]
HR-377 Fix to custom_data_entities() function not to have entities while related component is disabled
Kurund Jalmi [Tue, 27 May 2014 13:51:30 +0000 (19:21 +0530)]
Merge pull request #3372 from kurund/CRM-14725
CRM-14725
kurund [Tue, 27 May 2014 13:50:53 +0000 (19:20 +0530)]
added generated data, CRM-14725
----------------------------------------
* CRM-14725: Edit Case Type - Use AJAX load/save
https://issues.civicrm.org/jira/browse/CRM-14725
kurund [Tue, 27 May 2014 13:40:37 +0000 (19:10 +0530)]
api and generated data fixes, CRM-14725
----------------------------------------
* CRM-14725: Edit Case Type - Use AJAX load/save
https://issues.civicrm.org/jira/browse/CRM-14725
kurund [Tue, 27 May 2014 13:01:23 +0000 (18:31 +0530)]
fix case type get api to return definition, CRM-14725
----------------------------------------
* CRM-14725: Edit Case Type - Use AJAX load/save
https://issues.civicrm.org/jira/browse/CRM-14725
Yashodha Chaku [Tue, 27 May 2014 12:34:57 +0000 (18:04 +0530)]
Merge pull request #3369 from eileenmcnaughton/CRM-14755
CRM-14755 - upgrade fails on insert country
monishdeb [Tue, 27 May 2014 12:11:08 +0000 (17:41 +0530)]
debug left
monishdeb [Tue, 27 May 2014 12:09:43 +0000 (17:39 +0530)]
Minor fixes in fulltext search
monishdeb [Tue, 27 May 2014 10:48:43 +0000 (16:18 +0530)]
minor fix
monishdeb [Mon, 26 May 2014 10:35:39 +0000 (16:05 +0530)]
CRM-14107 fix - Implement Previous / Next navigation on contact summary pages when accessed from a custom search
https://issues.civicrm.org/jira/browse/CRM-14107
Eileen McNaughton [Tue, 20 May 2014 01:13:49 +0000 (13:13 +1200)]
share create membership function & move compiling errors into a separate function
Eileen McNaughton [Mon, 19 May 2014 20:49:39 +0000 (08:49 +1200)]
refactor out createOrRenewMembership function
Eileen McNaughton [Tue, 20 May 2014 00:38:49 +0000 (12:38 +1200)]
refactor creation of membership_payment records into shared function
Eileen McNaughton [Tue, 27 May 2014 08:33:27 +0000 (20:33 +1200)]
Merge pull request #3317 from eileenmcnaughton/CRM-14197-postprocesfn
CRM-14197 more refactoring of postProcess function
Eileen McNaughton [Tue, 27 May 2014 08:22:19 +0000 (20:22 +1200)]
CRM-14755 - upgrade fails on insert country
pratik-joshi [Tue, 27 May 2014 06:54:48 +0000 (12:24 +0530)]
Merge pull request #3361 from monishdeb/CRM-14745
CRM-14745 fix - Menu link to membership reports not working on sandbox
Tim Otten [Mon, 26 May 2014 21:17:19 +0000 (14:17 -0700)]
Merge pull request #3366 from totten/master-casetype-addroles
CRM-14483 - crmCaseType - Support for adding relationship-types
Tim Otten [Mon, 26 May 2014 21:05:25 +0000 (14:05 -0700)]
CRM-14483 - crmCaseType - Support for adding relationship-types
Tim Otten [Mon, 26 May 2014 20:17:34 +0000 (13:17 -0700)]
Merge pull request #3365 from totten/master-reconcile-case-xml
CRM-14478 - Create managed-entities for CiviCase's (missing) activity-types and relationship-types
Tim Otten [Sat, 24 May 2014 03:38:38 +0000 (20:38 -0700)]
CRM-14478 - Create managed-entities for CiviCase's activity-types and relationship-types
Tim Otten [Sat, 24 May 2014 03:37:19 +0000 (20:37 -0700)]
api/v3/RelationshipType - Fix default for "is_active"
Tim Otten [Sat, 24 May 2014 03:28:51 +0000 (20:28 -0700)]
CRM_Core_ManagedEntities - Lazy-init for declarations. Improve error logging.
Tim Otten [Sat, 24 May 2014 03:27:00 +0000 (20:27 -0700)]
CRM_Core_Module - Add pseudomodule for "civicrm" so that core can use hook_civicrm_managed.
Tim Otten [Sat, 24 May 2014 00:08:25 +0000 (17:08 -0700)]
CRM_Case_XMLRepository -- Add getAllDeclaredActivityTypes() & getAllDeclaredRelationshipTypes()
Tim Otten [Sun, 11 May 2014 04:54:06 +0000 (21:54 -0700)]
CRM-14478 - ManagedEntities - Add support for 'cleanup' policy ("unused")
Tim Otten [Fri, 23 May 2014 23:33:24 +0000 (16:33 -0700)]
\Civi\API\Provider\AdhocProvider - Bump priority
Tim Otten [Sat, 10 May 2014 18:58:12 +0000 (11:58 -0700)]
CRM-14478 - ManagedEntities - Add support for 'cleanup' policy ("always", "never")
Tim Otten [Sat, 10 May 2014 00:22:22 +0000 (17:22 -0700)]
CRM-14478 - ManagedEntities - Add support for 'update' policy ('always' or 'never')
Tim Otten [Sat, 10 May 2014 00:11:51 +0000 (17:11 -0700)]
CRM-14478 - ManagedEntities - Extract methods
Tim Otten [Fri, 9 May 2014 23:56:20 +0000 (16:56 -0700)]
CRM-14480 - ManagedEntitiesTest - Cleanup
Tim Otten [Fri, 9 May 2014 23:34:43 +0000 (16:34 -0700)]
CRM-14480 - ManagedEntities - Cleanup. Extract method removeStaleEntity().
pratik-joshi [Mon, 26 May 2014 14:56:02 +0000 (20:26 +0530)]
Merge pull request #3364 from jitendrapurohit/CRM-14739
CRM-14739
jitendrapurohit [Mon, 26 May 2014 14:08:37 +0000 (19:38 +0530)]
CRM-14739
jitendrapurohit [Mon, 26 May 2014 14:01:36 +0000 (19:31 +0530)]
CRM-14315
pratik-joshi [Mon, 26 May 2014 13:25:58 +0000 (18:55 +0530)]
Merge pull request #3362 from pratik-joshi/CRM-14230
CRM-14230 : sanity check
Pratik Joshi [Mon, 26 May 2014 13:17:29 +0000 (18:47 +0530)]
CRM-14230 : sanity check
monishdeb [Mon, 26 May 2014 12:28:05 +0000 (17:58 +0530)]
CRM-14745 fix - Menu link to membership reports not working on sandbox
https://issues.civicrm.org/jira/browse/CRM-14745
pratik-joshi [Mon, 26 May 2014 11:14:22 +0000 (16:44 +0530)]
Merge pull request #3342 from systopia/CRM-14741
CRM-14741
pratik-joshi [Mon, 26 May 2014 11:13:14 +0000 (16:43 +0530)]
Merge pull request #3341 from systopia/CRM-14740
CRM-14740
pratik-joshi [Mon, 26 May 2014 07:51:04 +0000 (13:21 +0530)]
Merge pull request #3359 from jitendrapurohit/CRM_14315
CRM-14315
jitendrapurohit [Mon, 26 May 2014 07:38:37 +0000 (13:08 +0530)]
CRM-14315
Yashodha Chaku [Mon, 26 May 2014 06:50:42 +0000 (12:20 +0530)]
Merge pull request #3339 from yashodha/CRM-14664
CRM-14664: js fixes
Tim Otten [Sat, 24 May 2014 18:59:58 +0000 (11:59 -0700)]
Merge pull request #3355 from eileenmcnaughton/comments
Autogenerated comments for Civi dir
Eileen McNaughton [Sat, 24 May 2014 09:34:10 +0000 (21:34 +1200)]
Merge pull request #3358 from eileenmcnaughton/comments-extra
Comments extra
Eileen McNaughton [Sat, 24 May 2014 07:21:00 +0000 (19:21 +1200)]
comments & spelling
Eileen McNaughton [Sat, 24 May 2014 07:14:24 +0000 (19:14 +1200)]
fix spelling errors & a couple of comment blocks
Eileen McNaughton [Sat, 24 May 2014 03:22:47 +0000 (15:22 +1200)]
missing comments in civi dir
Eileen McNaughton [Sat, 24 May 2014 05:56:57 +0000 (17:56 +1200)]
Merge pull request #3356 from eileenmcnaughton/tests
test & comment tidy-ups
Eileen McNaughton [Sat, 24 May 2014 05:54:39 +0000 (17:54 +1200)]
minor test tidy-up - esp remove unused vars
Eileen McNaughton [Sat, 24 May 2014 05:47:47 +0000 (17:47 +1200)]
add a couple of comments
projects / civicrm-core.git / log