Dave Greenberg [Mon, 6 Jan 2014 19:13:28 +0000 (11:13 -0800)]
CRM-14047 - add clarification text to Total Fee(s) display
----------------------------------------
* CRM-14047: Online event registration: add text to clarify the meaning of the Total Fee(s) calculated value
http://issues.civicrm.org/jira/browse/CRM-14047
Yashodha Chaku [Mon, 6 Jan 2014 11:36:43 +0000 (03:36 -0800)]
Merge pull request #2290 from yashodha/CRM-13892
CRM-13892 : fix upgrade function
yashodha [Mon, 6 Jan 2014 08:11:44 +0000 (13:41 +0530)]
CRM-13892 : fix upgrade function
Yashodha Chaku [Mon, 6 Jan 2014 08:07:10 +0000 (00:07 -0800)]
Merge pull request #2273 from monishdeb/CRM-13977
CRM-13977 related fix
Kurund Jalmi [Mon, 6 Jan 2014 05:41:57 +0000 (21:41 -0800)]
Merge pull request #2285 from eileenmcnaughton/extra-test
Extra test, a couple of tidy-ups
Kurund Jalmi [Mon, 6 Jan 2014 05:39:40 +0000 (21:39 -0800)]
Merge pull request #2257 from kurund/CRM-14004
fixes for CRM-14004, duplicate memberships
pratik-joshi [Sun, 5 Jan 2014 10:01:21 +0000 (02:01 -0800)]
Merge pull request #2286 from pratik-joshi/CRM-14030
CRM-14030 : applied patch for 4.4 version
Pratik Joshi [Sun, 5 Jan 2014 09:50:38 +0000 (15:20 +0530)]
CRM-14030 : applied patch for 4.4 version
Eileen [Sun, 5 Jan 2014 07:07:34 +0000 (20:07 +1300)]
extra setting test - hookt pu
Eileen [Sun, 5 Jan 2014 03:04:09 +0000 (16:04 +1300)]
fix mis-spellings & undeclared variables
colemanw [Sun, 5 Jan 2014 02:21:27 +0000 (18:21 -0800)]
Merge pull request #2284 from eileenmcnaughton/extra-test
Additional Test, fix typos (mis-cased class-names), commit updated test-...
Eileen [Sun, 5 Jan 2014 01:46:58 +0000 (14:46 +1300)]
Additional Test, fix typos (mis-cased class-names), commit updated test-generated examples
colemanw [Fri, 3 Jan 2014 23:51:02 +0000 (15:51 -0800)]
Merge pull request #2272 from eileenmcnaughton/test-fixes
Test fixes / enotice compliance
colemanw [Fri, 3 Jan 2014 23:39:21 +0000 (15:39 -0800)]
Merge pull request #2277 from eileenmcnaughton/CRM-13492
CRM-13942 navigation menu is not valid html
Coleman Watts [Fri, 3 Jan 2014 23:37:42 +0000 (15:37 -0800)]
CRM-13921 - Individual Prefix, Suffix and Gender fields are broken when used on tokens
Eileen [Fri, 3 Jan 2014 23:35:14 +0000 (12:35 +1300)]
CRM-13492 specify = TRUE on navigation menu - this will cause urls to have & not & in them
(Am currently unsure about the ones which have inconsistently stored a '?' in the civicrm_navigation menu - ie.
http://issues.civicrm.org/jira/browse/CRM-13942?focusedCommentId=54821&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-54821
as I cleaned them out of my DB)
----------------------------------------
* CRM-13492: buildAmount Hook functionality changed -- difficult to use / undocumented
http://issues.civicrm.org/jira/browse/CRM-13492
Eileen [Fri, 3 Jan 2014 23:32:38 +0000 (12:32 +1300)]
CRM-13492 d6 & d7 url functions are identical except for one missing param on d6, move d7 to DrupalBase, delete d6 & d7 versions
----------------------------------------
* CRM-13492: buildAmount Hook functionality changed -- difficult to use / undocumented
http://issues.civicrm.org/jira/browse/CRM-13492
colemanw [Fri, 3 Jan 2014 22:40:04 +0000 (14:40 -0800)]
Merge pull request #2276 from colemanw/4.4
CRM-14024 - Get rid of redundant fn
Coleman Watts [Fri, 3 Jan 2014 22:38:19 +0000 (14:38 -0800)]
Fix static fn php warning
Coleman Watts [Fri, 3 Jan 2014 22:37:50 +0000 (14:37 -0800)]
CRM-14024 - Get rid of redundant fn
Kurund Jalmi [Fri, 3 Jan 2014 21:05:44 +0000 (13:05 -0800)]
Merge pull request #2246 from davecivicrm/CRM-13978
CRM-13978 - Replaces PR 2219 which had all the right changs BUT omitted ...
colemanw [Fri, 3 Jan 2014 17:40:42 +0000 (09:40 -0800)]
Merge pull request #2275 from colemanw/4.4
CRM-13810 - Cleanup campaign export
Coleman Watts [Fri, 3 Jan 2014 17:39:34 +0000 (09:39 -0800)]
CRM-13810 - Cleanup campaign export
monishdeb [Fri, 3 Jan 2014 15:33:54 +0000 (21:03 +0530)]
CRM-13977 related fix
----------------------------------------
* CRM-13977: activities report fails to add contacts to group - fatal error
http://issues.civicrm.org/jira/browse/CRM-13977
Eileen [Fri, 3 Jan 2014 06:58:35 +0000 (19:58 +1300)]
remove references to E-NoticeCompliance - is now required not optional
Eileen [Fri, 3 Jan 2014 06:58:06 +0000 (19:58 +1300)]
remove references to E-NoticeCompliance - is now required not optional
Eileen [Fri, 3 Jan 2014 06:57:28 +0000 (19:57 +1300)]
remove references to E-NoticeCompliance - is now required not optional
Eileen [Fri, 3 Jan 2014 06:54:08 +0000 (19:54 +1300)]
fix e-Notice on deprecated utils
Eileen [Fri, 3 Jan 2014 06:48:05 +0000 (19:48 +1300)]
test enotice compliance ProfileEditorTest
Eileen [Fri, 3 Jan 2014 06:43:52 +0000 (19:43 +1300)]
E-notice fixes in tests
Eileen [Fri, 3 Jan 2014 06:43:18 +0000 (19:43 +1300)]
Member BAO class E-Notice identified in test
Eileen [Fri, 3 Jan 2014 06:27:34 +0000 (19:27 +1300)]
CRM_Utils_Array enotice compliance (from test)
Eileen [Fri, 3 Jan 2014 06:24:21 +0000 (19:24 +1300)]
tests/phpunit/CRM/Utils/StringTest.php enotice compliance
Eileen [Fri, 3 Jan 2014 06:19:59 +0000 (19:19 +1300)]
unit test - enotice compliance
Eileen [Fri, 3 Jan 2014 05:58:07 +0000 (18:58 +1300)]
remove _eNoticeCompliant from non-compliant tests
colemanw [Fri, 3 Jan 2014 05:54:21 +0000 (21:54 -0800)]
Merge pull request #2270 from eileenmcnaughton/test-fixes
Test fixes
colemanw [Fri, 3 Jan 2014 05:53:04 +0000 (21:53 -0800)]
Merge pull request #2271 from colemanw/4.4
CRM-13810 - Campaign Search
Eileen [Fri, 3 Jan 2014 05:51:41 +0000 (18:51 +1300)]
ManagedEntities e-notice fix - as exposed by test getsingle will not have an 'is_error' on success
Coleman Watts [Fri, 3 Jan 2014 05:50:44 +0000 (21:50 -0800)]
CRM-13810 - Campaign Search - remove data constraint, rename Campaign ID to Campaign, and remove Campaign Name from search builder
Eileen [Fri, 3 Jan 2014 05:38:23 +0000 (18:38 +1300)]
tests/phpunit/CRM/Core/CommunityMessagesTest.php enotice compliance
Eileen [Fri, 3 Jan 2014 05:31:37 +0000 (18:31 +1300)]
mark test e-notice compliant
Eileen [Fri, 3 Jan 2014 05:29:15 +0000 (18:29 +1300)]
CRM unit tests - enotice compliance & typos on BaseIPN
Eileen [Fri, 3 Jan 2014 05:20:02 +0000 (18:20 +1300)]
E-Notice fix
Eileen [Fri, 3 Jan 2014 05:01:32 +0000 (18:01 +1300)]
api_v3_PledgePaymentTest E-Notice fix (marked it compliant too soon)
colemanw [Fri, 3 Jan 2014 04:51:52 +0000 (20:51 -0800)]
Merge pull request #2269 from eileenmcnaughton/test-fixes
E-notice fix
Eileen [Fri, 3 Jan 2014 04:50:41 +0000 (17:50 +1300)]
Tests e-notice fix
colemanw [Fri, 3 Jan 2014 04:48:39 +0000 (20:48 -0800)]
Merge pull request #2268 from colemanw/4.4
CRM-12464 - Pseudoconstant - Skip default condition in validate context
Eileen [Fri, 3 Jan 2014 04:47:53 +0000 (17:47 +1300)]
api-tests fix api call that errored on jenkins & non local
Coleman Watts [Fri, 3 Jan 2014 04:42:19 +0000 (20:42 -0800)]
CRM-12464 - Pseudoconstant - Skip default condition in validate context
Eileen [Fri, 3 Jan 2014 04:27:09 +0000 (17:27 +1300)]
E-notice fix
colemanw [Fri, 3 Jan 2014 04:22:16 +0000 (20:22 -0800)]
Merge pull request #2267 from eileenmcnaughton/test-fixes
PHP unit Test fixes
Eileen [Fri, 3 Jan 2014 03:50:29 +0000 (16:50 +1300)]
CRM_Core_BAO_SettingTest e-notice compliance
Eileen [Fri, 3 Jan 2014 03:40:28 +0000 (16:40 +1300)]
Make CRM_Core_BAO_ActionSchedule test e-Notice compliant
Eileen [Fri, 3 Jan 2014 03:37:33 +0000 (16:37 +1300)]
Test - make e-notice compliant / mark as e-notice compliant
Eileen [Fri, 3 Jan 2014 03:32:31 +0000 (16:32 +1300)]
tests - enotice fix & move code to enable civicampaign to component
Eileen [Fri, 3 Jan 2014 03:29:58 +0000 (16:29 +1300)]
GroupContactTest fails locally as 'parents' param is incorrectly handled in BAO - presume my set-up must be more restrictive in some way as this doesn't fail on server
Eileen [Fri, 3 Jan 2014 03:15:22 +0000 (16:15 +1300)]
Fix CRM/Contact test to be E-Notice Compliant
Eileen [Fri, 3 Jan 2014 03:06:30 +0000 (16:06 +1300)]
Test failures in CRM tests due to year being coded in
Eileen [Fri, 3 Jan 2014 03:03:03 +0000 (16:03 +1300)]
e-notice compliance on batch api / mark probable error
Eileen [Fri, 3 Jan 2014 03:01:10 +0000 (16:01 +1300)]
E Notice compliance on Pledge BAO for update actions (recent list updates)
Eileen [Fri, 3 Jan 2014 03:00:25 +0000 (16:00 +1300)]
Participant Test E-Notice compliance
Eileen [Fri, 3 Jan 2014 02:59:35 +0000 (15:59 +1300)]
CRM-12464 - test-fixes Update DAO to generate campaign entities
@colemanw , @totten - this fixes the test but highlights an issue in the commit - the addition of the condition to the pseudoconstant means it
will refuse to import historical surveys
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Kurund Jalmi [Thu, 2 Jan 2014 21:29:48 +0000 (13:29 -0800)]
Merge pull request #2266 from yashodha/4.4.CRM-13977
CRM-13977 - fixed behavior for adding target contacts to groups
Kurund Jalmi [Thu, 2 Jan 2014 20:03:28 +0000 (12:03 -0800)]
Merge pull request #2262 from eileenmcnaughton/whitespace
Whitespace - tabs introduced in
5bd361934f5dd97d2e3ef40d15
yashodha [Thu, 2 Jan 2014 10:16:39 +0000 (15:46 +0530)]
CRM-13977 - fixed behavior for adding target contacts to groups
dlobo [Thu, 2 Jan 2014 07:35:00 +0000 (23:35 -0800)]
Merge pull request #2265 from dlobo/CRM-14033
CRM-14033 - Clickatell expects text in ISO-8859-1 if not in Unicode mode
Donald A. Lobo [Thu, 2 Jan 2014 07:26:37 +0000 (12:56 +0530)]
CRM-14033 - Clickatell expects text in ISO-8859-1 if not in Unicode mode
http://issues.civicrm.org/jira/browse/CRM-14033
dlobo [Thu, 2 Jan 2014 06:36:19 +0000 (22:36 -0800)]
Merge pull request #2199 from lcdservices/CRM-13955
CRM-13955 rework mailing default values and workflow
Eileen [Thu, 2 Jan 2014 04:43:19 +0000 (17:43 +1300)]
fix tabs to spaces (whitespace standards)
Eileen [Thu, 2 Jan 2014 04:41:20 +0000 (17:41 +1300)]
Replace tabs with double spaces per coding standards
Eileen [Thu, 2 Jan 2014 04:40:12 +0000 (17:40 +1300)]
CRM-13442 replace tabs with double space per coding standards
----------------------------------------
* CRM-13442: Update Outbound Email help text
http://issues.civicrm.org/jira/browse/CRM-13442
Eileen [Thu, 2 Jan 2014 04:38:22 +0000 (17:38 +1300)]
CRM-13025 fix tabs to be spaces
----------------------------------------
* CRM-13025: Contact edit Groups pane : use crmasmSelect widget instead of list of checkboxes
http://issues.civicrm.org/jira/browse/CRM-13025
Eileen [Thu, 2 Jan 2014 04:37:33 +0000 (17:37 +1300)]
CRM-13696 replace tabs with double spaces
----------------------------------------
* CRM-13696: Tag listing in remove Tag action has an unclosed div
http://issues.civicrm.org/jira/browse/CRM-13696
Eileen [Thu, 2 Jan 2014 04:36:25 +0000 (17:36 +1300)]
CRM-13257 whitespace -tabs to double space
----------------------------------------
* CRM-13257: Hard-coded relationship type for employer-employee relationship causing Current Employer checkbox to be hidden AND invalid sample data
http://issues.civicrm.org/jira/browse/CRM-13257
Eileen [Thu, 2 Jan 2014 04:34:44 +0000 (17:34 +1300)]
CRM-12055, other commit, replace tabs with double spaces
----------------------------------------
* CRM-12055: Allow users to change label used for Contribution Amounts in online contribution page w/o switching to a price set
http://issues.civicrm.org/jira/browse/CRM-12055
Eileen [Thu, 2 Jan 2014 04:32:18 +0000 (17:32 +1300)]
CRM-12055 fix tabs to be double spaces
----------------------------------------
* CRM-12055: Allow users to change label used for Contribution Amounts in online contribution page w/o switching to a price set
http://issues.civicrm.org/jira/browse/CRM-12055
Eileen [Thu, 2 Jan 2014 04:31:01 +0000 (17:31 +1300)]
CRM-13398 replace tabs with 2 spaces per standard
----------------------------------------
* CRM-13398: Profile pre and post field help markup in Block.tpl messes up page layout
http://issues.civicrm.org/jira/browse/CRM-13398
Eileen [Thu, 2 Jan 2014 04:22:23 +0000 (17:22 +1300)]
CRM-12060 whitespace - 2 spaces instead of tabs
----------------------------------------
* CRM-12060: Support hook_civicrm_permissions on WordPress
http://issues.civicrm.org/jira/browse/CRM-12060
Eileen [Thu, 2 Jan 2014 04:20:57 +0000 (17:20 +1300)]
CRM-13187 fix typo & coding standards (replace tabs with 2 spaces
----------------------------------------
* CRM-13187:
http://issues.civicrm.org/jira/browse/CRM-13187
Eileen [Thu, 2 Jan 2014 04:17:16 +0000 (17:17 +1300)]
more tabs replaced with double spaces
Eileen [Thu, 2 Jan 2014 04:09:21 +0000 (17:09 +1300)]
fix unused variable to not be a reference & default to an array per bao standards
Eileen [Thu, 2 Jan 2014 04:08:15 +0000 (17:08 +1300)]
replace tabs with spaces
Eileen [Thu, 2 Jan 2014 03:52:20 +0000 (16:52 +1300)]
Remove tabs & trailing white spaces introduced in
5bd361934f5dd97d2e3ef40d15f0946541e546cb
Kurund Jalmi [Wed, 1 Jan 2014 19:45:40 +0000 (11:45 -0800)]
Merge pull request #2261 from kurund/CRM-13943
CRM-13943, invalid menu html
kurund [Wed, 1 Jan 2014 19:39:37 +0000 (11:39 -0800)]
CRM-13943, invalid menu html
----------------------------------------
* CRM-13943: Navigation menu has extra <li> in drupal
http://issues.civicrm.org/jira/browse/CRM-13943
dlobo [Wed, 1 Jan 2014 10:47:10 +0000 (02:47 -0800)]
Merge pull request #2260 from eileenmcnaughton/whitespace
Whitespace & capitalisation tidy ups
Eileen [Wed, 1 Jan 2014 10:40:35 +0000 (23:40 +1300)]
Fix case on Class names (actually they are case insensitive so this is just a tidy up
Eileen [Wed, 1 Jan 2014 10:29:22 +0000 (23:29 +1300)]
Whitespace fixes (from jshint)
Kurund Jalmi [Tue, 31 Dec 2013 19:17:57 +0000 (11:17 -0800)]
Merge pull request #2259 from kurund/CRM-13982
patched CRM-13982 - export includes trashed contacts
Kurund Jalmi [Tue, 31 Dec 2013 18:01:53 +0000 (10:01 -0800)]
Merge pull request #2255 from pratik-joshi/CRM-14010
CRM-14010 fix : some operators handling was missing for preferredCommunication method where clause logic
kurund [Tue, 31 Dec 2013 05:56:09 +0000 (21:56 -0800)]
fixes for CRM-14004, duplicate memberships
----------------------------------------
* CRM-14004: Membership export includes multiple copies of the same membership
http://issues.civicrm.org/jira/browse/CRM-14004
kurund [Tue, 31 Dec 2013 04:09:57 +0000 (20:09 -0800)]
patched CRM-13982 - export includes trashed contacts
http://issues.civicrm.org/jira/browse/CRM-13982
Kurund Jalmi [Mon, 30 Dec 2013 18:10:23 +0000 (10:10 -0800)]
Merge pull request #2251 from deepak-srivastava/4.4.CRM-13838
CRM-13838 - Fixed bug that caused participants to be listed twice.
Kurund Jalmi [Mon, 30 Dec 2013 17:45:13 +0000 (09:45 -0800)]
Merge pull request #2242 from eileenmcnaughton/CRM-13707
CRM-13707 api test generated examples - fix escaping in output
Kurund Jalmi [Mon, 30 Dec 2013 17:42:40 +0000 (09:42 -0800)]
Merge pull request #2240 from totten/4.4-setCriteriaModel
HR-226 - CRM.Backbone.extendCollection - Add helper for representing "crmCriteria" as a full-fledged model
Kurund Jalmi [Mon, 30 Dec 2013 17:27:49 +0000 (09:27 -0800)]
Merge pull request #2227 from yashodha/4.4.CRM-13892
CRM-13892 -added new column for dashboard
Kurund Jalmi [Mon, 30 Dec 2013 17:18:13 +0000 (09:18 -0800)]
Merge pull request #2254 from monishdeb/CRM-13972
CRM-13972 related fix
monishdeb [Mon, 30 Dec 2013 12:46:34 +0000 (18:16 +0530)]
CRM-13972 related fix
----------------------------------------
* CRM-13972: Preferred Language reset after editing contact
http://issues.civicrm.org/jira/browse/CRM-13972
Pratik Joshi [Mon, 30 Dec 2013 12:35:45 +0000 (18:05 +0530)]
CRM-14010 fix : some operators handling was missing for prefered method where clause logic
Coleman Watts [Sun, 29 Dec 2013 05:33:55 +0000 (21:33 -0800)]
CRM_Core_Session - allow empty string in setStatus