civicrm-core.git
11 years agoCRM-13072 further tweak on example formatter
eileen [Sat, 27 Jul 2013 22:46:45 +0000 (10:46 +1200)]
CRM-13072 further tweak on example formatter

11 years agoCRM-13072 update example template
eileen [Sat, 27 Jul 2013 22:31:57 +0000 (10:31 +1200)]
CRM-13072 update example template

11 years agoCRM-13072 fix non return on civicrm_api3 wrapper - how did that sneak in?
eileen [Sat, 27 Jul 2013 22:30:37 +0000 (10:30 +1200)]
CRM-13072 fix non return on civicrm_api3 wrapper - how did that sneak in?

11 years agoCRM-13072 fix documentMe to not show debug fields on nested items
eileen [Sat, 27 Jul 2013 21:57:00 +0000 (09:57 +1200)]
CRM-13072 fix documentMe to not show debug fields on nested items

11 years agoCRM-13072 set domain default for UF_Match on BAO layer rather than requiring on api
eileen [Sat, 27 Jul 2013 12:10:11 +0000 (00:10 +1200)]
CRM-13072 set domain default for UF_Match on BAO layer rather than requiring on api

11 years agoCRM-13072 test related cleanups - handled getcount on priceset (hackily), simplify...
eileen [Sat, 27 Jul 2013 12:04:20 +0000 (00:04 +1200)]
CRM-13072 test related cleanups - handled getcount on priceset (hackily), simplify membership, whitespace, declare price_field_id as a required field on price_field_value

11 years agoCRM-13072 more test upgrades
eileen [Sat, 27 Jul 2013 11:58:38 +0000 (23:58 +1200)]
CRM-13072 more test upgrades

11 years agoMerge pull request #1257 from davecivicrm/CRM-13110
Tim Otten [Sat, 27 Jul 2013 02:26:03 +0000 (19:26 -0700)]
Merge pull request #1257 from davecivicrm/CRM-13110

CRM-13110

11 years agoMerge pull request #1258 from totten/master-callapissuccess
Tim Otten [Sat, 27 Jul 2013 02:24:21 +0000 (19:24 -0700)]
Merge pull request #1258 from totten/master-callapissuccess

CiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls

11 years agoCiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls
Tim Otten [Sat, 27 Jul 2013 02:03:31 +0000 (19:03 -0700)]
CiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls

11 years agoComment fix and using self:: for all on line 2153
Dave Greenberg [Fri, 26 Jul 2013 23:47:24 +0000 (16:47 -0700)]
Comment fix and using self:: for all on line 2153

11 years agoFixed bug where delete membership task does not also delete related memberships....
Dave Greenberg [Fri, 26 Jul 2013 23:36:41 +0000 (16:36 -0700)]
Fixed bug where delete membership task does not also delete related memberships. Created a new del method in Membership BAO.

11 years agoRevert PR#980 Restore SOAP code CRM-12343
Coleman Watts [Fri, 26 Jul 2013 23:10:10 +0000 (16:10 -0700)]
Revert PR#980 Restore SOAP code CRM-12343

----------------------------------------
* CRM-12343: Remove Soap code
  http://issues.civicrm.org/jira/browse/CRM-12343

11 years agoFix group api to work with group_type param
Coleman Watts [Fri, 26 Jul 2013 21:17:17 +0000 (14:17 -0700)]
Fix group api to work with group_type param

11 years agoMerge pull request #1256 from totten/master-crmapi-json
colemanw [Fri, 26 Jul 2013 20:04:11 +0000 (13:04 -0700)]
Merge pull request #1256 from totten/master-crmapi-json

CRM-13121 - CRM.api - Always encode data with JSON

11 years agoCRM-13121 - CRM.api - Always encode data with JSON
Tim Otten [Fri, 26 Jul 2013 19:02:28 +0000 (12:02 -0700)]
CRM-13121 - CRM.api - Always encode data with JSON

The query-string encoder misencodes empty arrays -- and most likely
misencodes other things.

----------------------------------------
* CRM-13121: CRM.api cannot call "replace" with empty list
  http://issues.civicrm.org/jira/browse/CRM-13121

