Eileen McNaughton [Thu, 5 Jun 2014 00:36:24 +0000 (12:36 +1200)]
Merge pull request #3200 from eileenmcnaughton/code_tidy_up
Code tidy up
Eileen McNaughton [Thu, 5 Jun 2014 00:35:43 +0000 (12:35 +1200)]
don't pass as array as it makes it harder to identify what can be altered upstream
Eileen McNaughton [Thu, 5 Jun 2014 00:09:48 +0000 (12:09 +1200)]
Merge pull request #3357 from eileenmcnaughton/CRM-14743
CRM-14743 add support for api operators to modified_date & created_date
Eileen McNaughton [Wed, 4 Jun 2014 22:56:59 +0000 (10:56 +1200)]
Merge pull request #3423 from eileenmcnaughton/CRM-14778
CRM-14778 add unit test to help with testing changes
Tim Otten [Wed, 4 Jun 2014 21:42:27 +0000 (14:42 -0700)]
Merge pull request #3397 from totten/master-fulltext
CRM-14765 - FullText - Add "File" search. Split into smaller classes.
Tim Otten [Sat, 31 May 2014 01:21:41 +0000 (18:21 -0700)]
CRM-14765 - FullText - Find files using Drupal's Solr service.
Also: Bits of cleanup
Tim Otten [Fri, 30 May 2014 23:04:03 +0000 (16:04 -0700)]
CRM-14765 - FullText - Implement "File" search UI with mocked result data
Tim Otten [Fri, 30 May 2014 23:03:12 +0000 (16:03 -0700)]
Smarty - Add tag {crmCrudLink}
Tim Otten [Fri, 30 May 2014 22:51:43 +0000 (15:51 -0700)]
CRM_Utils_SQL_Insert
Tim Otten [Fri, 30 May 2014 23:47:40 +0000 (16:47 -0700)]
CRM-14765 - FullText - Retain limits as numbers so that they can be used with non-SQL searches. Only convert to SQL as-needed.
Tim Otten [Fri, 30 May 2014 08:07:52 +0000 (01:07 -0700)]
CRM-14765 - FullText - Split monolithic search class into 8 smaller classes with more explicit contracts
This will make it easier to understand what's going on when we add a new partial-query that is not backed by SQL.
In fact, it should make it easier to understand... period...
Tim Otten [Fri, 30 May 2014 06:27:40 +0000 (23:27 -0700)]
FullText - Reduce statefulness of various query-functions/helper-functions
Tim Otten [Fri, 30 May 2014 06:05:55 +0000 (23:05 -0700)]
FullText - Reduce silly indirection among fill*() and move*() helpers
Tim Otten [Fri, 30 May 2014 05:29:07 +0000 (22:29 -0700)]
CRM-14765 - FullText - Retain pristine "text".
Convert from pristine "text" to SQL only when constructing SQL. We need the
pristine "text" for use with other search systems (ie Solr).
Tim Otten [Fri, 30 May 2014 03:34:32 +0000 (20:34 -0700)]
FullText - Fix warnings
Tim Otten [Fri, 30 May 2014 03:25:50 +0000 (20:25 -0700)]
CRM-14765 - FullText - DRY; thinner constructor
Tim Otten [Wed, 4 Jun 2014 21:17:49 +0000 (14:17 -0700)]
Merge pull request #3432 from totten/master-casetype-optvals
crmCaseType - Get full, sorted list of activities and relationship-types
Tim Otten [Wed, 4 Jun 2014 21:16:26 +0000 (14:16 -0700)]
crmCaseType - Get full, sorted list of activities and relationship-types
Kurund Jalmi [Wed, 4 Jun 2014 15:24:47 +0000 (20:54 +0530)]
Merge pull request #3427 from monishdeb/CRM-14107
CRM-14107 fix for Full Text Search
Yashodha Chaku [Wed, 4 Jun 2014 12:46:09 +0000 (18:16 +0530)]
Merge pull request #3425 from atif-shaikh/CRM-11836
CRM-11836 Event Registrant is forced to select a Payment type when there...
CiviCRM [Wed, 4 Jun 2014 11:37:48 +0000 (17:07 +0530)]
CRM-14107 fix for Full Text Search
----------------------------------------
* CRM-14107: Implement Previous / Next navigation on contact summary pages when accessed from a custom search
https://issues.civicrm.org/jira/browse/CRM-14107
atif-shaikh [Wed, 4 Jun 2014 06:35:42 +0000 (12:05 +0530)]
CRM-11836 Event Registrant is forced to select a Payment type when there is no fee if pay later enabled
----------------------------------------
* CRM-11836: Event Registrant is forced to select a Payment type when there is no fee if pay later enabled
https://issues.civicrm.org/jira/browse/CRM-11836
Dave Greenberg [Wed, 4 Jun 2014 01:05:11 +0000 (18:05 -0700)]
Merge pull request #3424 from davecivicrm/CRM-14480
CRM-14480 - rebuilt civicrm_generated.mysql with correct navigation URL ...
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:59:40 +0000 (10:59 +1200)]
CRM-14778 add preliminary unit test on postProcess function
Eileen McNaughton [Tue, 3 Jun 2014 22:56:19 +0000 (10:56 +1200)]
enotice fix
Eileen McNaughton [Tue, 3 Jun 2014 22:53:29 +0000 (10:53 +1200)]
CRM-14778 remove unused var & move simple assignments to be at start of function
Eileen McNaughton [Tue, 3 Jun 2014 22:52:16 +0000 (10:52 +1200)]
CRM-14778 in order to add unit test separate out function that sets some amount params
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.
projects / civicrm-core.git / log