civicrm-core.git
10 years agoMerge pull request #3421 from colemanw/search
colemanw [Sun, 8 Jun 2014 08:30:51 +0000 (09:30 +0100)]
Merge pull request #3421 from colemanw/search

CRM-12872 - Search js fixes and improvements

10 years agoMerge pull request #3451 from totten/master-fts-idx
Tim Otten [Sun, 8 Jun 2014 00:07:25 +0000 (17:07 -0700)]
Merge pull request #3451 from totten/master-fts-idx

CRM-14811 - Full Text Search - Optional optimizations for MySQL 5.6+

10 years agoCRM-14811 - AbstractPartialQuery - Doc tweak
Tim Otten [Sun, 8 Jun 2014 00:05:27 +0000 (17:05 -0700)]
CRM-14811 - AbstractPartialQuery - Doc tweak

10 years agoMerge pull request #3367 from kirkatcaat/empty-labels-on-profile-fields
Dave Greenberg [Sat, 7 Jun 2014 18:02:40 +0000 (11:02 -0700)]
Merge pull request #3367 from kirkatcaat/empty-labels-on-profile-fields

CRM-14747 - Profiles - Fixed error caused by profile fields with empty labels

10 years agoMerge pull request #3447 from monishdeb/CRM-14800
Dave Greenberg [Sat, 7 Jun 2014 17:43:34 +0000 (10:43 -0700)]
Merge pull request #3447 from monishdeb/CRM-14800

CRM-14800 fix - Contact merge deletes a contribution record if it is linked to a membership being merged

10 years agoMerge pull request #3445 from systopia/master
Dave Greenberg [Sat, 7 Jun 2014 17:02:39 +0000 (10:02 -0700)]
Merge pull request #3445 from systopia/master

CRM-14802 fixed missing ts tags in mailing form and member dashboard

10 years agoMerge pull request #3446 from systopia/CRM-14804
Dave Greenberg [Sat, 7 Jun 2014 16:52:55 +0000 (09:52 -0700)]
Merge pull request #3446 from systopia/CRM-14804

CRM-14804 order participant statuses by weighting

10 years agoMerge pull request #3414 from jaapjansma/CRM-12789
Kurund Jalmi [Sat, 7 Jun 2014 13:14:33 +0000 (18:44 +0530)]
Merge pull request #3414 from jaapjansma/CRM-12789

added the country api

10 years agoMerge pull request #3437 from pratik-joshi/CRM-11966
Kurund Jalmi [Sat, 7 Jun 2014 12:55:11 +0000 (18:25 +0530)]
Merge pull request #3437 from pratik-joshi/CRM-11966

CRM-11966 : CiviCRM gives whitescreen on all pages if HTML_PURIFIER module is enabled

10 years agoMerge pull request #3430 from divya-jose/notices
Kurund Jalmi [Sat, 7 Jun 2014 12:53:54 +0000 (18:23 +0530)]
Merge pull request #3430 from divya-jose/notices

--HR-303 modification to fix notices while disabling casetype extension

10 years agoMerge pull request #3428 from jitendrapurohit/CRM-14222
Kurund Jalmi [Sat, 7 Jun 2014 12:53:18 +0000 (18:23 +0530)]
Merge pull request #3428 from jitendrapurohit/CRM-14222

CRM-14222

10 years agoCRM-14811 - Check "enable_innodb_fts" during upgrades
Tim Otten [Sat, 7 Jun 2014 03:10:49 +0000 (20:10 -0700)]
CRM-14811 - Check "enable_innodb_fts" during upgrades

10 years agoCRM-14811 - "Adminster => System => Misc" - Add option to enable InnoDB FTS
Tim Otten [Sat, 7 Jun 2014 02:40:58 +0000 (19:40 -0700)]
CRM-14811 - "Adminster => System => Misc" - Add option to enable InnoDB FTS

10 years agoCRM-14811 - FullText - Use InnoDB FTS when available.
Tim Otten [Sat, 7 Jun 2014 02:26:47 +0000 (19:26 -0700)]
CRM-14811 - FullText - Use InnoDB FTS when available.

