civicrm-core.git
10 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

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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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 :-)

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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.

10 years agoMerge pull request #1213 from yashodha/4.3.CRM-12451
Kurund Jalmi [Tue, 23 Jul 2013 18:22:45 +0000 (11:22 -0700)]
Merge pull request #1213 from yashodha/4.3.CRM-12451

CRM-12451

10 years agoMerge pull request #1210 from pradpnayak/CRM-13065
Dave Greenberg [Tue, 23 Jul 2013 17:59:55 +0000 (10:59 -0700)]
Merge pull request #1210 from pradpnayak/CRM-13065

-- fixed for CRM-13065

10 years agoMerge pull request #1223 from davecivicrm/CRM-13101
Tim Otten [Tue, 23 Jul 2013 17:31:37 +0000 (10:31 -0700)]
Merge pull request #1223 from davecivicrm/CRM-13101

CRM-13101 fix typo in widget css.

10 years agoCRM-13101 fix typo in widget css.
Dave Greenberg [Tue, 23 Jul 2013 16:42:08 +0000 (09:42 -0700)]
CRM-13101 fix typo in widget css.

----------------------------------------
* CRM-13101: Typo in contribution widget generated css for .crm-amounts
  http://issues.civicrm.org/jira/browse/CRM-13101

10 years agoCRM-13099 full text row count
Brian Shaughnessy [Tue, 23 Jul 2013 12:12:06 +0000 (08:12 -0400)]
CRM-13099 full text row count

10 years agoMerge pull request #1212 from yashodha/trunk
pratik-joshi [Tue, 23 Jul 2013 11:58:52 +0000 (04:58 -0700)]
Merge pull request #1212 from yashodha/trunk

CRM-13083

10 years agoCRM-12915, table level filtering support in change log report
Deepak Srivastava [Tue, 23 Jul 2013 11:46:35 +0000 (17:16 +0530)]
CRM-12915, table level filtering support in change log report

----------------------------------------
* CRM-12915: Improve layout of revision-history for multi-row CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12915

10 years agoCRM-13067 add test on membership batch entry
eileen [Mon, 22 Jul 2013 05:42:39 +0000 (17:42 +1200)]
CRM-13067 add test on membership batch entry

10 years agoMerge pull request #1218 from kurund/CRM-12995
Kurund Jalmi [Tue, 23 Jul 2013 05:56:33 +0000 (22:56 -0700)]
Merge pull request #1218 from kurund/CRM-12995

fixed for CRM-12995

10 years agofixed for CRM-12995
CiviCRM [Tue, 23 Jul 2013 05:30:34 +0000 (11:00 +0530)]
fixed for CRM-12995

----------------------------------------
* CRM-12995:
  http://issues.civicrm.org/jira/browse/CRM-12995

10 years agoCRM-12748, set 0 if do_not_* checkboxes are not checked
CiviCRM [Tue, 23 Jul 2013 05:18:43 +0000 (10:48 +0530)]
CRM-12748, set 0 if do_not_* checkboxes are not checked

----------------------------------------
* CRM-12748:
  http://issues.civicrm.org/jira/browse/CRM-12748

10 years agofixes for CRM-12848
CiviCRM [Tue, 23 Jul 2013 04:59:34 +0000 (10:29 +0530)]
fixes for CRM-12848

----------------------------------------
* CRM-12848:
  http://issues.civicrm.org/jira/browse/CRM-12848

10 years agoMerge pull request #1215 from davecivicrm/CRM-12717
colemanw [Mon, 22 Jul 2013 19:58:03 +0000 (12:58 -0700)]
Merge pull request #1215 from davecivicrm/CRM-12717

CRM-12717 Improve title of Miscellaneous system setting menu item and ha...

10 years agoMerge pull request #1035 from GiantRobot/CRM-12720
Kurund Jalmi [Mon, 22 Jul 2013 18:53:36 +0000 (11:53 -0700)]
Merge pull request #1035 from GiantRobot/CRM-12720

