civicrm-core.git
11 years agoCRM-12060 - Support hook_civicrm_permissions on WordPress
vivekarora [Wed, 9 Oct 2013 17:38:36 +0000 (18:38 +0100)]
CRM-12060 - Support hook_civicrm_permissions on WordPress

----------------------------------------
* CRM-12060: Support hook_civicrm_permissions on WordPress
  http://issues.civicrm.org/jira/browse/CRM-12060

11 years agoMerge pull request #1767 from davecivicrm/CRM-13559
Kurund Jalmi [Wed, 9 Oct 2013 12:47:12 +0000 (05:47 -0700)]
Merge pull request #1767 from davecivicrm/CRM-13559

CRM-13559 - Add component titles to report instance listing pages.

11 years agoCRM-13559 - Add component titles to report instance listing pages.
Dave Greenberg [Wed, 9 Oct 2013 11:23:26 +0000 (12:23 +0100)]
CRM-13559 - Add component titles to report instance listing pages.

----------------------------------------
* CRM-13559: Component Report Listings Need a Specific Title
  http://issues.civicrm.org/jira/browse/CRM-13559

11 years agoMerge pull request #1755 from totten/4.4-gitify
Kurund Jalmi [Wed, 9 Oct 2013 10:35:02 +0000 (03:35 -0700)]
Merge pull request #1755 from totten/4.4-gitify

gitify - Setup both "origin" and "upstream" remotes

11 years agoMerge pull request #1761 from davecivicrm/CRM-12963
Kurund Jalmi [Wed, 9 Oct 2013 10:25:04 +0000 (03:25 -0700)]
Merge pull request #1761 from davecivicrm/CRM-12963

Change link in admin console from the old event badge option group to th...

11 years agoMerge pull request #1764 from deepak-srivastava/components
deepak-srivastava [Wed, 9 Oct 2013 08:25:05 +0000 (01:25 -0700)]
Merge pull request #1764 from deepak-srivastava/components

CRM-13553 - The last remaining enabled component cannot be disabled

11 years agoCRM-13553 - The last remaining enabled component cannot be disabled
Deepak Srivastava [Wed, 9 Oct 2013 08:23:19 +0000 (13:53 +0530)]
CRM-13553 - The last remaining enabled component cannot be disabled

11 years agoMerge pull request #1754 from yashodha/CRM-13548
Dave Greenberg [Tue, 8 Oct 2013 15:38:32 +0000 (08:38 -0700)]
Merge pull request #1754 from yashodha/CRM-13548

CRM-13548

11 years agoChange link in admin console from the old event badge option group to the new Event...
Dave Greenberg [Tue, 8 Oct 2013 14:53:29 +0000 (15:53 +0100)]
Change link in admin console from the old event badge option group to the new Event Badge Layouts page.

11 years agofix onload text changes to help
yashodha [Tue, 8 Oct 2013 14:39:12 +0000 (20:09 +0530)]
fix onload text changes to help

11 years agoMerge pull request #1748 from kurund/CRM-13329
Dave Greenberg [Tue, 8 Oct 2013 13:52:16 +0000 (06:52 -0700)]
Merge pull request #1748 from kurund/CRM-13329

CRM-13329, event badge improvements

11 years agoUI changes to Activity Search form
yashodha [Tue, 8 Oct 2013 12:40:52 +0000 (18:10 +0530)]
UI changes to Activity Search form

11 years agoMerge pull request #1757 from colemanw/4.4
colemanw [Tue, 8 Oct 2013 12:10:33 +0000 (05:10 -0700)]
Merge pull request #1757 from colemanw/4.4

VOL-20 - CSS - Make grid css work in popup

11 years agoVOL-20 - CSS - Make grid css work in popup
Coleman Watts [Tue, 8 Oct 2013 12:10:00 +0000 (13:10 +0100)]
VOL-20 - CSS - Make grid css work in popup

11 years agoMerge pull request #1750 from mlutfy/4.4-ts
Dave Greenberg [Tue, 8 Oct 2013 09:10:08 +0000 (02:10 -0700)]
Merge pull request #1750 from mlutfy/4.4-ts

Various ts() usage fixes.

