Kurund Jalmi [Sat, 12 Oct 2013 14:07:18 +0000 (07:07 -0700)]
Merge pull request #1785 from sfe-ev/name_fields_config
Make all Individual name fields configurable
Kurund Jalmi [Sat, 12 Oct 2013 14:03:15 +0000 (07:03 -0700)]
Merge pull request #1784 from vivekarora/HR-176-Corrected
HR-176 - External ID - this field needs to be included below the CiviHR ...
Olaf Buddenhagen [Fri, 11 Oct 2013 16:29:38 +0000 (18:29 +0200)]
Make all Individual name fields configurable
Adding a third block to the 'contact_edit_options' setting, to allow
controlling which of the various name fields (prefix, formal title,
first name, middle name, last name, suffix) show up on the contact edit
forms. (Both main form and quick edit of the contact name.)
For now, the name fields can only be enabled or disabled; there is no
support for changing the order in which they appear on the edit forms.
While this could be handled trivially in the configuration UI (the code
is already there for the other parts of 'contact_edit_options'), it
would require a major change to how the actual name edit forms are
constructed -- and I'm not even sure there is an actual use case for
that...
Note: This change doesn't affect the Display Name -- that one is still
configured using the token-based template.
Also, it doesn't affect all the other places where name fields are used
(soft credits, honoree, billing contacts etc.): there are way too many
of them, each implemented separately (and inconsistently). Again, the
way forward seems to be centralising all name field handling in a common
piece of code, and invoking that in all places dealing with Individual
name fields...
After merging this, sql/civicrm_generated.sql needs to be regenerated,
to pick up the new option values and default setting.
Olaf Buddenhagen [Thu, 10 Oct 2013 14:17:45 +0000 (16:17 +0200)]
Revert "Make `formal_title` field optional"
This reverts commit
5b5217d75b850748f19707387b65806831acf670.
In preparation for more generic name field configurability.
vivekarora [Fri, 11 Oct 2013 14:31:33 +0000 (15:31 +0100)]
HR-176 - External ID - this field needs to be included below the CiviHR ID field
Kurund Jalmi [Fri, 11 Oct 2013 13:27:17 +0000 (06:27 -0700)]
Merge pull request #1776 from monishdeb/CRM-9988
CRM-9988 fix - Panama in Africa West, East, Central and Southern region
monishdeb [Thu, 10 Oct 2013 10:13:06 +0000 (15:43 +0530)]
CRM-9988 fix - Panama in Africa West, East, Central and Southern region
http://issues.civicrm.org/jira/browse/CRM-9988
Kurund Jalmi [Wed, 9 Oct 2013 12:46:01 +0000 (05:46 -0700)]
Merge pull request #1457 from sfe-ev/greetings-PR
Improving International Name and Greetings handling
Kurund Jalmi [Wed, 9 Oct 2013 10:38:03 +0000 (03:38 -0700)]
Merge pull request #1751 from elcapo/master
Change assignation in log of changes made via API (CRM-13549)
Kurund Jalmi [Wed, 9 Oct 2013 10:33:52 +0000 (03:33 -0700)]
Merge pull request #1756 from tttp/crm-13552-crmAPI
CRM-13552 add a smarty error if there is a crm error in {crmAPI}
Kurund Jalmi [Wed, 9 Oct 2013 10:25:27 +0000 (03:25 -0700)]
Merge pull request #1760 from ravishnair/CRM-10347
-- CRM-10347 added birth date columns and filters
Olaf Buddenhagen [Tue, 13 Aug 2013 22:30:42 +0000 (00:30 +0200)]
Add configuration UI for Communication Style options
Add a page in the Communication Preferences, using the generic Option
handler.
The menu entry is added above the entries for Email Greeting Formats,
Postal Greeting Formats, and Addressee Formats, just like in the actual
contact forms and views.
Olaf Buddenhagen [Tue, 13 Aug 2013 21:58:07 +0000 (23:58 +0200)]
Introduce new `communication_style` field for Contacts
Add new field in the Communication Preferences block, mostly for driving
the new conditional greeting templates. (Though other uses are
possible of course.)
The Communication Style field is implemented as radio buttons defined
through an option group (pseudoconstant), similar to the Gender field.
Unlike Gender, it has a default value assigned automatically for new
contacts.
The field is placed just above the Email Greeting, Postal Greeting, and
Addresse controls, as it's meant to be used as a kind of master switch
driving the various greeting templates. Just like the Prefix/Suffix
fields in the name block for Individual contacts, the Communication
Style field is automatically hidden from all forms and views if no
option values are defined for the field.
The database field comes with an index, like all(?) pseudoconstant
fields. Presently the index is not used much (probably the only place
being deletion of existing option values); but this is likely to change
when more functionality is added around this field in the future.
(Search etc.)
The handling of the new field throughout the CiviCRM code base should be
mostly complete. We deliberately punted on some of the obvious, larger
pieces of functionality (search, import, profiles) for now, as they
would require considerable additional effort, so we treat them as extra
features to be implemented seperately upon need. We tried to be complete
with all smaller bits (mostly by grepping for `gender`, which requires
similar handling in most places...); but we might have omitted some,
and/or done some that aren't actually necessary -- it's rather hard to
tell sometimes what a particular piece of code is all about...
Olaf Buddenhagen [Mon, 5 Aug 2013 12:28:32 +0000 (14:28 +0200)]
Make `formal_title` field optional
Add a config setting to make display of the Title input field (in
contact edit forms) optional.
(This doesn't affect contact view, as the name displayed there is
determined by the "Individual Display Name Format" template instead.)
This is a minimal approach, adding just the title setting. Perhaps it
might be preferable to add a full set of options for disabling the other
name fields as well, while at it?...
(We are willing to do that too, as it shouldn't be too hard, and we have
users for that as well -- but we need some consensus about the right way
for handling this.)
The setting is placed in the "Display Preferences", next to the
"Individual Display Name Format". However, it could be placed next to
"Editing Contacts" (also in "Display Preferences") as well -- it's
somewhat related to both...
Olaf Buddenhagen [Mon, 5 Aug 2013 10:47:05 +0000 (12:47 +0200)]
Introduce new `formal_title` field for contacts
For Individual contacts, add a Title field along with the other name
fields. This one sits between the Individual Prefix and First Name
fields, which is the right place for academic and other formal titles
(not only) in Germany.
It is a free-form text field, as there are way too many obscure titles
and possible combinations of titles for any kind of exhaustive option
list. Also, this field is generally not processed, but rather just
included verbatim wherever the name is used -- so there is no real need
for normalisation.
Note: The field is conditional in the templates, but it's added
unconditionally at PHP level in this commit. That's because we don't
know yet how to handle the configuration best. A followup commit
implements one possible variant for the configuration.
In the actual input form, the field is labled with just 'Title', as it
should be clear enough in this context that it's about a formal title;
and a shorter name seems more convenient... However, we are wondering
whether this doesn't introduce additional confusion?
This commit is mostly only covering the main contact screen. (And some
other generic bits, such as exportable fields etc.) There are various
other places dealing with name fields (especially for billing contacts
and honoree) -- each one implementing it individually (and thus rather
inconsistently...) in a hard-coded fashion. Adapting all of these will
be a crazy amount of work, so we are punting this for now...
(The Right Thing To Do (TM) probably would be implementing some central
name handling code to use everywhere.)
With this commit, the definition of the existing `prefix` field is also
slightly changed regarding the import heuristics, to reflect the fact
that titles are no longer supposed to be stored in the `prefix` field.
Olaf Buddenhagen [Mon, 15 Jul 2013 06:12:39 +0000 (08:12 +0200)]
Process greeting templates with Smarty
When expanding `email_greeting`, `postal_greeting`, and `addressee`
templates, after substituting the CiviCRM tokens, pass the result
through Smarty.
This way it becomes possible to include conditionals (or other types of
fancy processing) in greeting templates. Example:
{capture assign=style}{contact.communication_style}{/capture}
{capture assign=prefix}{contact.individual_prefix}{/capture}
{if $style=="Familiar"}
{if $prefix=="Frau"}
Liebe
{elseif $prefix=="Herr"}
Lieber
{else}
Liebe/r
{/if}
{contact.first_name}
{else}
{if $prefix=="Frau"}
Liebe Frau
{elseif $prefix=="Herr"}
Lieber Herr
{else}
Liebe/r Herr oder Frau
{/if}
{contact.formal_title} {contact.last_name}
{/if}
The major limitation of this approach is that the `label` field -- where
the actual greeting templates are stored -- is limited to 255
characters. (So the above example wouldn't actually work without some
trickery to make it shorter...) Not sure how to address this problem.
We are wondering whether we should hide this feature behind a config
option, like it is done for Mailings? I'm not sure this is really
necessary here, as the Smarty processing shouldn't be in anyone's way
when unused. The only possible downside is that templates with syntax
errors might produce somewhat obscure warnings or errors in some cases.
However, the greeting templates are generally only set up during the
implementation phase, and never touched by mortal users -- just like
system workflow message templates, which use Smarty unconditionally as
well. Also, it feels wrong to hide such useful functionality behind some
obscure option...
To allow for proper Smarty escaping, this patch needs to introduce some
small changes to the way contact tokens are processed in the greetings.
These shouldn't affect other callers.
To avoid code duplication, a new function is introduced for the template
processing (tokens+Smarty), adding another layer of indirection. This
could be avoided, if replaceGreetingTokens() wasn't used in other
contexts too. (Which I believe is a misunderstanding: I'm pretty sure
the function was only meant for *generating* the greeting texts, by
replacing tokens in the greeting templates when saving a contact record;
and not for replacing greeting tokens in message templates -- the latter
should be handled just fine along with the other contact tokens...)
Ravish Nair [Tue, 8 Oct 2013 13:50:30 +0000 (19:20 +0530)]
-- CRM-10347 added birth date columns and filters
----------------------------------------
* CRM-10347: Add Birth Date to both the Consituent Detail and Constituent Summary Reports
http://issues.civicrm.org/jira/browse/CRM-10347
Xavier Dutoit [Tue, 8 Oct 2013 07:47:02 +0000 (08:47 +0100)]
CRM-13552 add a smarty error if there is a crm error in {crmAPI}
Capo [Mon, 7 Oct 2013 16:57:03 +0000 (18:57 +0200)]
Change assignation in log of changes made via API (CRM-13549)
Olaf Buddenhagen [Mon, 7 Oct 2013 12:18:03 +0000 (14:18 +0200)]
Add upgrade infrastructure for 4.5
Kurund Jalmi [Sun, 6 Oct 2013 15:34:50 +0000 (08:34 -0700)]
Merge pull request #1741 from kurund/version-fixes
fixed version
kurund [Sun, 6 Oct 2013 15:34:28 +0000 (16:34 +0100)]
fixed version
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"
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.
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.
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
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...
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.
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
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...
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
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...
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
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
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
Deepak Srivastava [Thu, 3 Oct 2013 07:54:24 +0000 (13:24 +0530)]
CRM-13333 - made on-behalf-org defaults populate correctly
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
DemeritCowboy [Wed, 2 Oct 2013 16:30:06 +0000 (12:30 -0400)]
CRM-13444: undo CRM-13445 and prevent archived mailing appearing as scheduled
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
CiviCRM [Wed, 2 Oct 2013 13:35:11 +0000 (06:35 -0700)]
Update version to 4.4.beta5
Deepak Srivastava [Wed, 2 Oct 2013 12:56:25 +0000 (18:26 +0530)]
CRM-13333 - on-behalf vs inherited bug fix
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
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
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
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
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
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
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
kurund [Tue, 1 Oct 2013 16:33:49 +0000 (17:33 +0100)]
added event badge to default data
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
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'
Kurund Jalmi [Tue, 1 Oct 2013 15:13:01 +0000 (08:13 -0700)]
Merge pull request #1723 from monishdeb/WebTestFixes
Webtest Fixes
monishdeb [Tue, 1 Oct 2013 14:56:13 +0000 (20:26 +0530)]
Webtest Fixes
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
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
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
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
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.
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
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
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
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
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
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
Dave Greenberg [Mon, 30 Sep 2013 22:23:41 +0000 (15:23 -0700)]
Update Detail.php
Fixed missing space in soft credit stats.
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
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
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
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...
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
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
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
Eileen [Mon, 30 Sep 2013 01:26:46 +0000 (14:26 +1300)]
API Metadata, document field type
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
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
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
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
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
Eileen [Sat, 28 Sep 2013 09:13:47 +0000 (05:13 -0400)]
CRM-13379 fix merge bug
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
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
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
Donald A. Lobo [Fri, 27 Sep 2013 21:20:12 +0000 (14:20 -0700)]
CRM-13460 - Add is_numeric checks and test coverage
----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
http://issues.civicrm.org/jira/browse/CRM-13460
Donald A. Lobo [Fri, 27 Sep 2013 21:03:04 +0000 (14:03 -0700)]
CRM-13460 - Add is_numeric checks and test coverage
----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
http://issues.civicrm.org/jira/browse/CRM-13460
Donald A. Lobo [Fri, 27 Sep 2013 21:01:13 +0000 (14:01 -0700)]
CRM-13460 - Add is_numeric checks and test coverage
----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
http://issues.civicrm.org/jira/browse/CRM-13460
Coleman Watts [Fri, 27 Sep 2013 17:39:16 +0000 (10:39 -0700)]
CRM-13344 - Revert "Fix convertToPseudoNames for CRM-13318"
This reverts commit
ffe16a66e691cdb6dcd889cde5778c7a9bca9c72.
Coleman Watts [Fri, 27 Sep 2013 17:36:24 +0000 (10:36 -0700)]
CRM-13344 - Revert commit
827659b2 schema changes from CRM-13161
----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
http://issues.civicrm.org/jira/browse/CRM-13344
* CRM-13161: Greetings are not evaluated correctly if it includes prefix / suffix
http://issues.civicrm.org/jira/browse/CRM-13161
Dave Greenberg [Fri, 27 Sep 2013 17:20:11 +0000 (10:20 -0700)]
Merge pull request #1707 from lcdservices/CRM-13455
CRM-13455 improve getEvents query to account for empty end_date
Brian Shaughnessy [Fri, 27 Sep 2013 16:53:10 +0000 (12:53 -0400)]
CRM-13455 improve getEvents query to account for empty end_date
Ravish Nair [Fri, 27 Sep 2013 13:32:27 +0000 (19:02 +0530)]
-- CRM-13417 changes as per comment
----------------------------------------
* CRM-13417: Dedupe Rule Creation error trapping fails on length selections for substrings of numeric fields or out of range numbers for text fields
http://issues.civicrm.org/jira/browse/CRM-13417
Ravish Nair [Fri, 27 Sep 2013 11:36:25 +0000 (17:06 +0530)]
-- fix for CRM-13417
----------------------------------------
* CRM-13417: Dedupe Rule Creation error trapping fails on length selections for substrings of numeric fields or out of range numbers for text fields
http://issues.civicrm.org/jira/browse/CRM-13417
deepak-srivastava [Fri, 27 Sep 2013 10:26:24 +0000 (03:26 -0700)]
Merge pull request #1704 from ravishnair/CRM-13450
-- fix for CRM-13450
deepak-srivastava [Fri, 27 Sep 2013 07:42:31 +0000 (00:42 -0700)]
Merge pull request #1703 from pratik-joshi/CRM-13459
CRM-13459 fix : added additional filter of entity_table = 'civicrm_pcp'
Pratik Joshi [Fri, 27 Sep 2013 07:32:30 +0000 (13:02 +0530)]
CRM-13459 fix : added additional filter of entity_table = 'civicrm_pcp'
----------------------------------------
* CRM-13459: PCP Image does not display correct image
http://issues.civicrm.org/jira/browse/CRM-13459
colemanw [Thu, 26 Sep 2013 20:59:03 +0000 (13:59 -0700)]
Merge pull request #1652 from vivekarora/CRM-13368
CRM-13368 - Fixed js code to work same in all browsers
dlobo [Thu, 26 Sep 2013 19:57:06 +0000 (12:57 -0700)]
Merge pull request #1702 from dlobo/master
CRM-7355: Fix cc/bcc address merged with to address for Mail_mail class
Donald A. Lobo [Thu, 26 Sep 2013 19:50:41 +0000 (12:50 -0700)]
Fix cc/bcc address merged with to address for Mail_mail class
Ravish Nair [Thu, 26 Sep 2013 14:48:32 +0000 (20:18 +0530)]
-- fix for CRM-13450
----------------------------------------
* CRM-13450: enhanced logging detail overlay broken
http://issues.civicrm.org/jira/browse/CRM-13450
deepak-srivastava [Thu, 26 Sep 2013 13:51:48 +0000 (06:51 -0700)]
Merge pull request #1701 from deepak-srivastava/profile
CRM-10128 - ignore updates for blank custom fields by anonymous users via profile / create, or profiles embedded in event reg / online contrib forms
Deepak Srivastava [Thu, 26 Sep 2013 10:15:35 +0000 (15:45 +0530)]
Merge branch 'master' into profile