CRM-12720. Optionally accept processor_id for IPN

10 years agoCRM-12717 Improve title of Miscellaneous system setting menu item and handle in upgrade.
Dave Greenberg [Mon, 22 Jul 2013 17:57:10 +0000 (10:57 -0700)]
CRM-12717 Improve title of Miscellaneous system setting menu item and handle in upgrade.

----------------------------------------
* CRM-12717:
  http://issues.civicrm.org/jira/browse/CRM-12717

10 years agoMerge pull request #1208 from pradpnayak/CRM-13060
Dave Greenberg [Mon, 22 Jul 2013 17:04:43 +0000 (10:04 -0700)]
Merge pull request #1208 from pradpnayak/CRM-13060

--fixed for CRM-13060

10 years agoCRM-12451
yashodha [Mon, 22 Jul 2013 06:44:33 +0000 (12:14 +0530)]
CRM-12451

10 years agoMerge pull request #1211 from totten/master-userid-regr
Tim Otten [Sun, 21 Jul 2013 05:06:43 +0000 (22:06 -0700)]
Merge pull request #1211 from totten/master-userid-regr

CRM-12556 - Fix regressions in api_v3_RelationshipTest and api_v3_ActivityTest

10 years agoCRM-12556 - Fix regressions in api_v3_RelationshipTest and api_v3_ActivityTest
Tim Otten [Sun, 21 Jul 2013 05:05:35 +0000 (22:05 -0700)]
CRM-12556 - Fix regressions in api_v3_RelationshipTest and api_v3_ActivityTest

----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
  http://issues.civicrm.org/jira/browse/CRM-12556

10 years ago-- fixed for CRM-13065
Pradeep Nayak [Sat, 20 Jul 2013 20:33:02 +0000 (02:03 +0530)]
-- fixed for CRM-13065

----------------------------------------
* CRM-13065: Upgrade error
  http://issues.civicrm.org/jira/browse/CRM-13065

10 years agoMerge pull request #1209 from totten/contactid-userid
Tim Otten [Sat, 20 Jul 2013 20:11:56 +0000 (13:11 -0700)]
Merge pull request #1209 from totten/contactid-userid

CRM-12556 - api/v3 - Identify contacts by user name

10 years agoCRM-12556 - Add unit tests for fetching contact by username
Tim Otten [Sat, 20 Jul 2013 19:36:11 +0000 (12:36 -0700)]
CRM-12556 - Add unit tests for fetching contact by username

----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
  http://issues.civicrm.org/jira/browse/CRM-12556

10 years agoCRM-12556 - api_v3_ContactTest::testCreateNameIndividualOldKeys2 - Fix regression
Tim Otten [Sat, 20 Jul 2013 19:14:31 +0000 (12:14 -0700)]
CRM-12556 - api_v3_ContactTest::testCreateNameIndividualOldKeys2 - Fix regression

----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
  http://issues.civicrm.org/jira/browse/CRM-12556

10 years ago--fixed for CRM-13060
Pradeep Nayak [Sat, 20 Jul 2013 18:56:59 +0000 (00:26 +0530)]
--fixed for CRM-13060

----------------------------------------
* CRM-13060: Changing the Financial Type for Contribution pages and Events does not update the Financial Type selected for Price Sets and Price Field values
  http://issues.civicrm.org/jira/browse/CRM-13060

10 years agoCRM-12556 - Update to match newer parameter name
Tim Otten [Sat, 20 Jul 2013 18:01:16 +0000 (11:01 -0700)]
CRM-12556 - Update to match newer parameter name

----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
  http://issues.civicrm.org/jira/browse/CRM-12556

10 years agoCRM-12556 - Treat string "202" and number 202 the same
Tim Otten [Sat, 11 May 2013 00:17:40 +0000 (20:17 -0400)]
CRM-12556 - Treat string "202" and number 202 the same

----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
  http://issues.civicrm.org/jira/browse/CRM-12556