11 years agofixed notice and placement for barcode, CRM-13329
kurund [Mon, 7 Oct 2013 23:59:34 +0000 (00:59 +0100)]
fixed notice and placement for barcode, CRM-13329

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329

11 years agogitify - Setup both "origin" and "upstream" remotes (optionally)
Tim Otten [Mon, 7 Oct 2013 23:46:00 +0000 (00:46 +0100)]
gitify - Setup both "origin" and "upstream" remotes (optionally)

11 years agomore UI changes to search screen
yashodha [Mon, 7 Oct 2013 22:12:48 +0000 (03:42 +0530)]
more UI changes to search screen

11 years agomade changes to text to make context clearer
yashodha [Mon, 7 Oct 2013 21:51:18 +0000 (03:21 +0530)]
made changes to text to make context clearer

11 years agoMerge pull request #1749 from mlutfy/4.4-crm13548
Dave Greenberg [Mon, 7 Oct 2013 20:19:02 +0000 (13:19 -0700)]
Merge pull request #1749 from mlutfy/4.4-crm13548

CRM-13548: Activity Search Form: make the activity_role more obvious by placing it under the contact name field, to which it relates.

11 years agogitify - Extract helpers, do_gencode and config_repo
Tim Otten [Mon, 7 Oct 2013 17:59:12 +0000 (18:59 +0100)]
gitify - Extract helpers, do_gencode and config_repo

11 years agofixed wrong usage of ts(), CRM-13329
kurund [Mon, 7 Oct 2013 17:53:05 +0000 (18:53 +0100)]
fixed wrong usage of ts(), CRM-13329

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329

11 years agoActivity Search Form: make the activity_role more obvious by placing it under the...
Mathieu Lutfy [Mon, 7 Oct 2013 11:49:06 +0000 (07:49 -0400)]
Activity Search Form: make the activity_role more obvious by placing it under the contact name field, to which it relates.

11 years agoFix ts() usage.
Mathieu Lutfy [Mon, 7 Oct 2013 16:32:45 +0000 (12:32 -0400)]
Fix ts() usage.

11 years agoadd only supported event tokens, CRM-13329
kurund [Mon, 7 Oct 2013 16:26:28 +0000 (17:26 +0100)]
add only supported event tokens, CRM-13329

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329

11 years agofixed event tokens, CRM-13329
kurund [Mon, 7 Oct 2013 15:52:07 +0000 (16:52 +0100)]
fixed event tokens, CRM-13329

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329

11 years agoadd more font sizes, CRM-13329
kurund [Mon, 7 Oct 2013 15:36:50 +0000 (16:36 +0100)]
add more font sizes, CRM-13329

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329

11 years agoadd extra spacing between cells for few badge formats CRM-13329
kurund [Mon, 7 Oct 2013 15:16:35 +0000 (16:16 +0100)]
add extra spacing between cells for few badge formats CRM-13329

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329

11 years agostart first row after image row, CRM-13329
kurund [Mon, 7 Oct 2013 15:04:08 +0000 (16:04 +0100)]
start first row after image row, CRM-13329

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329

11 years agoFix ts() usage.
Mathieu Lutfy [Mon, 7 Oct 2013 13:42:43 +0000 (09:42 -0400)]
Fix ts() usage.

11 years agoMerge pull request #1746 from totten/master-ext-warning
Kurund Jalmi [Mon, 7 Oct 2013 12:16:22 +0000 (05:16 -0700)]
Merge pull request #1746 from totten/master-ext-warning

CRM_Extension_Container_Basic - Display warning if no resource URL is defined

11 years agoCRM_Extension_Container_Basic - Display warning if no resource URL is defined
Tim Otten [Mon, 7 Oct 2013 12:09:51 +0000 (13:09 +0100)]
CRM_Extension_Container_Basic - Display warning if no resource URL is defined

11 years agoFix ts() usage.
Mathieu Lutfy [Mon, 7 Oct 2013 11:38:54 +0000 (07:38 -0400)]
Fix ts() usage.

11 years agoMerge pull request #1740 from joannechester/config-list-update
Dave Greenberg [Sun, 6 Oct 2013 21:59:20 +0000 (14:59 -0700)]
Merge pull request #1740 from joannechester/config-list-update