10 years agoCRM-14811 - Add setting "enable_innodb_fts". Changes trigger InnoDBIndexer->fixSchema...
Tim Otten [Sat, 7 Jun 2014 01:32:24 +0000 (18:32 -0700)]
CRM-14811 - Add setting "enable_innodb_fts". Changes trigger InnoDBIndexer->fixSchemaDifferences.

10 years agoCRM-14811 - Add CRM_Core_InnoDBIndexer
Tim Otten [Sat, 7 Jun 2014 01:23:24 +0000 (18:23 -0700)]
CRM-14811 - Add CRM_Core_InnoDBIndexer

10 years agoCRM-14800 fix - Contact merge deletes a contribution record if it is linked to a...
CiviCRM [Fri, 6 Jun 2014 13:44:12 +0000 (19:14 +0530)]
CRM-14800 fix - Contact merge deletes a contribution record if it is linked to a membership being merged

https://issues.civicrm.org/jira/browse/CRM-14800

10 years agoorder participant statuses by weighting
systopia [Fri, 6 Jun 2014 11:32:18 +0000 (13:32 +0200)]
order participant statuses by weighting

10 years agoorder participant statuses by weighting
systopia [Fri, 6 Jun 2014 11:25:16 +0000 (13:25 +0200)]
order participant statuses by weighting

10 years ago--fixes
Divya Jose [Fri, 6 Jun 2014 10:17:48 +0000 (15:47 +0530)]
--fixes

10 years ago--HR-303 modification to fix notices while disabling casetype extension
Divya Jose [Wed, 4 Jun 2014 15:05:35 +0000 (20:35 +0530)]
--HR-303 modification to fix notices while disabling casetype extension

10 years agofixed missing ts tags in mailing form and member dashboard
systopia [Fri, 6 Jun 2014 09:52:20 +0000 (11:52 +0200)]
fixed missing ts tags in mailing form and member dashboard

10 years agoMerge pull request #3436 from monishdeb/upgrade-fix
Yashodha Chaku [Fri, 6 Jun 2014 09:13:33 +0000 (14:43 +0530)]
Merge pull request #3436 from monishdeb/upgrade-fix

4.5 upgrade fix

10 years agoMerge pull request #3429 from PoonamNalawade/HR-368
Yashodha Chaku [Fri, 6 Jun 2014 07:54:30 +0000 (13:24 +0530)]
Merge pull request #3429 from PoonamNalawade/HR-368

--HR-368 Changes for find case result

10 years agoCRM-14737 - Search js - clear row-highlight class when clearing checkboxes
Coleman Watts [Thu, 5 Jun 2014 21:46:01 +0000 (22:46 +0100)]
CRM-14737 - Search js - clear row-highlight class when clearing checkboxes

10 years agoEnsure headers are set correctly for json output
Coleman Watts [Thu, 5 Jun 2014 21:38:43 +0000 (22:38 +0100)]
Ensure headers are set correctly for json output

10 years agoMerge pull request #3444 from davecivicrm/CRM-14801
Dave Greenberg [Thu, 5 Jun 2014 21:36:50 +0000 (14:36 -0700)]
Merge pull request #3444 from davecivicrm/CRM-14801

CRM-14801 - fix notices and fix code so option_values for Address Provid...

10 years agoCRM-12872 - Search js - toward popup actions
Coleman Watts [Thu, 5 Jun 2014 18:52:32 +0000 (19:52 +0100)]
CRM-12872 - Search js - toward popup actions

10 years agoCRM-14801 - fix notices and fix code so option_values for Address Provider are passed...
Dave Greenberg [Thu, 5 Jun 2014 21:35:52 +0000 (14:35 -0700)]
CRM-14801 - fix notices and fix code so option_values for Address Provider are passed to parent buildQuickForm class.

----------------------------------------
* CRM-14801:
  https://issues.civicrm.org/jira/browse/CRM-14801