10 years agoCRM-12556 - api/v3 - Identify contacts by user name
Tim Otten [Fri, 10 May 2013 21:54:31 +0000 (17:54 -0400)]
CRM-12556 - api/v3 - Identify contacts by user name

Example: drush civicrm-api contact.get id=@user:demo

I read "System_Drupal::loadUser()" to get a starting point for writing
"System_Drupal::getUserId()"; however, only Drupal defines loadUser(), so
there was no starting point for the other CMSs.  This will degrade in a sane
way on other CMSs.

----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
  http://issues.civicrm.org/jira/browse/CRM-12556

10 years agoMerge pull request #1204 from davecivicrm/CRM-11662
Kurund Jalmi [Sat, 20 Jul 2013 12:19:10 +0000 (05:19 -0700)]
Merge pull request #1204 from davecivicrm/CRM-11662

CRM-11662 Add missing logic to copy case custom fields in CRM_Case_BAO_C...

10 years agoMerge pull request #1203 from davecivicrm/CRM-12700
Kurund Jalmi [Sat, 20 Jul 2013 12:14:24 +0000 (05:14 -0700)]
Merge pull request #1203 from davecivicrm/CRM-12700

CRM-12700 optional fifth parameter to CRM_Utils_Money::format allows cal...

10 years agoMerge pull request #1205 from totten/master-backbone-findcreate
Tim Otten [Fri, 19 Jul 2013 23:32:35 +0000 (16:32 -0700)]
Merge pull request #1205 from totten/master-backbone-findcreate

CRM-12943 - Add findCreate() helper

10 years agoCRM-12700 optional fifth parameter to CRM_Utils_Money::format allows caller to overri...
Dave Greenberg [Fri, 19 Jul 2013 23:23:46 +0000 (16:23 -0700)]
CRM-12700 optional fifth parameter to CRM_Utils_Money::format allows caller to override default money_value_format.

----------------------------------------
* CRM-12700: Allow monetary value (not amount) format override
  http://issues.civicrm.org/jira/browse/CRM-12700

10 years agoMerge pull request #1202 from kurund/CRM-11790
Kurund Jalmi [Fri, 19 Jul 2013 21:01:46 +0000 (14:01 -0700)]
Merge pull request #1202 from kurund/CRM-11790

CRM-11790

10 years agoCRM-12943 - Move Collection.fetchCreate() to CRM.Backbone.findCreate()
Tim Otten [Fri, 19 Jul 2013 21:01:14 +0000 (14:01 -0700)]
CRM-12943 - Move Collection.fetchCreate() to CRM.Backbone.findCreate()

This may be a subtle point, but in the current use-cases, we don't really
have a "collection" that we're trying to maintain.  We're just using the
collection to facilitate the search.  If have this helper a method of the
collection, then there are design questions about how one uses the
collection (eg with repeated calls to fetchCreate), but that's all
extraneous.

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

10 years agofixes notes display for search builder CRM-11790
Kurund Jalmi [Fri, 19 Jul 2013 21:00:20 +0000 (02:30 +0530)]
fixes notes display for search builder CRM-11790

10 years agoCRM-12943 - Add CRM.Backbone.*Collection.fetchCreate()
Tim Otten [Fri, 19 Jul 2013 20:51:30 +0000 (13:51 -0700)]
CRM-12943 - Add CRM.Backbone.*Collection.fetchCreate()

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

10 years agonotice fixes
Kurund Jalmi [Fri, 19 Jul 2013 20:35:15 +0000 (02:05 +0530)]
notice fixes

10 years agoMerge pull request #1201 from kurund/CRM-13015
Kurund Jalmi [Fri, 19 Jul 2013 19:57:12 +0000 (12:57 -0700)]
Merge pull request #1201 from kurund/CRM-13015

CRM-13015 changing label for Additional Address 1 & 2 to Supplemental Ad...

10 years agoMerge branch 'CRM-13015' of git://github.com/davecivicrm/civicrm-core into CRM-13015
Kurund Jalmi [Fri, 19 Jul 2013 19:55:10 +0000 (01:25 +0530)]
Merge branch 'CRM-13015' of git://github.com/davecivicrm/civicrm-core into CRM-13015