CRM-13496 Enable Components added to site configuration section of the Configuration CHecklist

11 years agoMerge pull request #1743 from davecivicrm/CRM-13442
Dave Greenberg [Sun, 6 Oct 2013 21:44:07 +0000 (14:44 -0700)]
Merge pull request #1743 from davecivicrm/CRM-13442

CRM-13442 put back the help text for Redirect to Database option.

11 years agoCRM-13442 put back the help text for Redirect to Database option.
Dave Greenberg [Sun, 6 Oct 2013 21:43:21 +0000 (22:43 +0100)]
CRM-13442 put back the help text for Redirect to Database option.

----------------------------------------
* CRM-13442: Update Outbound Email help text
  http://issues.civicrm.org/jira/browse/CRM-13442

11 years agoMerge pull request #1742 from colemanw/4.4
colemanw [Sun, 6 Oct 2013 21:41:08 +0000 (14:41 -0700)]
Merge pull request #1742 from colemanw/4.4

CRM-13344 - Contact Import - Fix prefix, suffix, gender import

11 years agoCRM-13344 - Contact Import - Fix prefix, suffix, gender import
Coleman Watts [Sun, 6 Oct 2013 21:39:24 +0000 (22:39 +0100)]
CRM-13344 - Contact Import - Fix prefix, suffix, gender import

----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
  http://issues.civicrm.org/jira/browse/CRM-13344

11 years agocivicontribute and changes to html tags
joanne [Sun, 6 Oct 2013 19:54:26 +0000 (06:54 +1100)]
civicontribute and changes to html tags

11 years agoCRM-13496 Enable Components added to site configuration section
joanne [Sun, 6 Oct 2013 15:13:36 +0000 (02:13 +1100)]
CRM-13496 Enable Components added to site configuration section

----------------------------------------
* CRM-13496: Add Enable Components to the Configuration Checklist.
  http://issues.civicrm.org/jira/browse/CRM-13496

11 years agoMerge pull request #1738 from kurund/CRM-13397
Kurund Jalmi [Sun, 6 Oct 2013 13:23:25 +0000 (06:23 -0700)]
Merge pull request #1738 from kurund/CRM-13397

Revert "Merge pull request #1645 from eileenmcnaughton/CRM-13379"

11 years agoRevert "Merge pull request #1645 from eileenmcnaughton/CRM-13379"
kurund [Sun, 6 Oct 2013 13:10:31 +0000 (14:10 +0100)]
Revert "Merge pull request #1645 from eileenmcnaughton/CRM-13379"

This reverts commit dcb91473ed06b6f221d2b726e6a41f2d844b7c16, reversing
changes made to bb40618ddaed08fc84508dc2178a9f37a016487a.

11 years agoMerge pull request #1736 from davecivicrm/CRM-13483
Dave Greenberg [Sun, 6 Oct 2013 12:36:51 +0000 (05:36 -0700)]
Merge pull request #1736 from davecivicrm/CRM-13483

CRM-13483 - Fix link to book in Profile Settings form.

11 years agoCRM-13483 - Fix link to book in Profile Settings form.
Dave Greenberg [Sun, 6 Oct 2013 12:34:58 +0000 (13:34 +0100)]
CRM-13483 - Fix link to book in Profile Settings form.

----------------------------------------
* CRM-13483: broken help link to book for profiles
  http://issues.civicrm.org/jira/browse/CRM-13483

11 years agoMerge pull request #1721 from deepak-srivastava/membership
Dave Greenberg [Sun, 6 Oct 2013 11:10:23 +0000 (04:10 -0700)]
Merge pull request #1721 from deepak-srivastava/membership

CRM-13333 - renewal of inherited memberships other than on-behalf-of org...

11 years agoMerge pull request #1734 from davecivicrm/CRM-13475
Kurund Jalmi [Sun, 6 Oct 2013 10:59:17 +0000 (03:59 -0700)]
Merge pull request #1734 from davecivicrm/CRM-13475

CRM-13475 - Tweak to error message text.

11 years agoCRM-13475 - Tweak to error message text.
Dave Greenberg [Sun, 6 Oct 2013 10:47:40 +0000 (11:47 +0100)]
CRM-13475 - Tweak to error message text.