10 years agoMerge pull request #3435 from eileenmcnaughton/code-tidies
Tim Otten [Thu, 5 Jun 2014 21:32:41 +0000 (14:32 -0700)]
Merge pull request #3435 from eileenmcnaughton/code-tidies

spelling & removed unused var / fix impossible return

10 years agoMerge pull request #3443 from davecivicrm/CRM-14767
Dave Greenberg [Thu, 5 Jun 2014 16:45:25 +0000 (09:45 -0700)]
Merge pull request #3443 from davecivicrm/CRM-14767

CRM-14767 - include option to enter address parts when adding address in...

10 years agoCRM-14767 - include option to enter address parts when adding address inline edit.
Dave Greenberg [Thu, 5 Jun 2014 16:41:44 +0000 (09:41 -0700)]
CRM-14767 - include option to enter address parts when adding address inline edit.

----------------------------------------
* CRM-14767:
  https://issues.civicrm.org/jira/browse/CRM-14767

10 years ago4.5 upgrade fix
CiviCRM [Thu, 5 Jun 2014 11:10:40 +0000 (16:40 +0530)]
4.5 upgrade fix

10 years agoCRM-11966 : rework on patch : https://github.com/civicrm/civicrm-core/pull/2652
CiviCRM [Thu, 5 Jun 2014 10:50:04 +0000 (16:20 +0530)]
CRM-11966 : rework on patch : https://github.com/civicrm/civicrm-core/pull/2652

10 years agoMerge pull request #3179 from webpartners/master
Yashodha Chaku [Thu, 5 Jun 2014 07:25:39 +0000 (12:55 +0530)]
Merge pull request #3179 from webpartners/master

Fixed CRM-14650: Display name does not have individual prefix and suffix after inline-edit the contact

10 years agoCRM-14222
CiviCRM [Thu, 5 Jun 2014 06:34:26 +0000 (12:04 +0530)]
CRM-14222

10 years agoCRM-14222
CiviCRM [Wed, 4 Jun 2014 12:36:47 +0000 (18:06 +0530)]
CRM-14222

10 years agospelling & removed unused var / fix impossible return
Eileen McNaughton [Thu, 5 Jun 2014 03:54:29 +0000 (15:54 +1200)]
spelling & removed unused var / fix impossible return

10 years agoMerge pull request #3426 from eileenmcnaughton/CRM-14793
Eileen McNaughton [Thu, 5 Jun 2014 01:47:40 +0000 (13:47 +1200)]
Merge pull request #3426 from eileenmcnaughton/CRM-14793

CRM-14793 line item data incorrect with batch entry under some circumstances

10 years agoMerge pull request #3378 from eileenmcnaughton/CRM-14263
Eileen McNaughton [Thu, 5 Jun 2014 01:47:19 +0000 (13:47 +1200)]
Merge pull request #3378 from eileenmcnaughton/CRM-14263

CRM-14263 search results fail on Home address

10 years agoCRM-14263 test & fix search builder failure to retrieve address results
Eileen McNaughton [Wed, 28 May 2014 04:20:05 +0000 (16:20 +1200)]
CRM-14263 test & fix search builder failure to retrieve address results

10 years agoCRM-14263 - search profiles from search builder not working
Eileen McNaughton [Wed, 28 May 2014 03:59:55 +0000 (15:59 +1200)]
CRM-14263 - search profiles from search builder not working

10 years agoMerge pull request #3434 from davecivicrm/CRM-14798
Dave Greenberg [Thu, 5 Jun 2014 01:38:28 +0000 (18:38 -0700)]
Merge pull request #3434 from davecivicrm/CRM-14798

CRM-14798 - partial fix for read-only case type name. remove New Case ty...

10 years agoCRM-14798 - partial fix for read-only case type name. remove New Case type default...
Dave Greenberg [Thu, 5 Jun 2014 01:35:57 +0000 (18:35 -0700)]
CRM-14798 - partial fix for read-only case type name. remove New Case type default title.

----------------------------------------
* CRM-14798:
  https://issues.civicrm.org/jira/browse/CRM-14798