Conflicts:
CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl
sql/civicrm_generated.mysql

10 years agoCRM-11662 Add missing logic to copy case custom fields in CRM_Case_BAO_Case::mergeCases.
Dave Greenberg [Fri, 19 Jul 2013 19:51:28 +0000 (12:51 -0700)]
CRM-11662 Add missing logic to copy case custom fields in CRM_Case_BAO_Case::mergeCases.

----------------------------------------
* CRM-11662:
  http://issues.civicrm.org/jira/browse/CRM-11662

10 years agoMerge pull request #1200 from kurund/CRM-11790
Kurund Jalmi [Fri, 19 Jul 2013 19:30:01 +0000 (12:30 -0700)]
Merge pull request #1200 from kurund/CRM-11790

CRM-11790

10 years agoMerge pull request #1197 from monishdeb/CRM-12539
Kurund Jalmi [Fri, 19 Jul 2013 19:22:53 +0000 (12:22 -0700)]
Merge pull request #1197 from monishdeb/CRM-12539

CRM-12539 fix

10 years agoMerge pull request #1191 from davecivicrm/CRM-13034
Kurund Jalmi [Fri, 19 Jul 2013 19:22:07 +0000 (12:22 -0700)]
Merge pull request #1191 from davecivicrm/CRM-13034

CRM-13034 Fix formRule in Main.php to ensure that premium minimum req am...

10 years agoMerge pull request #1190 from davecivicrm/CRM-10935
Kurund Jalmi [Fri, 19 Jul 2013 19:21:20 +0000 (12:21 -0700)]
Merge pull request #1190 from davecivicrm/CRM-10935

CRM-10935

10 years agofixes to handle group and tag display in selector for search builder, CRM-11790
Kurund Jalmi [Fri, 19 Jul 2013 19:14:39 +0000 (00:44 +0530)]
fixes to handle group and tag display in selector for search builder, CRM-11790

10 years agocode cleanup
Kurund Jalmi [Fri, 19 Jul 2013 18:46:50 +0000 (00:16 +0530)]
code cleanup

10 years agocode cleanup
Kurund Jalmi [Fri, 19 Jul 2013 17:51:35 +0000 (23:21 +0530)]
code cleanup

10 years agoCRM-13015 changing label for Additional Address 1 & 2 to Supplemental Address. Change...
Dave Greenberg [Fri, 19 Jul 2013 16:49:34 +0000 (09:49 -0700)]
CRM-13015 changing label for Additional Address 1 & 2 to Supplemental Address. Changed address_options setting for new installs and upgrade to use updated label. Also corrected the upgrade of SMS option_value to use the localize method instead of looping on locales.

----------------------------------------
* CRM-13015: Additional Address label is confusing, consider changing it back to Supplemental Address
  http://issues.civicrm.org/jira/browse/CRM-13015

10 years agoCRM-12539 fix
monishdeb [Fri, 19 Jul 2013 14:37:56 +0000 (20:07 +0530)]
CRM-12539 fix

----------------------------------------
* CRM-12539: "Greater London" should be "London" in list of UK states and provinces
  http://issues.civicrm.org/jira/browse/CRM-12539

10 years agoMerge pull request #1196 from yashodha/4.3.CRM-13046
Kurund Jalmi [Fri, 19 Jul 2013 13:47:38 +0000 (06:47 -0700)]
Merge pull request #1196 from yashodha/4.3.CRM-13046

CRM-13046

10 years agonotice fixes
Kurund Jalmi [Fri, 19 Jul 2013 13:07:32 +0000 (18:37 +0530)]
notice fixes

10 years agoCRM-13046
yashodha [Fri, 19 Jul 2013 13:03:03 +0000 (18:33 +0530)]
CRM-13046

10 years agocode cleanup
Kurund Jalmi [Fri, 19 Jul 2013 11:21:12 +0000 (16:51 +0530)]
code cleanup