Tim Otten [Sun, 28 Jul 2013 22:07:31 +0000 (15:07 -0700)]
Merge pull request #1265 from totten/master-bb-ismodified
CRM-12923 - crm.backbone.js - Add isModified (in addition to isSaved)
Tim Otten [Sun, 28 Jul 2013 22:05:16 +0000 (15:05 -0700)]
CRM-12923 - crm.backbone.js - Add isModified (in addition to isSaved)
----------------------------------------
* CRM-12923: Create HTML prototype of "Job Position" UI
http://issues.civicrm.org/jira/browse/CRM-12923
colemanw [Sun, 28 Jul 2013 19:45:06 +0000 (12:45 -0700)]
Merge pull request #1264 from colemanw/pseudo
Support additional option lists - state, country, boolean CRM-12464
deepak-srivastava [Sun, 28 Jul 2013 14:36:23 +0000 (07:36 -0700)]
Merge pull request #1263 from deepak-srivastava/revisions
CRM-12915, common js file for CiviHR to load revisions inside a tab
Deepak Srivastava [Sun, 28 Jul 2013 14:33:36 +0000 (20:03 +0530)]
CRM-12915, common js file for CiviHR to load revisions inside a tab
----------------------------------------
* CRM-12915: Improve layout of revision-history for multi-row CustomGroups
http://issues.civicrm.org/jira/browse/CRM-12915
Coleman Watts [Sat, 27 Jul 2013 21:06:49 +0000 (14:06 -0700)]
Support additional option lists - state, country, boolean CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Kurund Jalmi [Sat, 27 Jul 2013 20:02:40 +0000 (13:02 -0700)]
Merge pull request #1261 from kurund/CRM-12994
CRM-12994, Premiums Section disabled, yet asking for No Thank You Title
kurund [Sat, 27 Jul 2013 20:00:22 +0000 (01:30 +0530)]
CRM-12994, js cleanup
----------------------------------------
* CRM-12994: Premiums Section disabled, yet asking for No Thank You Title
http://issues.civicrm.org/jira/browse/CRM-12994
kurund [Sat, 27 Jul 2013 19:32:47 +0000 (01:02 +0530)]
template cleanup
Kurund Jalmi [Sat, 27 Jul 2013 19:21:51 +0000 (12:21 -0700)]
Merge pull request #1260 from aadityawalawalkar/CRM-12994
CRM-12994 fix and web test
Kurund Jalmi [Sat, 27 Jul 2013 19:05:19 +0000 (12:05 -0700)]
Merge pull request #1214 from davecivicrm/CRM-12788
CRM-12788 MembershipBlock.tpl was missing the conditional to display mul...
Kurund Jalmi [Sat, 27 Jul 2013 19:01:57 +0000 (12:01 -0700)]
Merge pull request #1216 from davecivicrm/CRM-13062
CRM-13062 Fix various typos and obsolete admin menu paths.
Kurund Jalmi [Sat, 27 Jul 2013 19:00:53 +0000 (12:00 -0700)]
Merge pull request #1227 from PalanteJon/for-real-2
fixes CRM-13050 - incorporates Kurund's suggestion to use CRM_Core_DAO::VALUE_SEPARATOR
Kurund Jalmi [Sat, 27 Jul 2013 18:58:20 +0000 (11:58 -0700)]
Merge pull request #1238 from sfe-ev/CRM-12995_amend
Amend CRM-12995 fix
Kurund Jalmi [Sat, 27 Jul 2013 12:59:11 +0000 (05:59 -0700)]
Merge pull request #1226 from kurund/CRM-11137
CRM-11137
Kurund Jalmi [Sat, 27 Jul 2013 12:58:01 +0000 (05:58 -0700)]
Merge pull request #1243 from yashodha/4.4.CRM-13112
CRM-13112
Tim Otten [Sat, 27 Jul 2013 02:26:03 +0000 (19:26 -0700)]
Merge pull request #1257 from davecivicrm/CRM-13110
CRM-13110
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
Tim Otten [Sat, 27 Jul 2013 02:03:31 +0000 (19:03 -0700)]
CiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls
Dave Greenberg [Fri, 26 Jul 2013 23:47:24 +0000 (16:47 -0700)]
Comment fix and using self:: for all on line 2153
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.
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
Coleman Watts [Fri, 26 Jul 2013 21:17:17 +0000 (14:17 -0700)]
Fix group api to work with group_type param
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
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
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
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
eileen [Fri, 26 Jul 2013 09:02:22 +0000 (21:02 +1200)]
CRM-13072 upgrade participant status test
eileen [Fri, 26 Jul 2013 08:57:04 +0000 (20:57 +1200)]
CRM-13072 upgrade note test
eileen [Fri, 26 Jul 2013 08:52:40 +0000 (20:52 +1200)]
CRM-13072 upgrade membership status test
eileen [Fri, 26 Jul 2013 08:46:05 +0000 (20:46 +1200)]
CRM-13072 upgrade mailing test
eileen [Fri, 26 Jul 2013 08:33:13 +0000 (20:33 +1200)]
CRM-13072 upgrade mailing group test
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
eileen [Fri, 26 Jul 2013 08:13:45 +0000 (20:13 +1200)]
CRM-13072 minor tweaks mail settings test
eileen [Fri, 26 Jul 2013 08:13:01 +0000 (20:13 +1200)]
CRM-13072 minor tweaks loc block test
eileen [Fri, 26 Jul 2013 08:11:20 +0000 (20:11 +1200)]
CRM-13072 minor tweaks line item test
eileen [Fri, 26 Jul 2013 08:09:24 +0000 (20:09 +1200)]
CRM-13072 upgrade job test
eileen [Fri, 26 Jul 2013 08:00:49 +0000 (20:00 +1200)]
CRM-13072 upgrade group test
eileen [Fri, 26 Jul 2013 08:00:01 +0000 (20:00 +1200)]
CRM-13072 upgrade group organization test
eileen [Fri, 26 Jul 2013 07:58:34 +0000 (19:58 +1200)]
CRM-13072 upgrade group nesting test
eileen [Fri, 26 Jul 2013 07:31:11 +0000 (19:31 +1200)]
CRM-13072 upgrade additional test classes
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
eileen [Fri, 26 Jul 2013 07:12:09 +0000 (19:12 +1200)]
CRM-13072 upgrade additional test classes including fixing activity.type.delete
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
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
eileen [Fri, 26 Jul 2013 05:51:29 +0000 (17:51 +1200)]
CRM-13072 fix new enotice
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
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
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
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
eileen [Fri, 26 Jul 2013 05:18:44 +0000 (17:18 +1200)]
CRM-13072 fix ParticipantTest (more)
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
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
eileen [Fri, 26 Jul 2013 04:51:19 +0000 (16:51 +1200)]
CRM-13072 mark tests not enotice compliant
eileen [Fri, 26 Jul 2013 04:32:30 +0000 (16:32 +1200)]
CRM-13072 upgrade getAndCheck function & participantTest class
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
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
eileen [Fri, 26 Jul 2013 03:29:44 +0000 (15:29 +1200)]
CRM-13072 mark tests non-enotice compliant
eileen [Fri, 26 Jul 2013 03:04:19 +0000 (15:04 +1200)]
CRM-13072 upgrade emailTest
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
eileen [Fri, 26 Jul 2013 02:09:46 +0000 (14:09 +1200)]
CRM-13072 mark non e-notice compliant tests
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.
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
eileen [Thu, 25 Jul 2013 23:06:42 +0000 (11:06 +1200)]
CRM-13072 also remove failing delete call from CRM layer - batch entry
eileen [Thu, 25 Jul 2013 21:52:09 +0000 (09:52 +1200)]
Enotice compliance for mailing test
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
eileen [Thu, 25 Jul 2013 14:53:21 +0000 (02:53 +1200)]
CRM-13072 upgrade PaymentProcessTypeTest & PaymentProcessorTest 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
eileen [Thu, 25 Jul 2013 12:56:08 +0000 (00:56 +1200)]
CRM-13072 upgrade MembershipStatusTest to pass post -getcount fixes
eileen [Thu, 25 Jul 2013 12:09:54 +0000 (00:09 +1200)]
CRM-13072 upgrade MailingTest to pass
eileen [Thu, 25 Jul 2013 11:07:09 +0000 (23:07 +1200)]
CRM-13072 upgrade relationship & relationship type tests to pass
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
eileen [Thu, 25 Jul 2013 07:47:23 +0000 (19:47 +1200)]
CRM-13072 upgrade Pledge Payment test classes to pass
yashodha [Thu, 25 Jul 2013 07:29:51 +0000 (12:59 +0530)]
CRM-13112
eileen [Thu, 25 Jul 2013 07:26:05 +0000 (19:26 +1200)]
CRM-13072 upgrade Paritipant Payment test classes to pass
eileen [Thu, 25 Jul 2013 07:21:02 +0000 (19:21 +1200)]
CRM-13072 shorten syntax conformance test class name
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 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...
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
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
Olaf Buddenhagen [Thu, 25 Jul 2013 00:01:29 +0000 (02:01 +0200)]
Amend CRM-12995 fix
The regression introduced in
8bab0eb08b9862b49b02e914321bd15c0aca487e
(mismerge of patch for http://issues.civicrm.org/jira/browse/CRM-12172 )
was fixed in
14c8cdaa39005e0752e8beca670faa470b2147ce only partially.
This commit adds the rest of the necessary fix to fully undo the
original regression.
(Note: I have not really tested the effect of the amended fix, as I
don't know in what situations it shows -- I only discovered this in the
code while looking for another regression... It's a pretty obvious
change though.)
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
projects / civicrm-core.git / log