10 years agoMerge pull request #3433 from davecivicrm/CRM-14798
Dave Greenberg [Thu, 5 Jun 2014 01:24:37 +0000 (18:24 -0700)]
Merge pull request #3433 from davecivicrm/CRM-14798

Add theming classes for consistency with standard Civi UI.

10 years agoAdd theming classes for consistency with standard Civi UI.
Dave Greenberg [Thu, 5 Jun 2014 01:22:05 +0000 (18:22 -0700)]
Add theming classes for consistency with standard Civi UI.

10 years agoMerge pull request #3200 from eileenmcnaughton/code_tidy_up
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

10 years agodon't pass as array as it makes it harder to identify what can be altered upstream
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

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

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

10 years agoMerge pull request #3397 from totten/master-fulltext
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.

10 years agoCRM-14765 - FullText - Find files using Drupal's Solr service.
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

10 years agoCRM-14765 - FullText - Implement "File" search UI with mocked result data
Tim Otten [Fri, 30 May 2014 23:04:03 +0000 (16:04 -0700)]
CRM-14765 - FullText - Implement "File" search UI with mocked result data

10 years agoSmarty - Add tag {crmCrudLink}
Tim Otten [Fri, 30 May 2014 23:03:12 +0000 (16:03 -0700)]
Smarty - Add tag {crmCrudLink}

10 years agoCRM_Utils_SQL_Insert
Tim Otten [Fri, 30 May 2014 22:51:43 +0000 (15:51 -0700)]
CRM_Utils_SQL_Insert

10 years agoCRM-14765 - FullText - Retain limits as numbers so that they can be used with non...
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.

10 years agoCRM-14765 - FullText - Split monolithic search class into 8 smaller classes with...
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...

10 years agoFullText - Reduce statefulness of various query-functions/helper-functions
Tim Otten [Fri, 30 May 2014 06:27:40 +0000 (23:27 -0700)]
FullText - Reduce statefulness of various query-functions/helper-functions

10 years agoFullText - Reduce silly indirection among fill*() and move*() helpers
Tim Otten [Fri, 30 May 2014 06:05:55 +0000 (23:05 -0700)]
FullText - Reduce silly indirection among fill*() and move*() helpers

10 years agoCRM-14765 - FullText - Retain pristine "text".
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).

10 years agoFullText - Fix warnings
Tim Otten [Fri, 30 May 2014 03:34:32 +0000 (20:34 -0700)]
FullText - Fix warnings

10 years agoCRM-14765 - FullText - DRY; thinner constructor
Tim Otten [Fri, 30 May 2014 03:25:50 +0000 (20:25 -0700)]
CRM-14765 - FullText - DRY; thinner constructor

10 years agoMerge pull request #3432 from totten/master-casetype-optvals
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

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

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

10 years ago--HR-368 Changes for find case result
Poonam [Wed, 4 Jun 2014 13:59:53 +0000 (19:29 +0530)]
--HR-368 Changes for find case result

10 years agoMerge pull request #3425 from atif-shaikh/CRM-11836
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...

10 years agoCRM-14107 fix for Full Text Search
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

10 years agoCRM-14793 use longer var name that clarifies what type of field
Eileen McNaughton [Wed, 4 Jun 2014 09:41:15 +0000 (21:41 +1200)]
CRM-14793 use longer var name that clarifies what type of field

10 years agoCRM-14793 this is the actual fix. we will put this on all our 4.4 sites
Eileen McNaughton [Wed, 4 Jun 2014 09:38:41 +0000 (21:38 +1200)]
CRM-14793 this is the actual fix. we will put this on all our 4.4 sites

10 years agoCRM-14793 add test for incorrect behaviour
Eileen McNaughton [Wed, 4 Jun 2014 09:19:32 +0000 (21:19 +1200)]
CRM-14793 add test for incorrect behaviour

10 years agoCRM-14793 preliminary tidy up batch process contribution
Eileen McNaughton [Wed, 4 Jun 2014 09:18:24 +0000 (21:18 +1200)]
CRM-14793 preliminary tidy up batch process contribution