11 years agoMerge pull request #1251 from totten/master-bb-issaved
Tim Otten [Fri, 26 Jul 2013 18:13:39 +0000 (11:13 -0700)]
Merge pull request #1251 from totten/master-bb-issaved

CRM-12934 - Multiple Backbone updates

11 years agoMerge pull request #1253 from eileenmcnaughton/CRM-13072-testfixes
deepak-srivastava [Fri, 26 Jul 2013 09:07:04 +0000 (02:07 -0700)]
Merge pull request #1253 from eileenmcnaughton/CRM-13072-testfixes

CRM-13072 upgrade additional test classes

11 years agoCRM-13072 upgrade participant status test
eileen [Fri, 26 Jul 2013 09:02:22 +0000 (21:02 +1200)]
CRM-13072 upgrade participant status test

11 years agoCRM-13072 upgrade note test
eileen [Fri, 26 Jul 2013 08:57:04 +0000 (20:57 +1200)]
CRM-13072 upgrade note test

11 years agoCRM-13072 upgrade membership status test
eileen [Fri, 26 Jul 2013 08:52:40 +0000 (20:52 +1200)]
CRM-13072 upgrade membership status test

11 years agoCRM-13072 upgrade mailing test
eileen [Fri, 26 Jul 2013 08:46:05 +0000 (20:46 +1200)]
CRM-13072 upgrade mailing  test

11 years agoCRM-13072 upgrade mailing group test
eileen [Fri, 26 Jul 2013 08:33:13 +0000 (20:33 +1200)]
CRM-13072 upgrade mailing group test

11 years agoCRM-13072 fix activity contact test - fix delete function in tear down, use callAPISu...
eileen [Fri, 26 Jul 2013 08:25:09 +0000 (20:25 +1200)]
CRM-13072 fix activity contact test - fix delete function in tear down, use callAPISuccess & callAPIFailure, add comments to discourage proliferation of redundant failure tests

11 years agoCRM-13072 minor tweaks mail settings test
eileen [Fri, 26 Jul 2013 08:13:45 +0000 (20:13 +1200)]
CRM-13072 minor tweaks mail settings test

11 years agoCRM-13072 minor tweaks loc block test
eileen [Fri, 26 Jul 2013 08:13:01 +0000 (20:13 +1200)]
CRM-13072 minor tweaks loc block test

11 years agoCRM-13072 minor tweaks line item test
eileen [Fri, 26 Jul 2013 08:11:20 +0000 (20:11 +1200)]
CRM-13072 minor tweaks line item test

11 years agoCRM-13072 upgrade job test
eileen [Fri, 26 Jul 2013 08:09:24 +0000 (20:09 +1200)]
CRM-13072 upgrade job test

11 years agoCRM-13072 upgrade group test
eileen [Fri, 26 Jul 2013 08:00:49 +0000 (20:00 +1200)]
CRM-13072 upgrade group  test

11 years agoCRM-13072 upgrade group organization test
eileen [Fri, 26 Jul 2013 08:00:01 +0000 (20:00 +1200)]
CRM-13072 upgrade group organization test

11 years agoCRM-13072 upgrade group nesting test
eileen [Fri, 26 Jul 2013 07:58:34 +0000 (19:58 +1200)]
CRM-13072 upgrade group nesting test

11 years agoCRM-13072 upgrade additional test classes
eileen [Fri, 26 Jul 2013 07:31:11 +0000 (19:31 +1200)]
CRM-13072 upgrade additional test classes

11 years agoMerge pull request #1252 from eileenmcnaughton/CRM-13072-testfixes
Tim Otten [Fri, 26 Jul 2013 07:14:19 +0000 (00:14 -0700)]
Merge pull request #1252 from eileenmcnaughton/CRM-13072-testfixes

CRM-13072 fix new enotice

11 years agoCRM-13072 upgrade additional test classes including fixing activity.type.delete
eileen [Fri, 26 Jul 2013 07:12:09 +0000 (19:12 +1200)]
CRM-13072 upgrade additional test classes including fixing activity.type.delete

