eileen [Thu, 25 Jul 2013 07:20:29 +0000 (19:20 +1200)]
CRM-13072 upgrade Membership & Membership Payment test classes to pass
eileen [Thu, 25 Jul 2013 05:49:23 +0000 (17:49 +1200)]
CRM-13072 upgrade Mailing Job test & api to pass
eileen [Thu, 25 Jul 2013 05:09:40 +0000 (17:09 +1200)]
CRM-13072 upgrade LineItem test to pass
eileen [Thu, 25 Jul 2013 04:43:34 +0000 (16:43 +1200)]
CRM-13072 fixes required to make JobTest pass now 'hidden' failures exposed
eileen [Thu, 25 Jul 2013 04:10:20 +0000 (16:10 +1200)]
CRM-13072 standardise note BAO & API
eileen [Thu, 25 Jul 2013 04:01:44 +0000 (16:01 +1200)]
CRM-13072 upgrade CustomFieldTest
eileen [Thu, 25 Jul 2013 03:42:50 +0000 (15:42 +1200)]
CRM-13072 upgrade ContributionTest
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
eileen [Thu, 25 Jul 2013 03:25:28 +0000 (15:25 +1200)]
CRM-13072 standardise tag api to fix errors revealed by upgraded tests
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
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
eileen [Thu, 25 Jul 2013 02:58:54 +0000 (14:58 +1200)]
CRM-13072 fix getfields caching bug
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
eileen [Thu, 25 Jul 2013 01:50:40 +0000 (13:50 +1200)]
CRM-13098 don't do form layer redirects on BAO
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
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 :-)
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
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
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
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
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
Tim Otten [Wed, 24 Jul 2013 07:15:42 +0000 (00:15 -0700)]
SyntaxConformanceAllEntitiesTest - Prettify optional error output
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
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
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
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
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
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
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
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
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
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.
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
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
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.
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
Brian Shaughnessy [Tue, 23 Jul 2013 12:12:06 +0000 (08:12 -0400)]
CRM-13099 full text row count
pratik-joshi [Tue, 23 Jul 2013 11:58:52 +0000 (04:58 -0700)]
Merge pull request #1212 from yashodha/trunk
CRM-13083
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
eileen [Mon, 22 Jul 2013 05:42:39 +0000 (17:42 +1200)]
CRM-13067 add test on membership batch entry
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
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
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
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
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...
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
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
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
yashodha [Mon, 22 Jul 2013 06:44:33 +0000 (12:14 +0530)]
CRM-12451
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
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
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
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
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
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
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
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
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
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
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...
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...
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
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
Kurund Jalmi [Fri, 19 Jul 2013 21:01:46 +0000 (14:01 -0700)]
Merge pull request #1202 from kurund/CRM-11790
CRM-11790
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
Kurund Jalmi [Fri, 19 Jul 2013 21:00:20 +0000 (02:30 +0530)]
fixes notes display for search builder CRM-11790
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
Kurund Jalmi [Fri, 19 Jul 2013 20:35:15 +0000 (02:05 +0530)]
notice fixes
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...
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
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
Kurund Jalmi [Fri, 19 Jul 2013 19:30:01 +0000 (12:30 -0700)]
Merge pull request #1200 from kurund/CRM-11790
CRM-11790
Kurund Jalmi [Fri, 19 Jul 2013 19:22:53 +0000 (12:22 -0700)]
Merge pull request #1197 from monishdeb/CRM-12539
CRM-12539 fix
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...
Kurund Jalmi [Fri, 19 Jul 2013 19:21:20 +0000 (12:21 -0700)]
Merge pull request #1190 from davecivicrm/CRM-10935
CRM-10935
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
Kurund Jalmi [Fri, 19 Jul 2013 18:46:50 +0000 (00:16 +0530)]
code cleanup
Kurund Jalmi [Fri, 19 Jul 2013 17:51:35 +0000 (23:21 +0530)]
code cleanup
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
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
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
Kurund Jalmi [Fri, 19 Jul 2013 13:07:32 +0000 (18:37 +0530)]
notice fixes
yashodha [Fri, 19 Jul 2013 13:03:03 +0000 (18:33 +0530)]
CRM-13046
Kurund Jalmi [Fri, 19 Jul 2013 11:21:12 +0000 (16:51 +0530)]
code cleanup
Kurund Jalmi [Fri, 19 Jul 2013 11:17:57 +0000 (04:17 -0700)]
Merge pull request #1189 from davecivicrm/CRM-13079
CRM-13079 Add logic to MembershipBlock formRule to verify that the numbe...
Kurund Jalmi [Fri, 19 Jul 2013 10:20:22 +0000 (03:20 -0700)]
Merge pull request #1194 from kurund/CRM-10976
CRM-10976
Kurund Jalmi [Fri, 19 Jul 2013 10:19:22 +0000 (15:49 +0530)]
typo fixes CRM-10976
Kurund Jalmi [Fri, 19 Jul 2013 10:13:16 +0000 (15:43 +0530)]
minor cleanup and added @todo for the future, CRM-10976
Kurund Jalmi [Fri, 19 Jul 2013 09:56:49 +0000 (15:26 +0530)]
display fixes for confirm and thankyou screens, CRM-10976
yashodha [Fri, 19 Jul 2013 09:15:00 +0000 (14:45 +0530)]
CRM-13083
colemanw [Fri, 19 Jul 2013 04:32:49 +0000 (21:32 -0700)]
Merge pull request #1193 from mlutfy/4.3-crm13082
CRM-13082: avoid showing twice custom fields for Case Activity form.
Mathieu Lutfy [Fri, 19 Jul 2013 03:32:31 +0000 (23:32 -0400)]
CRM-13082: avoid showing twice custom fields for Case Activity form.
Tim Otten [Fri, 19 Jul 2013 03:09:43 +0000 (20:09 -0700)]
Merge pull request #1192 from totten/CRM-12943-persistence
CRM-12943 - Backbone.sync persistence using CRM.api
Tim Otten [Fri, 19 Jul 2013 02:21:16 +0000 (19:21 -0700)]
CRM-12943: Cleanup
----------------------------------------
* CRM-12943
http://issues.civicrm.org/jira/browse/CRM-12943
Tim Otten [Fri, 19 Jul 2013 02:09:54 +0000 (19:09 -0700)]
Cleanup
Tim Otten [Fri, 19 Jul 2013 02:05:27 +0000 (19:05 -0700)]
CRM-12943 - Add support for "delete", incl test-case for "create+read+delete+read"
----------------------------------------
* CRM-12943: Make HTML prototype of job UI functional
http://issues.civicrm.org/jira/browse/CRM-12943
Tim Otten [Fri, 19 Jul 2013 01:47:25 +0000 (18:47 -0700)]
CRM-12943 - Add CRM.Backbone.sync with qUnit tests
----------------------------------------
* CRM-12943: Make HTML prototype of job UI functional
http://issues.civicrm.org/jira/browse/CRM-12943
Dave Greenberg [Fri, 19 Jul 2013 00:17:29 +0000 (17:17 -0700)]
CRM-13034 Fix formRule in Main.php to ensure that premium minimum req amount is checked regardless of whether contribution page contains a quick config amount_block OR has membership block or a price set.
----------------------------------------
* CRM-13034: Premium minimum price isn't checked if Amounts Block is deselected
http://issues.civicrm.org/jira/browse/CRM-13034
Dave Greenberg [Thu, 18 Jul 2013 22:30:11 +0000 (15:30 -0700)]
CRM-13079 Add logic to MembershipBlock formRule to verify that the number of enabled membership types is not greater than max allowed in the underlying CRM_Price_Field NUM_OPTION constant. Prevents silent failure. Also bump up the constant to 15 from 11.
----------------------------------------
* CRM-13079: hard limit on number of options for price field; no warning/error
http://issues.civicrm.org/jira/browse/CRM-13079
Tim Otten [Thu, 18 Jul 2013 19:10:22 +0000 (12:10 -0700)]
CRM-12923 - Move $.fn.crmContactField from rest.js to jquery.crmContactField.js
----------------------------------------
* CRM-12923: Create HTML prototype of "Job Position" UI
http://issues.civicrm.org/jira/browse/CRM-12923
projects / civicrm-core.git / log