10 years agoCRM-14793 preliminary e-notice fix on pricefield api
Eileen McNaughton [Wed, 4 Jun 2014 09:17:22 +0000 (21:17 +1200)]
CRM-14793 preliminary e-notice fix on pricefield api

10 years agoCRM-14737 - Search js - add comments and cleanup
Coleman Watts [Wed, 4 Jun 2014 07:57:35 +0000 (08:57 +0100)]
CRM-14737 - Search js - add comments and cleanup

10 years agoCRM-11836 Event Registrant is forced to select a Payment type when there is no fee...
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

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

10 years agoCRM-14480 - rebuilt civicrm_generated.mysql with correct navigation URL for new Case...
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

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

10 years agoCRM-14778 add preliminary unit test on postProcess function
Eileen McNaughton [Tue, 3 Jun 2014 22:59:40 +0000 (10:59 +1200)]
CRM-14778 add preliminary unit test on postProcess function

10 years agoenotice fix
Eileen McNaughton [Tue, 3 Jun 2014 22:56:19 +0000 (10:56 +1200)]
enotice fix

10 years agoCRM-14778 remove unused var & move simple assignments to be at start of function
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

10 years agoCRM-14778 in order to add unit test separate out function that sets some amount params
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

10 years agoMerge pull request #3422 from eileenmcnaughton/test_fixes
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

10 years agotest - fix api_mail_settings test
Eileen McNaughton [Tue, 3 Jun 2014 22:42:15 +0000 (10:42 +1200)]
test - fix api_mail_settings test

10 years agoapi contribution page default to is_active
Eileen McNaughton [Tue, 3 Jun 2014 22:36:52 +0000 (10:36 +1200)]
api contribution page default to is_active

10 years agoformatting & comment fixes
Eileen McNaughton [Tue, 3 Jun 2014 22:36:25 +0000 (10:36 +1200)]
formatting & comment fixes

10 years agoPriceSet BAO - fix spelling & remove unused var
Eileen McNaughton [Tue, 3 Jun 2014 21:35:49 +0000 (09:35 +1200)]
PriceSet BAO - fix spelling & remove unused var

10 years agoCRM-14737 - Clear unwanted checkboxes after search action
Coleman Watts [Tue, 3 Jun 2014 22:04:06 +0000 (23:04 +0100)]
CRM-14737 - Clear unwanted checkboxes after search action

10 years agoAdd select2 to group lists
Coleman Watts [Tue, 3 Jun 2014 21:41:01 +0000 (22:41 +0100)]
Add select2 to group lists

10 years agoMerge pull request #3420 from eileenmcnaughton/test_fixes
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

10 years agoCRM-12872 - Consolidate search js for ajax vs simple selections
Coleman Watts [Tue, 3 Jun 2014 21:17:13 +0000 (22:17 +0100)]
CRM-12872 - Consolidate search js for ajax vs simple selections

10 years agofix spelling
Eileen McNaughton [Tue, 3 Jun 2014 21:09:06 +0000 (09:09 +1200)]
fix spelling

10 years agoapi_contribution_page - default to is_active
Eileen McNaughton [Tue, 3 Jun 2014 21:06:10 +0000 (09:06 +1200)]
api_contribution_page - default to is_active

10 years agofix api price field value - 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

10 years agoFix & test mail setting caching to fix test
Eileen McNaughton [Tue, 3 Jun 2014 20:33:03 +0000 (08:33 +1200)]
Fix & test mail setting caching to fix test

10 years agoMerge pull request #3419 from eileenmcnaughton/test_fixes
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

10 years agoSyntax conformance test fixes
Eileen McNaughton [Tue, 3 Jun 2014 20:06:57 +0000 (08:06 +1200)]
Syntax conformance test fixes

10 years agoMerge pull request #3418 from yashodha/version-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

10 years agoupdates for next version release
CiviCRM [Tue, 3 Jun 2014 14:06:04 +0000 (19:36 +0530)]
updates for next version release

10 years agoMerge pull request #3417 from eileenmcnaughton/test_fixes
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