11 years agoCRM-13072 argh that last minute fix & the enotices git add tests/phpunit/CiviTest...
eileen [Fri, 26 Jul 2013 06:26:45 +0000 (18:26 +1200)]
CRM-13072 argh that last minute fix & the enotices git add tests/phpunit/CiviTest/CiviUnitTestCase.php

11 years agoCRM-13072 api improvements, return failed sql to permissioned users, cast getcount...
eileen [Fri, 26 Jul 2013 06:15:03 +0000 (18:15 +1200)]
CRM-13072 api improvements, return failed sql to permissioned users, cast getcount to an integer, whitespace

11 years agoCRM-13072 fix new enotice
eileen [Fri, 26 Jul 2013 05:51:29 +0000 (17:51 +1200)]
CRM-13072 fix new enotice

11 years agoCRM-12943 - crm.backbone.js - Allow saving of CRM collections
Tim Otten [Thu, 25 Jul 2013 23:45:30 +0000 (16:45 -0700)]
CRM-12943 - crm.backbone.js - Allow saving of CRM collections

Calling "collection.save()" will lead to "CRM.api(crmEntityName, "replace", ...)

----------------------------------------
* CRM-12943: Make HTML prototype of job UI functional
  http://issues.civicrm.org/jira/browse/CRM-12943

11 years agoCRM-12923 - Add CRM.Backbone.trackSoftDelete
Tim Otten [Thu, 25 Jul 2013 22:04:48 +0000 (15:04 -0700)]
CRM-12923 - Add CRM.Backbone.trackSoftDelete

----------------------------------------
* CRM-12923: Create HTML prototype of "Job Position" UI
  http://issues.civicrm.org/jira/browse/CRM-12923

11 years agoCRM-12923, CRM-12943 - Track whether model changes have been saved to the server
Tim Otten [Tue, 23 Jul 2013 18:00:32 +0000 (11:00 -0700)]
CRM-12923, CRM-12943 - Track whether model changes have been saved to the server

----------------------------------------
* CRM-12923: Create HTML prototype of "Job Position" UI
  http://issues.civicrm.org/jira/browse/CRM-12923
* CRM-12943: Make HTML prototype of job UI functional
  http://issues.civicrm.org/jira/browse/CRM-12943

11 years agoMerge pull request #1250 from eileenmcnaughton/CRM-13072-testfixes
Tim Otten [Fri, 26 Jul 2013 05:23:59 +0000 (22:23 -0700)]
Merge pull request #1250 from eileenmcnaughton/CRM-13072-testfixes

Crm 13072 testfixes - participanttest & syntax conformance

11 years agoCRM-13072 fix ParticipantTest (more)
eileen [Fri, 26 Jul 2013 05:18:44 +0000 (17:18 +1200)]
CRM-13072 fix ParticipantTest (more)

11 years agoCRM-13072 - removing version check from 'create' reveals the test is not ensuring...
eileen [Fri, 26 Jul 2013 05:14:04 +0000 (17:14 +1200)]
CRM-13072 - removing version check from 'create' reveals the test is not ensuring what it should ensure, marking incomplete, also added other valuable tests - but marking as incomplete because not all api conform yet

11 years agoMerge pull request #1249 from eileenmcnaughton/CRM-13072-testfixes
Tim Otten [Fri, 26 Jul 2013 04:56:30 +0000 (21:56 -0700)]
Merge pull request #1249 from eileenmcnaughton/CRM-13072-testfixes

Crm 13072 mark non-enotice compliant tests as such

11 years agoCRM-13072 mark tests not enotice compliant
eileen [Fri, 26 Jul 2013 04:51:19 +0000 (16:51 +1200)]
CRM-13072 mark tests not enotice compliant

11 years agoCRM-13072 upgrade getAndCheck function & participantTest class
eileen [Fri, 26 Jul 2013 04:32:30 +0000 (16:32 +1200)]
CRM-13072 upgrade getAndCheck function & participantTest class

