civicrm-core.git
10 years agoCRM-13833 fix - Implement Soft Credit Types
monishdeb [Tue, 7 Jan 2014 07:19:40 +0000 (12:49 +0530)]
CRM-13833 fix - Implement Soft Credit Types

http://issues.civicrm.org/jira/browse/CRM-13833

10 years agoMerge pull request #2295 from colemanw/master
colemanw [Mon, 6 Jan 2014 21:27:41 +0000 (13:27 -0800)]
Merge pull request #2295 from colemanw/master

AJAX fixes

10 years agoCRM-13863 - Contact summary popup fixes
Coleman Watts [Thu, 2 Jan 2014 22:13:45 +0000 (14:13 -0800)]
CRM-13863 - Contact summary popup fixes

10 years agoCRM-13863 - Fix relationship form to work in popup
Coleman Watts [Thu, 2 Jan 2014 21:36:31 +0000 (13:36 -0800)]
CRM-13863 - Fix relationship form to work in popup

10 years agoMerge pull request #2291 from colemanw/resources
colemanw [Mon, 6 Jan 2014 20:37:41 +0000 (12:37 -0800)]
Merge pull request #2291 from colemanw/resources

Coleman's giant js/ajax PR

10 years agoCRM-13863 - Ajax event tabs improvements - update 'disabled' tab class, etc.
Coleman Watts [Mon, 6 Jan 2014 04:55:41 +0000 (20:55 -0800)]
CRM-13863 - Ajax event tabs improvements - update 'disabled' tab class, etc.

10 years agoSummary.js - code cleanup
Coleman Watts [Sun, 5 Jan 2014 05:40:01 +0000 (21:40 -0800)]
Summary.js - code cleanup

10 years agoCRM-13997 - Fix gotv tabs to restore non-caching of content
Coleman Watts [Sun, 5 Jan 2014 00:28:00 +0000 (16:28 -0800)]
CRM-13997 - Fix gotv tabs to restore non-caching of content

10 years agoExtend TabHeader.tpl to support non-ajax tabs
Coleman Watts [Sun, 5 Jan 2014 00:20:48 +0000 (16:20 -0800)]
Extend TabHeader.tpl to support non-ajax tabs

10 years agoCRM-13863 - Ajax-enable contact actions/activity list
Coleman Watts [Thu, 2 Jan 2014 04:06:03 +0000 (20:06 -0800)]
CRM-13863 - Ajax-enable contact actions/activity list

10 years agoCRM-13863 - Ajax-enable most contact summary tabs
Coleman Watts [Wed, 1 Jan 2014 22:11:47 +0000 (14:11 -0800)]
CRM-13863 - Ajax-enable most contact summary tabs

10 years agoTest fixes
Coleman Watts [Wed, 1 Jan 2014 22:10:49 +0000 (14:10 -0800)]
Test fixes

10 years agoCRM-10693 - Handle core errors while in ajax context
Coleman Watts [Wed, 1 Jan 2014 22:10:18 +0000 (14:10 -0800)]
CRM-10693 - Handle core errors while in ajax context

10 years agoCRM-13932 - Fix deprecated useages of jQuery.attr
Coleman Watts [Tue, 31 Dec 2013 05:30:32 +0000 (21:30 -0800)]
CRM-13932 - Fix deprecated useages of jQuery.attr

10 years agoCRM-13863 - Ajaxify contact groups tab
Coleman Watts [Tue, 31 Dec 2013 04:31:00 +0000 (20:31 -0800)]
CRM-13863 - Ajaxify contact groups tab

10 years agoGroupContact.tpl - js cleanup
Coleman Watts [Mon, 30 Dec 2013 01:48:51 +0000 (17:48 -0800)]
GroupContact.tpl - js cleanup

10 years agoCRM-13863 - Ajaxify event tabs
Coleman Watts [Mon, 30 Dec 2013 01:09:47 +0000 (17:09 -0800)]
CRM-13863 - Ajaxify event tabs

10 years agoScheduleReminders - fix php fatal & whitespace cleanup
Coleman Watts [Sun, 29 Dec 2013 22:33:28 +0000 (14:33 -0800)]
ScheduleReminders - fix php fatal & whitespace cleanup

10 years agoCRM-13863 - Initial support for ajaxForm tabs
Coleman Watts [Sun, 29 Dec 2013 04:32:00 +0000 (20:32 -0800)]
CRM-13863 - Initial support for ajaxForm tabs

