Dave Greenberg [Wed, 4 Jun 2014 01:04:14 +0000 (18:04 -0700)]
CRM-14480 - rebuilt civicrm_generated.mysql with correct navigation URL for new Case Types page.
----------------------------------------
* CRM-14480:
https://issues.civicrm.org/jira/browse/CRM-14480
Eileen McNaughton [Tue, 3 Jun 2014 23:10:49 +0000 (11:10 +1200)]
Merge pull request #2326 from eileenmcnaughton/CRM-14069
CRM-14069 initial price set support for event.create
Obviously after a few months no input is forthcoming - merging this
Eileen McNaughton [Tue, 3 Jun 2014 22:43:05 +0000 (10:43 +1200)]
Merge pull request #3422 from eileenmcnaughton/test_fixes
Test fixes & a few minor tidy ups, fix mail_settings in particular
Eileen McNaughton [Tue, 3 Jun 2014 22:42:15 +0000 (10:42 +1200)]
test - fix api_mail_settings test
Eileen McNaughton [Tue, 3 Jun 2014 22:36:52 +0000 (10:36 +1200)]
api contribution page default to is_active
Eileen McNaughton [Tue, 3 Jun 2014 22:36:25 +0000 (10:36 +1200)]
formatting & comment fixes
Eileen McNaughton [Tue, 3 Jun 2014 21:35:49 +0000 (09:35 +1200)]
PriceSet BAO - fix spelling & remove unused var
Eileen McNaughton [Tue, 3 Jun 2014 21:31:05 +0000 (09:31 +1200)]
Merge pull request #3420 from eileenmcnaughton/test_fixes
Fix & test mail setting caching to fix test
Eileen McNaughton [Tue, 3 Jun 2014 21:09:06 +0000 (09:09 +1200)]
fix spelling
Eileen McNaughton [Tue, 3 Jun 2014 21:06:10 +0000 (09:06 +1200)]
api_contribution_page - default to is_active
Eileen McNaughton [Tue, 3 Jun 2014 20:57:30 +0000 (08:57 +1200)]
fix api price field value - default to is_active
Eileen McNaughton [Tue, 3 Jun 2014 20:33:03 +0000 (08:33 +1200)]
Fix & test mail setting caching to fix test
Eileen McNaughton [Tue, 3 Jun 2014 20:08:10 +0000 (08:08 +1200)]
Merge pull request #3419 from eileenmcnaughton/test_fixes
Syntax conformance test fixes
Eileen McNaughton [Tue, 3 Jun 2014 20:06:57 +0000 (08:06 +1200)]
Syntax conformance test fixes
Kurund Jalmi [Tue, 3 Jun 2014 13:54:20 +0000 (19:24 +0530)]
Merge pull request #3418 from yashodha/version-fixes
updates for next version release
CiviCRM [Tue, 3 Jun 2014 14:06:04 +0000 (19:36 +0530)]
updates for next version release
Eileen McNaughton [Tue, 3 Jun 2014 13:51:43 +0000 (01:51 +1200)]
Merge pull request #3417 from eileenmcnaughton/test_fixes
CRM-14178 fix error static vs nonstatic error introded in PR process
Eileen McNaughton [Tue, 3 Jun 2014 13:51:00 +0000 (01:51 +1200)]
CRM-14178 fix error static vs nonstatic error introded in PR process
Eileen McNaughton [Tue, 3 Jun 2014 13:00:53 +0000 (01:00 +1200)]
Merge pull request #3416 from eileenmcnaughton/test_fixes
fix to syntax conformance test handling of contribution_type_id
Eileen McNaughton [Tue, 3 Jun 2014 12:59:41 +0000 (00:59 +1200)]
fix to syntax conformance test handling of contribution_type_id
Eileen McNaughton [Tue, 3 Jun 2014 12:40:18 +0000 (00:40 +1200)]
Merge pull request #3415 from eileenmcnaughton/CRM-14778
Crm 14778
Eileen McNaughton [Tue, 3 Jun 2014 12:39:30 +0000 (00:39 +1200)]
Contribution Confirm Form - minor simplification
Eileen McNaughton [Tue, 3 Jun 2014 11:58:01 +0000 (23:58 +1200)]
CRM-14778 store names as lower
Eileen McNaughton [Tue, 3 Jun 2014 11:55:02 +0000 (23:55 +1200)]
CRM-14788 declare label as required field
Eileen McNaughton [Tue, 3 Jun 2014 11:51:34 +0000 (23:51 +1200)]
minor tidy-ups, declare type for field, don't set unused var
Eileen McNaughton [Tue, 3 Jun 2014 11:49:58 +0000 (23:49 +1200)]
CRM-14778 set name by default on price_field & price_field_value
Eileen McNaughton [Tue, 3 Jun 2014 11:16:04 +0000 (23:16 +1200)]
Merge pull request #3412 from eileenmcnaughton/CRM-14778
CRM-14778 price set api
Eileen McNaughton [Tue, 3 Jun 2014 11:14:40 +0000 (23:14 +1200)]
CRM-14778 handle missing name field
Yashodha Chaku [Tue, 3 Jun 2014 10:55:41 +0000 (16:25 +0530)]
Merge pull request #3411 from monishdeb/upgrade-fix
4.5 upgrade failure on line_item
Eileen McNaughton [Tue, 3 Jun 2014 10:52:58 +0000 (22:52 +1200)]
minor preparatory tidy ups
CiviCRM [Tue, 3 Jun 2014 10:48:32 +0000 (16:18 +0530)]
4.5 upgrade failure on line_item
Eileen McNaughton [Tue, 3 Jun 2014 10:46:46 +0000 (22:46 +1200)]
Merge pull request #3410 from eileenmcnaughton/testfixes_and_tidy_ups
test fix - combat caching on mail_settings
Eileen McNaughton [Tue, 3 Jun 2014 10:43:54 +0000 (22:43 +1200)]
test fix - combat caching on mail_settings
Yashodha Chaku [Tue, 3 Jun 2014 10:11:50 +0000 (15:41 +0530)]
Merge pull request #3409 from monishdeb/upgrade-fix
4.5 Upgrade fix
CiviCRM [Tue, 3 Jun 2014 10:07:43 +0000 (15:37 +0530)]
4.5 Upgrade fix
Eileen McNaughton [Tue, 3 Jun 2014 09:40:10 +0000 (21:40 +1200)]
Merge pull request #3408 from eileenmcnaughton/testfixes_and_tidy_ups
Testfixes and tidy ups
Eileen McNaughton [Tue, 3 Jun 2014 09:39:35 +0000 (21:39 +1200)]
spelling & comment fixes
Eileen McNaughton [Tue, 3 Jun 2014 08:52:10 +0000 (20:52 +1200)]
pseudoconstant declaration for financial_type_id missing in some places
Tim Otten [Tue, 3 Jun 2014 06:19:42 +0000 (23:19 -0700)]
Merge pull request #3406 from totten/master-casetype-misc
CaseType - Multiple fixes from trying to use the full "Edit Case Type" workflow.
Tim Otten [Tue, 3 Jun 2014 06:03:55 +0000 (23:03 -0700)]
CRM-14727 - SequenceListener - Tweak test
Tim Otten [Tue, 3 Jun 2014 06:03:23 +0000 (23:03 -0700)]
CRM-14727 - SequenceListener fixes
1. Fire the case-change event outside the main transaction. When case-change
listeners query the DB, they'll more understandable results.
2. Determine list of case-activities using $case['activities'] rather than
trying to call Activity.get(case_id=X). Activity.get does not support
filtering on case_id.
Tim Otten [Tue, 3 Jun 2014 04:21:05 +0000 (21:21 -0700)]
api_v3_CaseType - Tweak edge cases
Tim Otten [Tue, 3 Jun 2014 04:04:47 +0000 (21:04 -0700)]
CRM-14476 - CRM_Case_BAO_CaseType - In array-based definition, represent true boolean values of "sequence" and "timeline" as "1".
Tim Otten [Tue, 3 Jun 2014 03:32:21 +0000 (20:32 -0700)]
CRM-14476 - CRM_Case_BAO_CaseType - Add test for XML<=>array conversions. Fix corner-cases.
Tim Otten [Tue, 3 Jun 2014 02:07:04 +0000 (19:07 -0700)]
CRM-14476 - CRM_Case_BAO_CaseType - Make XML<=>Array conversions easier to test
Yashodha Chaku [Tue, 3 Jun 2014 01:51:18 +0000 (07:21 +0530)]
Merge pull request #3402 from jitendrapurohit/CRM_TEST_4.5alpha1
CRM_Test_Fix 4.5alpha1
Tim Otten [Tue, 3 Jun 2014 01:34:20 +0000 (18:34 -0700)]
CRM-14480 - crmCaseType - Tweak labels
Tim Otten [Mon, 2 Jun 2014 23:15:15 +0000 (16:15 -0700)]
Merge pull request #3405 from totten/master-crmcasetype-autocomplete
CRM-14480 - crmCaseType - Autocomplete fixes
Tim Otten [Mon, 2 Jun 2014 23:11:20 +0000 (16:11 -0700)]
CRM-14480 - crmCaseType - New options should appear in dropdowns
Tim Otten [Mon, 2 Jun 2014 22:41:23 +0000 (15:41 -0700)]
CRM-14480 - crmCaseType - Use select2. Fix autocomplete in Chrome.
CiviCRM [Mon, 2 Jun 2014 14:04:40 +0000 (19:34 +0530)]
CRM_Test_Fix 4.5alpha1
Yashodha Chaku [Mon, 2 Jun 2014 04:52:50 +0000 (10:22 +0530)]
Merge pull request #3393 from monishdeb/upgrade-distmaker-fix
Distmaker fixes for 4.5
kurund [Sun, 1 Jun 2014 15:33:12 +0000 (21:03 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-01-20-54-24
Conflicts:
CRM/Member/Form/Membership.php
CRM/Upgrade/Incremental/php/FourFour.php
api/api.php
tools/drupal/modules/ccrm_extensionvalidation/ccrm_extensionvalidation/ccrm_extensionvalidation.module
tools/drupal/modules/ccrm_extensionvalidation/ccrm_extensionvalidation/ccrm_extensionvalidation.version.inc
tools/drupal/modules/civicrm_regsite/civicrm_regsite.module
tools/drupal/modules/civicrm_regsite/templates/CRM/Profile/Form/15/Edit.tpl
tools/drupal/modules/civicrm_regsite/templates/CRM/Profile/Form/Survey/Edit.tpl
tools/drupal/modules/civicrm_regsite/templates/CRM/Profile/Page/Regsite/Dynamic.tpl
tools/drupal/modules/civicrm_regsite/templates/CRM/Profile/Page/Survey/Dynamic.tpl
tools/drupal/modules/extdir/extdir.pages.inc
Kurund Jalmi [Sun, 1 Jun 2014 15:18:15 +0000 (20:48 +0530)]
Merge pull request #3401 from kurund/case-type-selector
fixed upgrade for navigation menu update
kurund [Sun, 1 Jun 2014 15:17:31 +0000 (20:47 +0530)]
fixed upgrade for navigation menu update
Kurund Jalmi [Sun, 1 Jun 2014 15:08:16 +0000 (20:38 +0530)]
Merge pull request #3400 from kurund/case-type-selector
Case type selector
kurund [Sun, 1 Jun 2014 15:07:24 +0000 (20:37 +0530)]
fixed table formatting
kurund [Sun, 1 Jun 2014 15:05:33 +0000 (20:35 +0530)]
fixed formatting of buttons
kurund [Sun, 1 Jun 2014 14:54:51 +0000 (20:24 +0530)]
fixed generated data
kurund [Sun, 1 Jun 2014 14:50:06 +0000 (20:20 +0530)]
remove unwanted case type file, update navigation menu and add selector
Tim Otten [Sat, 31 May 2014 21:19:50 +0000 (14:19 -0700)]
Merge pull request #3398 from totten/4.4-define-webtest
CRM-14605 - Add define(CIVICRM_WEBTEST)
Tim Otten [Sat, 31 May 2014 21:16:31 +0000 (14:16 -0700)]
CRM-14605 - Add define(CIVICRM_WEBTEST)
This can be used by CiviTest/civicrm.settings*.php to select different
configuration options for web-tests and unit-tests.
Eileen McNaughton [Sat, 31 May 2014 08:17:41 +0000 (20:17 +1200)]
Merge pull request #3391 from eileenmcnaughton/CRM-14768
sample refactor CMS code out of core
Eileen McNaughton [Fri, 30 May 2014 21:52:27 +0000 (09:52 +1200)]
Merge pull request #3394 from monishdeb/CRM-14197
CRM-14917 upgrade fix
Tim Otten [Fri, 30 May 2014 20:41:01 +0000 (13:41 -0700)]
Merge pull request #3389 from totten/master-default-crud-links
CRM-14765 - CRM_Utils_System::createDefaultCrudLink
Tim Otten [Fri, 30 May 2014 20:35:24 +0000 (13:35 -0700)]
Merge pull request #3396 from totten/master-caseid-regr
Civi\CCase\Events - Fix test regressions
Tim Otten [Fri, 30 May 2014 20:34:40 +0000 (13:34 -0700)]
Civi\CCase\Events - Fix test regressions
CiviCRM [Fri, 30 May 2014 15:24:40 +0000 (20:54 +0530)]
CRM-14917 upgrade fix
----------------------------------------
* CRM-14917:
https://issues.civicrm.org/jira/browse/CRM-14917
CiviCRM [Fri, 30 May 2014 15:19:40 +0000 (20:49 +0530)]
Distmaker fixes for 4.5
Kurund Jalmi [Fri, 30 May 2014 11:20:14 +0000 (16:50 +0530)]
Merge pull request #3392 from monishdeb/CRM-13584
CRM-13584 reverted change
CiviCRM [Fri, 30 May 2014 10:53:30 +0000 (16:23 +0530)]
CRM-13584 reverted change
----------------------------------------
* CRM-13584: Localising the CiviCRM installation
https://issues.civicrm.org/jira/browse/CRM-13584
Eileen McNaughton [Fri, 30 May 2014 08:23:58 +0000 (20:23 +1200)]
sample refactor CMS code out of core
Tim Otten [Thu, 29 May 2014 23:28:36 +0000 (16:28 -0700)]
CRM-14765 - CRM_Utils_System::createDefaultCrudLink
Add helper for creating hyperlinks to entities based on the
entity-type/entity-id/desired-action. The link is determined
by the entity's BAO or by hook.
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
projects / civicrm-core.git / log