11 years agoMerge pull request #1246 from eileenmcnaughton/CRM-13072-testfixes
Tim Otten [Fri, 26 Jul 2013 04:13:08 +0000 (21:13 -0700)]
Merge pull request #1246 from eileenmcnaughton/CRM-13072-testfixes

Crm 13072 Upgrade tests so that all api calls are required to pass

11 years agoCRM-13072 now that we have marked all non-enotice compliant tests lets default to...
eileen [Fri, 26 Jul 2013 03:47:27 +0000 (15:47 +1200)]
CRM-13072 now that we have marked all non-enotice compliant tests lets default to compliant

11 years agoCRM-13072 mark tests non-enotice compliant
eileen [Fri, 26 Jul 2013 03:29:44 +0000 (15:29 +1200)]
CRM-13072 mark tests non-enotice compliant

11 years agoCRM-13072 upgrade emailTest
eileen [Fri, 26 Jul 2013 03:04:19 +0000 (15:04 +1200)]
CRM-13072 upgrade emailTest

11 years agoCRM-13072 completely remove all references to the contributionCreate and contribution...
eileen [Fri, 26 Jul 2013 02:13:33 +0000 (14:13 +1200)]
CRM-13072 completely remove all references to the contributionCreate and contributionDelete functions that have caused a lot of problems for a long time & are currently causing tests to fail

11 years agoCRM-13072 mark non e-notice compliant tests
eileen [Fri, 26 Jul 2013 02:09:46 +0000 (14:09 +1200)]
CRM-13072 mark non e-notice compliant tests

11 years agoMerge pull request #1248 from davecivicrm/CRM-13100
Dave Greenberg [Thu, 25 Jul 2013 23:55:36 +0000 (16:55 -0700)]
Merge pull request #1248 from davecivicrm/CRM-13100

CRM-13100 Suggested syntax and spelling fixes.
Merging my own PR since it's so trivial.

11 years agoCRM-13100 Suggested syntax and spelling fixes.
Dave Greenberg [Thu, 25 Jul 2013 23:49:00 +0000 (16:49 -0700)]
CRM-13100 Suggested syntax and spelling fixes.

----------------------------------------
* CRM-13100: Membership: change text when creating login account
  http://issues.civicrm.org/jira/browse/CRM-13100

11 years agoCRM-13072 also remove failing delete call from CRM layer - batch entry
eileen [Thu, 25 Jul 2013 23:06:42 +0000 (11:06 +1200)]
CRM-13072 also remove failing delete call from CRM layer - batch entry

11 years agoEnotice compliance for mailing test
eileen [Thu, 25 Jul 2013 21:52:09 +0000 (09:52 +1200)]
Enotice compliance for mailing test

11 years agoCRM-13072 this is the last mole in our game of whack-a-mole. ie every fix after I...
eileen [Thu, 25 Jul 2013 20:53:08 +0000 (08:53 +1200)]
CRM-13072 this is the last mole in our game of whack-a-mole. ie every fix after I upgraded the parent class to fail on any failed api calls within it caused something eelse to pop up - but now all are passing

11 years agoCRM-13072 upgrade PaymentProcessTypeTest & PaymentProcessorTest to pass post update...
eileen [Thu, 25 Jul 2013 14:53:21 +0000 (02:53 +1200)]
CRM-13072 upgrade PaymentProcessTypeTest & PaymentProcessorTest to pass post update to delete validation

11 years agoCRM-13072 upgrade MembershipTypeTest to pass post update to delete validation
eileen [Thu, 25 Jul 2013 13:38:22 +0000 (01:38 +1200)]
CRM-13072 upgrade MembershipTypeTest to pass post update to delete validation

11 years agoCRM-13072 upgrade MembershipStatusTest to pass post -getcount fixes
eileen [Thu, 25 Jul 2013 12:56:08 +0000 (00:56 +1200)]
CRM-13072 upgrade MembershipStatusTest to pass post -getcount fixes

11 years agoCRM-13072 upgrade MailingTest to pass
eileen [Thu, 25 Jul 2013 12:09:54 +0000 (00:09 +1200)]
CRM-13072 upgrade MailingTest to pass