10 years agoCRM-13997 CRM-13863 - Use CRM.loadPage for contact tabs
Coleman Watts [Sat, 28 Dec 2013 19:58:12 +0000 (11:58 -0800)]
CRM-13997 CRM-13863 - Use CRM.loadPage for contact tabs

10 years agoCRM-13997 CRM-13863 - Decouple TabHeader markup from scripts
Coleman Watts [Sat, 28 Dec 2013 19:22:18 +0000 (11:22 -0800)]
CRM-13997 CRM-13863 - Decouple TabHeader markup from scripts

10 years agoCRM-13997 CRM-13863 - Fix form snippet to still work with non-json calls (fix for...
Coleman Watts [Sat, 28 Dec 2013 19:14:04 +0000 (11:14 -0800)]
CRM-13997 CRM-13863 - Fix form snippet to still work with non-json calls (fix for custom data ajax)

10 years agoContact summary tabs - simplify styling
Coleman Watts [Sat, 28 Dec 2013 05:39:34 +0000 (21:39 -0800)]
Contact summary tabs - simplify styling

10 years agoCRM-13932 - UI Tabs cleanup
Coleman Watts [Fri, 27 Dec 2013 01:31:33 +0000 (17:31 -0800)]
CRM-13932 - UI Tabs cleanup

10 years agoCRM-14015 CRM-13863 - Fix enable/disable and crmEditable to work with campaigns tabs...
Coleman Watts [Fri, 27 Dec 2013 01:26:16 +0000 (17:26 -0800)]
CRM-14015 CRM-13863 - Fix enable/disable and crmEditable to work with campaigns tabs & datatables

10 years agoCRM-14015 CRM-13863 - Fix enable/disable and crmEditable to work with groups datatable
Coleman Watts [Tue, 24 Dec 2013 23:56:37 +0000 (15:56 -0800)]
CRM-14015 CRM-13863 - Fix enable/disable and crmEditable to work with groups datatable

10 years agoJs cleanup
Coleman Watts [Tue, 24 Dec 2013 22:02:57 +0000 (14:02 -0800)]
Js cleanup

10 years agoCRM-14023 CRM-14015 - Add api for mailing component
Coleman Watts [Tue, 24 Dec 2013 05:06:29 +0000 (21:06 -0800)]
CRM-14023 CRM-14015 - Add api for mailing component

10 years agoCRM-14015 - Fix setvalue to work with required boolean fields
Coleman Watts [Tue, 24 Dec 2013 05:06:09 +0000 (21:06 -0800)]
CRM-14015 - Fix setvalue to work with required boolean fields

10 years agoCRM-14023 CRM-14015 - Add apis for Premium & Product
Coleman Watts [Mon, 23 Dec 2013 23:54:29 +0000 (15:54 -0800)]
CRM-14023 CRM-14015 - Add apis for Premium & Product

10 years ago CRM-13863 - Ensure crmAccordions work in popup context
Coleman Watts [Mon, 23 Dec 2013 23:34:42 +0000 (15:34 -0800)]
 CRM-13863 - Ensure crmAccordions work in popup context

10 years agoCRM-14023 CRM-14015 - Add apis for Financial Types & Accounts
Coleman Watts [Mon, 23 Dec 2013 23:18:14 +0000 (15:18 -0800)]
CRM-14023 CRM-14015 - Add apis for Financial Types & Accounts

10 years agoCRM-14023 CRM-14015 - Add apis for admin pages
Coleman Watts [Mon, 23 Dec 2013 20:03:54 +0000 (12:03 -0800)]
CRM-14023 CRM-14015 - Add apis for admin pages

10 years agoCRM-13863 - Ajax fixes
Coleman Watts [Mon, 23 Dec 2013 18:32:05 +0000 (10:32 -0800)]
CRM-13863 - Ajax fixes

10 years agoCRM-13819 - Remove click-sort from tables where order matters
Coleman Watts [Mon, 23 Dec 2013 04:31:29 +0000 (20:31 -0800)]
CRM-13819 - Remove click-sort from tables where order matters

10 years agoCRM-14015 - Fix ajax for relationship type
Coleman Watts [Mon, 23 Dec 2013 03:43:23 +0000 (19:43 -0800)]
CRM-14015 - Fix ajax for relationship type

10 years agoFix inline-edit css for td elements
Coleman Watts [Mon, 23 Dec 2013 03:41:20 +0000 (19:41 -0800)]
Fix inline-edit css for td elements

10 years agoCRM-14018 - Fix button IDs
Coleman Watts [Sun, 22 Dec 2013 21:44:11 +0000 (13:44 -0800)]
CRM-14018 - Fix button IDs

10 years agoCRM-13863 - Only load real links not js buttons
Coleman Watts [Sun, 22 Dec 2013 06:46:29 +0000 (22:46 -0800)]
CRM-13863 - Only load real links not js buttons

10 years agoCRM-14015 - Abstract entity/field extraction from crmEditable
Coleman Watts [Sun, 22 Dec 2013 06:01:02 +0000 (22:01 -0800)]
CRM-14015 - Abstract entity/field extraction from crmEditable

10 years agoCRM-14015 - Remove enableDisable.tpl
Coleman Watts [Sun, 22 Dec 2013 01:43:33 +0000 (17:43 -0800)]
CRM-14015 - Remove enableDisable.tpl

10 years agoCRM-14015 - Extend everywhere via regex
Coleman Watts [Sun, 22 Dec 2013 01:43:01 +0000 (17:43 -0800)]
CRM-14015 - Extend everywhere via regex

10 years agoCRM-14015 - Extend to option value page
Coleman Watts [Sat, 21 Dec 2013 03:31:10 +0000 (19:31 -0800)]
CRM-14015 - Extend to option value page

10 years agoCRM-10693 - Handle a hash in the url
Coleman Watts [Sat, 21 Dec 2013 03:27:18 +0000 (19:27 -0800)]
CRM-10693 - Handle a hash in the url

10 years agoCRM-14015 - Cleanup ACL template
Coleman Watts [Sat, 21 Dec 2013 00:20:02 +0000 (16:20 -0800)]
CRM-14015 - Cleanup ACL template

10 years agoCRM-14015 CRM-14023 - Extend enable/disable to acl entityRole page (and add aclRole...
Coleman Watts [Sat, 21 Dec 2013 00:19:29 +0000 (16:19 -0800)]
CRM-14015 CRM-14023 - Extend enable/disable to acl entityRole page (and add aclRole api)

10 years agoCRM-14015 CRM-14023 - Extend new enable/disable to acl page (and add acl api)
Coleman Watts [Fri, 20 Dec 2013 23:41:41 +0000 (15:41 -0800)]
CRM-14015 CRM-14023 - Extend new enable/disable to acl page (and add acl api)

10 years agoCRM-14015 - POC for CustomField page
Coleman Watts [Fri, 20 Dec 2013 19:33:51 +0000 (11:33 -0800)]
CRM-14015 - POC for CustomField page

Total rewrite of enableDisable using CRM.api, crmEditable and crmSnippet

10 years agoCRM-14015 - Code cleanup and fix invalid markup in action links
Coleman Watts [Fri, 20 Dec 2013 18:42:14 +0000 (10:42 -0800)]
CRM-14015 - Code cleanup and fix invalid markup in action links

10 years agoCRM-13931 - Scope jQuery.dataTables css
Coleman Watts [Thu, 19 Dec 2013 18:25:03 +0000 (10:25 -0800)]
CRM-13931 - Scope jQuery.dataTables css

10 years agoCRM-13932 - Add uncompressed version of jQuery
Coleman Watts [Thu, 19 Dec 2013 00:21:45 +0000 (16:21 -0800)]
CRM-13932 - Add uncompressed version of jQuery

10 years agoCRM-13932 - Fix deprecated useages of .attr
Coleman Watts [Thu, 19 Dec 2013 00:01:18 +0000 (16:01 -0800)]
CRM-13932 - Fix deprecated useages of .attr

10 years agoCleanup snippet.tpl
Coleman Watts [Wed, 18 Dec 2013 22:16:49 +0000 (14:16 -0800)]
Cleanup snippet.tpl

10 years agoCRM-13997 CRM-13863 - Use CRM.loadPage for ajax tabs
Coleman Watts [Wed, 18 Dec 2013 04:06:11 +0000 (20:06 -0800)]
CRM-13997 CRM-13863 - Use CRM.loadPage for ajax tabs

10 years agoCRM-13997 - Fix css to match new ui theme
Coleman Watts [Tue, 17 Dec 2013 23:23:13 +0000 (15:23 -0800)]
CRM-13997 - Fix css to match new ui theme

10 years agoCRM-13997 - Fix unsupported 'selected' param to ui.tabs
Coleman Watts [Tue, 17 Dec 2013 22:42:16 +0000 (14:42 -0800)]
CRM-13997 - Fix unsupported 'selected' param to ui.tabs

10 years agoCRM-13997 - upgrade jQuery UI - Fix data namespaces
Coleman Watts [Tue, 17 Dec 2013 03:49:39 +0000 (19:49 -0800)]
CRM-13997 - upgrade jQuery UI - Fix data namespaces

10 years agoCRM-13930 - fix jquery.menu namespace
Coleman Watts [Tue, 17 Dec 2013 00:45:57 +0000 (16:45 -0800)]
CRM-13930 - fix jquery.menu namespace

10 years agoCRM-13997 - Upgrade jQuery UI to 1.10.3 and switch theme to "black-tie"
Coleman Watts [Mon, 16 Dec 2013 23:32:02 +0000 (15:32 -0800)]
CRM-13997 - Upgrade jQuery UI to 1.10.3 and switch theme to "black-tie"

10 years agoCRM-13932 - more minified versions
Coleman Watts [Thu, 12 Dec 2013 16:44:40 +0000 (08:44 -0800)]
CRM-13932 - more minified versions

10 years agoCRM-13932 - update blockUI plugin
Coleman Watts [Thu, 12 Dec 2013 04:19:29 +0000 (20:19 -0800)]
CRM-13932 - update blockUI plugin

10 years agoCRM-13932 - move jQuery.redirect out of core resources
Coleman Watts [Thu, 12 Dec 2013 04:13:31 +0000 (20:13 -0800)]
CRM-13932 - move jQuery.redirect out of core resources

10 years agoAutocomplete.js - Cleanup
Coleman Watts [Thu, 12 Dec 2013 04:13:14 +0000 (20:13 -0800)]
Autocomplete.js - Cleanup

10 years agoCRM-13932 - update deprecated jQuery.live()
Coleman Watts [Thu, 12 Dec 2013 02:21:41 +0000 (18:21 -0800)]
CRM-13932 - update deprecated jQuery.live()

10 years agoCRM-13932 - Changelog summary tab - update deprecated jQuery
Coleman Watts [Thu, 12 Dec 2013 02:08:42 +0000 (18:08 -0800)]
CRM-13932 - Changelog summary tab - update deprecated jQuery

10 years agoCRM-13929 - Use minified js conditionally based on debug mode
Coleman Watts [Wed, 11 Dec 2013 01:21:29 +0000 (17:21 -0800)]
CRM-13929 - Use minified js conditionally based on debug mode

10 years agoCRM-13932 - Remove deprecated jQuery usage
Coleman Watts [Tue, 10 Dec 2013 22:41:50 +0000 (14:41 -0800)]
CRM-13932 - Remove deprecated jQuery usage

10 years agoCRM-13932 - Upgrade jQuery and add jQuery.migrate
Coleman Watts [Tue, 10 Dec 2013 22:41:20 +0000 (14:41 -0800)]
CRM-13932 - Upgrade jQuery and add jQuery.migrate

10 years agoCRM-13929 - Move resource list out of .tpl file
Coleman Watts [Tue, 10 Dec 2013 22:13:05 +0000 (14:13 -0800)]
CRM-13929 - Move resource list out of .tpl file

10 years agoMerge pull request #2281 from totten/master-unittest-mysqlport
Tim Otten [Sat, 4 Jan 2014 02:25:15 +0000 (18:25 -0800)]
Merge pull request #2281 from totten/master-unittest-mysqlport

tests/phpunit - Fix for running with MySQL on alternative port

10 years agotests/phpunit - Fix for running with MySQL on alternative port
Tim Otten [Sat, 4 Jan 2014 02:24:04 +0000 (18:24 -0800)]
tests/phpunit - Fix for running with MySQL on alternative port

10 years agoMerge pull request #2280 from colemanw/addShowHide
colemanw [Sat, 4 Jan 2014 01:42:35 +0000 (17:42 -0800)]
Merge pull request #2280 from colemanw/addShowHide

Remove functions that are never called

10 years agoRemove functions that are never called
Coleman Watts [Wed, 15 May 2013 23:57:02 +0000 (18:57 -0500)]
Remove functions that are never called

10 years agoMerge pull request #2279 from colemanw/optionForms
colemanw [Sat, 4 Jan 2014 01:14:40 +0000 (17:14 -0800)]
Merge pull request #2279 from colemanw/optionForms

CRM-13970 - Add helper for getting page path

10 years agoRemove unused fn buildAddressBlock
Coleman Watts [Sat, 4 Jan 2014 00:26:03 +0000 (16:26 -0800)]
Remove unused fn buildAddressBlock

10 years agoMerge branch '4.4' of https://github.com/civicrm/civicrm-core
Coleman Watts [Sat, 4 Jan 2014 00:05:34 +0000 (16:05 -0800)]
Merge branch '4.4' of https://github.com/civicrm/civicrm-core

Conflicts:
CRM/Core/BAO/Navigation.php
xml/schema/Mailing/Event/Bounce.xml

10 years agoMerge pull request #2272 from eileenmcnaughton/test-fixes
colemanw [Fri, 3 Jan 2014 23:51:02 +0000 (15:51 -0800)]
Merge pull request #2272 from eileenmcnaughton/test-fixes

Test fixes / enotice compliance

10 years agoMerge pull request #2277 from eileenmcnaughton/CRM-13492
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

10 years ago CRM-13921 - Individual Prefix, Suffix and Gender fields are broken when used on...
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

10 years agoCRM-13492 specify = TRUE on navigation menu - this will cause urls to have &amp...
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

10 years agoCRM-13492 d6 & d7 url functions are identical except for one missing param on d6...
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

10 years agoMerge pull request #2173 from webpartners/master
colemanw [Fri, 3 Jan 2014 23:26:07 +0000 (15:26 -0800)]
Merge pull request #2173 from webpartners/master

CRM-13921 - Individual Prefix, Suffix and Gender fields are broken when used on tokens

10 years agoMerge pull request #2276 from colemanw/4.4
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

10 years agoFix static fn php warning
Coleman Watts [Fri, 3 Jan 2014 22:38:19 +0000 (14:38 -0800)]
Fix static fn php warning

10 years agoCRM-14024 - Get rid of redundant fn
Coleman Watts [Fri, 3 Jan 2014 22:37:50 +0000 (14:37 -0800)]
CRM-14024 - Get rid of redundant fn

10 years agoMerge pull request #2246 from davecivicrm/CRM-13978
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 ...

10 years agoMerge pull request #2275 from colemanw/4.4
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

10 years agoCRM-13810 - Cleanup campaign export
Coleman Watts [Fri, 3 Jan 2014 17:39:34 +0000 (09:39 -0800)]
CRM-13810 - Cleanup campaign export

10 years agoremove references to E-NoticeCompliance - is now required not optional
Eileen [Fri, 3 Jan 2014 06:58:35 +0000 (19:58 +1300)]
remove references to E-NoticeCompliance - is now required not optional

10 years agoremove 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

10 years agoremove 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

10 years agofix e-Notice on deprecated utils
Eileen [Fri, 3 Jan 2014 06:54:08 +0000 (19:54 +1300)]
fix e-Notice on deprecated utils

10 years agotest enotice compliance ProfileEditorTest
Eileen [Fri, 3 Jan 2014 06:48:05 +0000 (19:48 +1300)]
test enotice compliance ProfileEditorTest

10 years agoE-notice fixes in tests
Eileen [Fri, 3 Jan 2014 06:43:52 +0000 (19:43 +1300)]
E-notice fixes in tests

10 years agoMember BAO class E-Notice identified in test
Eileen [Fri, 3 Jan 2014 06:43:18 +0000 (19:43 +1300)]
Member BAO class E-Notice identified in test

10 years agoCRM_Utils_Array enotice compliance (from test)
Eileen [Fri, 3 Jan 2014 06:27:34 +0000 (19:27 +1300)]
CRM_Utils_Array enotice compliance (from test)

10 years agotests/phpunit/CRM/Utils/StringTest.php enotice compliance
Eileen [Fri, 3 Jan 2014 06:24:21 +0000 (19:24 +1300)]
tests/phpunit/CRM/Utils/StringTest.php enotice compliance

10 years agounit test - enotice compliance
Eileen [Fri, 3 Jan 2014 06:19:59 +0000 (19:19 +1300)]
unit test - enotice compliance

10 years agoremove _eNoticeCompliant from non-compliant tests
Eileen [Fri, 3 Jan 2014 05:58:07 +0000 (18:58 +1300)]
remove _eNoticeCompliant from non-compliant tests

10 years agoMerge pull request #2270 from eileenmcnaughton/test-fixes
colemanw [Fri, 3 Jan 2014 05:54:21 +0000 (21:54 -0800)]
Merge pull request #2270 from eileenmcnaughton/test-fixes

Test fixes