----------------------------------------
* CRM-13475: Entering an invalid credit card number gives the wrong field validation error
  http://issues.civicrm.org/jira/browse/CRM-13475

11 years agoMerge pull request #1728 from demeritcowboy/CRM-13444
dlobo [Sun, 6 Oct 2013 10:37:21 +0000 (03:37 -0700)]
Merge pull request #1728 from demeritcowboy/CRM-13444

CRM-13444: undo CRM-13445 and prevent archived mailing appearing as sche...

11 years agoMerge pull request #1719 from pratik-joshi/CRM-13472
Kurund Jalmi [Sun, 6 Oct 2013 09:17:17 +0000 (02:17 -0700)]
Merge pull request #1719 from pratik-joshi/CRM-13472

CRM-13472 fix for - the total number of amount and count didn't matched with its corresponding search result because the receive date value varied in sql queries for both cases

11 years agoMerge pull request #1727 from davecivicrm/CRM-13279a
Kurund Jalmi [Sat, 5 Oct 2013 20:40:04 +0000 (13:40 -0700)]
Merge pull request #1727 from davecivicrm/CRM-13279a

CRM-13279 Adding filters for Age, Age at Event and Birth Date. Also addi...

11 years agoMerge pull request #1729 from pratik-joshi/CRM-13479
deepak-srivastava [Fri, 4 Oct 2013 06:50:18 +0000 (23:50 -0700)]
Merge pull request #1729 from pratik-joshi/CRM-13479

CRM-13479 : introduced a display column named 'Enabled?' to distinguish between active and in-active relationsip types

11 years agoMerge pull request #1730 from colemanw/master
colemanw [Thu, 3 Oct 2013 13:03:09 +0000 (06:03 -0700)]
Merge pull request #1730 from colemanw/master

CRM-13475 Fix credit-card error messages

11 years agoCRM-13475 Fix credit-card error messages
Coleman Watts [Thu, 3 Oct 2013 13:00:07 +0000 (14:00 +0100)]
CRM-13475 Fix credit-card error messages

----------------------------------------
* CRM-13475: Entering an invalid credit card number gives the wrong field validation error
  http://issues.civicrm.org/jira/browse/CRM-13475

11 years agoCRM-13333 - made on-behalf-org defaults populate correctly
Deepak Srivastava [Thu, 3 Oct 2013 07:54:24 +0000 (13:24 +0530)]
CRM-13333 - made on-behalf-org defaults populate correctly

11 years agoCRM-13479 : introduced a display column named 'Enabled?' to distinguish between activ...
Pratik Joshi [Thu, 3 Oct 2013 07:15:18 +0000 (12:45 +0530)]
CRM-13479 : introduced a display column named 'Enabled?' to distinguish between active and in-active relationsip types

----------------------------------------
* CRM-13479: Enabled/Disabled column on the "Relationships Types" admin screen
  http://issues.civicrm.org/jira/browse/CRM-13479

11 years agoCRM-13444: undo CRM-13445 and prevent archived mailing appearing as scheduled
DemeritCowboy [Wed, 2 Oct 2013 16:30:06 +0000 (12:30 -0400)]
CRM-13444: undo CRM-13445 and prevent archived mailing appearing as scheduled

11 years agoCRM-13279 Adding filters for Age, Age at Event and Birth Date. Also adding jQuery...
Dave Greenberg [Wed, 2 Oct 2013 13:57:13 +0000 (14:57 +0100)]
CRM-13279 Adding filters for Age, Age at Event and Birth Date. Also adding jQuery in the report template to expose a valid range of dates for birth date filter.

----------------------------------------
* CRM-13279: Include gender and date of birth in (participant) reports
  http://issues.civicrm.org/jira/browse/CRM-13279

11 years agoUpdate version to 4.4.beta5
CiviCRM [Wed, 2 Oct 2013 13:35:11 +0000 (06:35 -0700)]
Update version to 4.4.beta5