11 years agoCRM-13072 upgrade relationship & relationship type tests to pass
eileen [Thu, 25 Jul 2013 11:07:09 +0000 (23:07 +1200)]
CRM-13072 upgrade relationship & relationship type tests to pass

11 years agoCRM-13072 upgrade tag test & api classes to pass - although I think the idea of being...
eileen [Thu, 25 Jul 2013 09:29:05 +0000 (21:29 +1200)]
CRM-13072 upgrade tag test & api classes to pass - although I think the idea of being able to specify tag id on create is a bit dodge

11 years agoCRM-13072 upgrade Pledge Payment test classes to pass
eileen [Thu, 25 Jul 2013 07:47:23 +0000 (19:47 +1200)]
CRM-13072 upgrade Pledge Payment test classes to pass

11 years agoCRM-13072 upgrade Paritipant Payment test classes to pass
eileen [Thu, 25 Jul 2013 07:26:05 +0000 (19:26 +1200)]
CRM-13072 upgrade Paritipant Payment test classes to pass

11 years agoCRM-13072 shorten syntax conformance test class name
eileen [Thu, 25 Jul 2013 07:21:02 +0000 (19:21 +1200)]
CRM-13072 shorten syntax conformance test class name

11 years agoCRM-13072 upgrade Membership & Membership Payment test classes to pass
eileen [Thu, 25 Jul 2013 07:20:29 +0000 (19:20 +1200)]
CRM-13072 upgrade Membership & Membership Payment test classes to pass

11 years agoCRM-13072 upgrade Mailing Job test & api to pass
eileen [Thu, 25 Jul 2013 05:49:23 +0000 (17:49 +1200)]
CRM-13072 upgrade Mailing Job test & api to pass

11 years agoCRM-13072 upgrade LineItem test to pass
eileen [Thu, 25 Jul 2013 05:09:40 +0000 (17:09 +1200)]
CRM-13072 upgrade LineItem test to pass

11 years agoCRM-13072 fixes required to make JobTest pass now 'hidden' failures exposed
eileen [Thu, 25 Jul 2013 04:43:34 +0000 (16:43 +1200)]
CRM-13072 fixes required to make JobTest pass now 'hidden' failures exposed

11 years agoCRM-13072 standardise note BAO & API
eileen [Thu, 25 Jul 2013 04:10:20 +0000 (16:10 +1200)]
CRM-13072 standardise note BAO & API

11 years agoCRM-13072 upgrade CustomFieldTest
eileen [Thu, 25 Jul 2013 04:01:44 +0000 (16:01 +1200)]
CRM-13072 upgrade CustomFieldTest

11 years agoCRM-13072 upgrade ContributionTest
eileen [Thu, 25 Jul 2013 03:42:50 +0000 (15:42 +1200)]
CRM-13072 upgrade ContributionTest

11 years agoCRM-13072 upgrade contribution soft test as cannot pass without upgrade due to invali...
eileen [Thu, 25 Jul 2013 03:33:04 +0000 (15:33 +1200)]
CRM-13072 upgrade contribution soft test as cannot pass without upgrade due to invalid contributionTypeDelete call

11 years agoCRM-13072 standardise tag api to fix errors revealed by upgraded tests
eileen [Thu, 25 Jul 2013 03:25:28 +0000 (15:25 +1200)]
CRM-13072 standardise tag api to fix errors revealed by upgraded tests

11 years agoCRM-13072 fix getcount for DAO based classes
eileen [Thu, 25 Jul 2013 00:11:28 +0000 (12:11 +1200)]
CRM-13072 fix getcount for DAO based classes

Conflicts:

api/v3/Generic.php
api/v3/examples/OptionValue/SortOption.php
tests/phpunit/api/v3/OptionValueTest.php

11 years agoCRM-13072 siginificant test cleanup - parent class changes per http://wiki.civicrm...
eileen [Thu, 25 Jul 2013 02:59:08 +0000 (14:59 +1200)]
CRM-13072 siginificant test cleanup - parent class changes per wiki.civicrm.org/confluence/display/CRM/Writing+a+PHPUnit+testcase+HOWTO

11 years agoCRM-13072 fix getfields caching bug
eileen [Thu, 25 Jul 2013 02:58:54 +0000 (14:58 +1200)]
CRM-13072 fix getfields caching bug

11 years agoAnd the correct way to refactor a form layer extension on the BAO (when you can be...
eileen [Tue, 23 Jul 2013 10:48:44 +0000 (22:48 +1200)]
And the correct way to refactor a form layer extension on the BAO (when you can be sure it's only called from one place

11 years agoCRM-13098 don't do form layer redirects on BAO
eileen [Thu, 25 Jul 2013 01:50:40 +0000 (13:50 +1200)]
CRM-13098 don't do form layer redirects on BAO

11 years agoMerge pull request #1239 from eileenmcnaughton/master-eileen-entitytag
Tim Otten [Thu, 25 Jul 2013 01:54:28 +0000 (18:54 -0700)]
Merge pull request #1239 from eileenmcnaughton/master-eileen-entitytag

CRM-13072 Remove (deprecated) entity_tag_display as attempting to update...

11 years agoCRM-13072 Remove (deprecated) entity_tag_display as attempting to update the test...
eileen [Wed, 24 Jul 2013 22:05:53 +0000 (10:05 +1200)]
CRM-13072 Remove (deprecated) entity_tag_display as attempting to update the test reveals it has never worked via the api, I don't know what it should do, it's just a v2 hang-over & it is not called directly

Conflicts:

tests/phpunit/api/v3/EntityTagTest.php

----------------------------------------
* CRM-13072: Make PHPunit tests, api functions & BAO functions in the tests standards & E-notice compliant,
  http://issues.civicrm.org/jira/browse/CRM-13072

11 years agoMerge pull request #1231 from totten/master-reportinstance-api
Tim Otten [Thu, 25 Jul 2013 00:35:38 +0000 (17:35 -0700)]
Merge pull request #1231 from totten/master-reportinstance-api

CRM-12877 - Fixes for single-value alteration

11 years agoMerge pull request #1222 from lcdservices/CRM-13099
Dave Greenberg [Wed, 24 Jul 2013 23:11:31 +0000 (16:11 -0700)]
Merge pull request #1222 from lcdservices/CRM-13099

CRM-13099 full text row count
Recreated bug, patched and retested. Fixes the problem :-)

11 years agoCRM-13067 - CRM_Batch_Form_EntryTest::testProcessMembership - Fix failure
Tim Otten [Wed, 24 Jul 2013 22:32:56 +0000 (15:32 -0700)]
CRM-13067 - CRM_Batch_Form_EntryTest::testProcessMembership - Fix failure

Fix error: "Non-static method CRM_Contact_Form_Task_Batch::parseStreetAddress() should not be called statically, assuming $this from incompatible context"

----------------------------------------
* CRM-13067: Update BAO / API to clearly support membership payments following on from CiviAccounts. Reduce form layer duplication of api layer smarts on this
  http://issues.civicrm.org/jira/browse/CRM-13067

11 years agoMerge branch 'CRM-13067-add-test' of git://github.com/eileenmcnaughton/civicrm-core...
Tim Otten [Wed, 24 Jul 2013 22:32:35 +0000 (15:32 -0700)]
Merge branch 'CRM-13067-add-test' of git://github.com/eileenmcnaughton/civicrm-core into pull-request-1220

11 years agoMerge pull request #1236 from ravishnair/QAfix
deepak-srivastava [Wed, 24 Jul 2013 14:16:35 +0000 (07:16 -0700)]
Merge pull request #1236 from ravishnair/QAfix

-- CRM-12251 Minor QA fix

11 years ago-- CRM-12251 Minor QA fix
Ravish Nair [Wed, 24 Jul 2013 14:18:38 +0000 (19:48 +0530)]
-- CRM-12251 Minor QA fix

----------------------------------------
* CRM-12251: CiviMember Reports Improvements: Inner Join On Type vs Status and Add "Primary Member"
  http://issues.civicrm.org/jira/browse/CRM-12251

11 years agoMerge pull request #1234 from deepak-srivastava/revisions
deepak-srivastava [Wed, 24 Jul 2013 12:36:50 +0000 (05:36 -0700)]
Merge pull request #1234 from deepak-srivastava/revisions

CRM-12915, table level filtering support in change log report

11 years agoSyntaxConformanceAllEntitiesTest - Prettify optional error output
Tim Otten [Wed, 24 Jul 2013 07:15:42 +0000 (00:15 -0700)]
SyntaxConformanceAllEntitiesTest - Prettify optional error output

11 years agoCRM-12877 - ReportInstance API - Fixes for testCreateSingleValueAlter (report_id)
Tim Otten [Wed, 24 Jul 2013 07:14:51 +0000 (00:14 -0700)]
CRM-12877 - ReportInstance API - Fixes for testCreateSingleValueAlter (report_id)

----------------------------------------
* CRM-12877: Provide api for creating report instances
  http://issues.civicrm.org/jira/browse/CRM-12877

11 years agoCRM-12877 - ReportInstance API - Fixes for testCreateSingleValueAlter
Tim Otten [Wed, 24 Jul 2013 06:59:58 +0000 (23:59 -0700)]
CRM-12877 - ReportInstance API - Fixes for testCreateSingleValueAlter
 * group_role
 * is_reserved
 * header
 * footer

----------------------------------------
* CRM-12877: Provide api for creating report instances
  http://issues.civicrm.org/jira/browse/CRM-12877

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-23-17-12-38
Tim Otten [Wed, 24 Jul 2013 00:12:41 +0000 (17:12 -0700)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-23-17-12-38

11 years agoMerge pull request #1228 from totten/4.3-hook-reentrancy
Tim Otten [Tue, 23 Jul 2013 23:44:41 +0000 (16:44 -0700)]
Merge pull request #1228 from totten/4.3-hook-reentrancy

CRM-13103 - Fix hook re-entrancy

11 years agoMerge pull request #1172 from totten/master-crmContactField-widget
Dave Greenberg [Tue, 23 Jul 2013 23:22:43 +0000 (16:22 -0700)]
Merge pull request #1172 from totten/master-crmContactField-widget

CRM-12923 - Move $.fn.crmContactField to core

11 years agoCRM-13103 - Fix reentrant hook invocations
Tim Otten [Tue, 23 Jul 2013 23:05:43 +0000 (16:05 -0700)]
CRM-13103 - Fix reentrant hook invocations

----------------------------------------
* CRM-13103: Hook execution terminates prematurely
  http://issues.civicrm.org/jira/browse/CRM-13103

11 years agoCRM-13103 - CRM_Utils_HookTest
Tim Otten [Tue, 23 Jul 2013 22:23:50 +0000 (15:23 -0700)]
CRM-13103 - CRM_Utils_HookTest

Add unit test in which one hook calls another. Note that this unit-test
doesn't actually reproduce the issue for me (eg it incorrectly shows the
test as passing on code that doesn't work for me in real situations), but
it's still valuable in that it gives us better test coverage.

----------------------------------------
* CRM-13103: Hook execution terminates prematurely
  http://issues.civicrm.org/jira/browse/CRM-13103

11 years agoMerge pull request #1101 from totten/4.3-CRM-11160-msg
Dave Greenberg [Tue, 23 Jul 2013 23:13:50 +0000 (16:13 -0700)]
Merge pull request #1101 from totten/4.3-CRM-11160-msg

CRM-11160 - verifySSL - Display warning next to this config option

11 years agoMerge pull request #1224 from kurund/CRM-12848
Dave Greenberg [Tue, 23 Jul 2013 22:56:39 +0000 (15:56 -0700)]
Merge pull request #1224 from kurund/CRM-12848

fixes for CRM-12848

11 years agoMerge pull request #1225 from kurund/CRM-12748
Dave Greenberg [Tue, 23 Jul 2013 22:54:42 +0000 (15:54 -0700)]
Merge pull request #1225 from kurund/CRM-12748

CRM-12748, set 0 if do_not_* checkboxes are not checked
Tested the patch, works as expected now.