11 years agoCRM-13333 - on-behalf vs inherited bug fix
Deepak Srivastava [Wed, 2 Oct 2013 12:56:25 +0000 (18:26 +0530)]
CRM-13333 - on-behalf vs inherited bug fix

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-10-02-11-18-44
kurund [Wed, 2 Oct 2013 10:20:37 +0000 (11:20 +0100)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-10-02-11-18-44

Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
xml/version.xml

11 years agoCRM-13460 - CRM_Utils_RuleTest - Remove dead code
Tim Otten [Tue, 1 Oct 2013 23:41:15 +0000 (01:41 +0200)]
CRM-13460 - CRM_Utils_RuleTest - Remove dead code

----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
  http://issues.civicrm.org/jira/browse/CRM-13460

11 years agoMerge branch 'CRM-13460' of git://github.com/dlobo/civicrm-core into pull-request...
Tim Otten [Tue, 1 Oct 2013 23:37:57 +0000 (01:37 +0200)]
Merge branch 'CRM-13460' of git://github.com/dlobo/civicrm-core into pull-request-1708

11 years agoMerge pull request #1726 from totten/master-replace-address-test-2
Tim Otten [Tue, 1 Oct 2013 21:52:44 +0000 (14:52 -0700)]
Merge pull request #1726 from totten/master-replace-address-test-2

CRM-13312 - CRM_Utils_API_MatchOptionTest

11 years agoCRM-13312 - CRM_Utils_API_MatchOptionTest
Tim Otten [Tue, 1 Oct 2013 21:49:30 +0000 (23:49 +0200)]
CRM-13312 - CRM_Utils_API_MatchOptionTest

Make sure that the "noise" records are not touched by other operations. Clean up noise.

See http://forum.civicrm.org/index.php/topic,30133.0.html

----------------------------------------
* CRM-13312: Implement API support for options.match
  http://issues.civicrm.org/jira/browse/CRM-13312

11 years agoMerge pull request #1724 from totten/master-replace-address-test
Kurund Jalmi [Tue, 1 Oct 2013 21:10:36 +0000 (14:10 -0700)]
Merge pull request #1724 from totten/master-replace-address-test

CRM-13312 - CRM_Utils_API_MatchOptionTest

11 years agoMerge pull request #1725 from kurund/CRM-13329
Kurund Jalmi [Tue, 1 Oct 2013 21:03:15 +0000 (14:03 -0700)]
Merge pull request #1725 from kurund/CRM-13329

added event badge to default data

11 years agoadded event badge to default data
kurund [Tue, 1 Oct 2013 16:33:49 +0000 (17:33 +0100)]
added event badge to default data

11 years agoCRM-13312 - CRM_Utils_API_MatchOptionTest - http://forum.civicrm.org/index.php/topic...
Tim Otten [Tue, 1 Oct 2013 16:17:32 +0000 (18:17 +0200)]
CRM-13312 - CRM_Utils_API_MatchOptionTest - forum.civicrm.org/index.php/topic,30133.0.html

----------------------------------------
* CRM-13312: Implement API support for options.match
  http://issues.civicrm.org/jira/browse/CRM-13312

11 years agoMerge pull request #1722 from pratik-joshi/CRM-13474
Kurund Jalmi [Tue, 1 Oct 2013 15:13:19 +0000 (08:13 -0700)]
Merge pull request #1722 from pratik-joshi/CRM-13474

CRM-13474 : fix for warning displayed - undefined index 'street_address'

11 years agoMerge pull request #1723 from monishdeb/WebTestFixes
Kurund Jalmi [Tue, 1 Oct 2013 15:13:01 +0000 (08:13 -0700)]
Merge pull request #1723 from monishdeb/WebTestFixes

Webtest Fixes

11 years agoWebtest Fixes
monishdeb [Tue, 1 Oct 2013 14:56:13 +0000 (20:26 +0530)]
Webtest Fixes

11 years agoCRM-13474 : fix for warning displayed - undefined index 'street_address'
Pratik Joshi [Tue, 1 Oct 2013 14:19:48 +0000 (19:49 +0530)]
CRM-13474 : fix for warning displayed - undefined index 'street_address'

----------------------------------------
* CRM-13474: Undefined index: street_address in CRM_Import_Parser_Contact->createContact()
  http://issues.civicrm.org/jira/browse/CRM-13474

11 years agoCRM-13333 - renewal of inherited memberships other than on-behalf-of organization
Deepak Srivastava [Tue, 1 Oct 2013 13:50:25 +0000 (19:20 +0530)]
CRM-13333 - renewal of inherited memberships other than on-behalf-of organization

11 years agoMerge pull request #1720 from kurund/CRM-13476
Kurund Jalmi [Tue, 1 Oct 2013 13:41:09 +0000 (06:41 -0700)]
Merge pull request #1720 from kurund/CRM-13476

CRM-13476, IE 8 related fixes for advance search

11 years agofixes for CRM-13476
kurund [Tue, 1 Oct 2013 13:38:17 +0000 (14:38 +0100)]
fixes for CRM-13476

----------------------------------------
* CRM-13476: In IE8, accordion controls do not work for Advanced Search form
  http://issues.civicrm.org/jira/browse/CRM-13476

11 years agoMerge pull request #1715 from davecivicrm/CRM-10128
deepak-srivastava [Tue, 1 Oct 2013 13:28:36 +0000 (06:28 -0700)]
Merge pull request #1715 from davecivicrm/CRM-10128

CRM-10128 - updated to reflect changed names for gender, prefix, suffix.

11 years agoMerge pull request #1712 from eileenmcnaughton/master
Kurund Jalmi [Tue, 1 Oct 2013 13:27:00 +0000 (06:27 -0700)]
Merge pull request #1712 from eileenmcnaughton/master

API Metadata, document field type

11 years agoMerge pull request #1716 from dlobo/CRM-13355
Kurund Jalmi [Tue, 1 Oct 2013 13:22:03 +0000 (06:22 -0700)]
Merge pull request #1716 from dlobo/CRM-13355

CRM-13355 - add support to allow retrieval of non-public events also

11 years agoMerge pull request #1718 from monishdeb/CRM-13426
Kurund Jalmi [Tue, 1 Oct 2013 13:21:27 +0000 (06:21 -0700)]
Merge pull request #1718 from monishdeb/CRM-13426

CRM-13426 fix - Fatal error on search that includes a smart group created by custom search

11 years agoCRM-13426 fix - Fatal error on search that includes a smart group created by custom...
monishdeb [Tue, 1 Oct 2013 08:12:08 +0000 (13:42 +0530)]
CRM-13426 fix - Fatal error on search that includes a smart group created by custom group

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

11 years agoMerge pull request #1717 from colemanw/master
colemanw [Tue, 1 Oct 2013 00:29:04 +0000 (17:29 -0700)]
Merge pull request #1717 from colemanw/master

CRM-13344 - Update search builder and other code for pseudoconstant fields

11 years agoCRM-13344 - Update search builder and other code for pseudoconstant fields
Coleman Watts [Tue, 1 Oct 2013 00:27:52 +0000 (17:27 -0700)]
CRM-13344 - Update search builder and other code for pseudoconstant fields

----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
  http://issues.civicrm.org/jira/browse/CRM-13344

11 years agoUpdate Detail.php
Dave Greenberg [Mon, 30 Sep 2013 22:23:41 +0000 (15:23 -0700)]
Update Detail.php

Fixed missing space in soft credit stats.

11 years agoCRM-13355 - add support to retrieve non-public events
Donald A. Lobo [Mon, 30 Sep 2013 22:23:05 +0000 (15:23 -0700)]
CRM-13355 - add support to retrieve non-public events

----------------------------------------
* CRM-13355: CiviDiscount Codes Should Be Available on Non-Public Events
  http://issues.civicrm.org/jira/browse/CRM-13355

11 years agoCRM-10128 - updated to reflect changed names for gender, prefix, suffix.
Dave Greenberg [Mon, 30 Sep 2013 18:32:38 +0000 (11:32 -0700)]
CRM-10128 - updated to reflect changed names for gender, prefix, suffix.

----------------------------------------
* CRM-10128: Inconsistent Behavior when saving profile with blank fields
  http://issues.civicrm.org/jira/browse/CRM-10128

11 years agoMerge pull request #1711 from colemanw/master
Dave Greenberg [Mon, 30 Sep 2013 16:46:25 +0000 (09:46 -0700)]
Merge pull request #1711 from colemanw/master

CRM-13161 change token names back to the familiar old ones

11 years agoMerge pull request #1714 from deepak-srivastava/profile
deepak-srivastava [Mon, 30 Sep 2013 12:50:21 +0000 (05:50 -0700)]
Merge pull request #1714 from deepak-srivastava/profile

CRM-10128 - fix to address core fields like nickname, middle name, first...

11 years agoCRM-10128 - fix to address core fields like nickname, middle name, first, last, gende...
Deepak Srivastava [Mon, 30 Sep 2013 12:49:23 +0000 (18:19 +0530)]
CRM-10128 - fix to address core fields like nickname, middle name, first, last, gender, current employer, prefix, suffix

11 years agoCRM-13472 fix for - the total number of amount and count didn't matched with its...
Pratik Joshi [Mon, 30 Sep 2013 10:22:24 +0000 (15:52 +0530)]
CRM-13472 fix for - the total number of amount and count didn't matched with its corresponding search result because the receive date value varied in sql queries for both cases

----------------------------------------
* CRM-13472: Contribution Dashboard "Table Layout" query inaccurate
  http://issues.civicrm.org/jira/browse/CRM-13472

11 years agoMerge pull request #1705 from ravishnair/CRM-13417fix
deepak-srivastava [Mon, 30 Sep 2013 06:36:37 +0000 (23:36 -0700)]
Merge pull request #1705 from ravishnair/CRM-13417fix

-- fix for CRM-13417

11 years agoAPI Metadata, document field type
Eileen [Mon, 30 Sep 2013 01:26:46 +0000 (14:26 +1300)]
API Metadata, document field type

11 years agoMerge pull request #1699 from eileenmcnaughton/master
colemanw [Mon, 30 Sep 2013 01:22:45 +0000 (18:22 -0700)]
Merge pull request #1699 from eileenmcnaughton/master

CRM-13234 profile submit api - support propert DB fields

11 years agoCRM-13161 change token names back to the familiar old ones
Coleman Watts [Sun, 29 Sep 2013 22:03:15 +0000 (15:03 -0700)]
CRM-13161 change token names back to the familiar old ones

----------------------------------------
* CRM-13161: Greetings are  not evaluated correctly if it includes prefix / suffix
  http://issues.civicrm.org/jira/browse/CRM-13161

11 years agoCRM-13344 Update search test
Coleman Watts [Sat, 28 Sep 2013 21:04:39 +0000 (14:04 -0700)]
CRM-13344 Update search test

----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
  http://issues.civicrm.org/jira/browse/CRM-13344

11 years agoMerge pull request #1645 from eileenmcnaughton/CRM-13379
colemanw [Sat, 28 Sep 2013 20:28:02 +0000 (13:28 -0700)]
Merge pull request #1645 from eileenmcnaughton/CRM-13379

CRM-13379 disable button on Contribution_Main form after click to prevent multiple submits

11 years agoMerge pull request #1709 from colemanw/CRM-13344
colemanw [Sat, 28 Sep 2013 20:22:11 +0000 (13:22 -0700)]
Merge pull request #1709 from colemanw/CRM-13344

Revert unique names and add legacy token support

11 years agoCRM-13379 fix merge bug
Eileen [Sat, 28 Sep 2013 09:13:47 +0000 (05:13 -0400)]
CRM-13379 fix merge bug

11 years agoCRM-13379 fix prev commit - still include emailcommon.js in email form
Eileen [Mon, 16 Sep 2013 02:16:33 +0000 (02:16 +0000)]
CRM-13379 fix prev commit - still include emailcommon.js in email form

----------------------------------------
* CRM-13379: Delete mailing from Archived, next page is Find Mailings
  http://issues.civicrm.org/jira/browse/CRM-13379

11 years agoCRM-13379 prevent double click on confirm button on main contribution page to prevent...
Eileen [Sat, 28 Sep 2013 09:07:54 +0000 (05:07 -0400)]
CRM-13379 prevent double click on confirm button on main contribution page to prevent double payment or error

11 years agoCRM-13161 Add support for legacy tokens
Coleman Watts [Sat, 28 Sep 2013 04:36:31 +0000 (21:36 -0700)]
CRM-13161 Add support for legacy tokens

----------------------------------------
* CRM-13161: Greetings are  not evaluated correctly if it includes prefix / suffix
  http://issues.civicrm.org/jira/browse/CRM-13161