civicrm-core.git
11 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-16-49-03
Tim Otten [Fri, 18 Oct 2013 11:28:24 +0000 (16:58 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-16-49-03

Conflicts:
sql/civicrm_generated.mysql

11 years agoMerge pull request #1811 from totten/4.4-setupsh-escape
Tim Otten [Fri, 18 Oct 2013 11:16:49 +0000 (04:16 -0700)]
Merge pull request #1811 from totten/4.4-setupsh-escape

setup.sh - Quote directory names (which may have spaces)

11 years agosetup.sh - Quote directory names (which may have spaces)
Tim Otten [Fri, 18 Oct 2013 11:14:41 +0000 (16:44 +0530)]
setup.sh - Quote directory names (which may have spaces)

11 years agoMerge pull request #1804 from davecivicrm/CRM-11245
dlobo [Thu, 17 Oct 2013 19:47:26 +0000 (12:47 -0700)]
Merge pull request #1804 from davecivicrm/CRM-11245

CRM-11245 - Reworked the patch to use the configured date format.

11 years agoMerge pull request #1806 from pratik-joshi/CRM-13604
dlobo [Thu, 17 Oct 2013 19:45:14 +0000 (12:45 -0700)]
Merge pull request #1806 from pratik-joshi/CRM-13604

CRM-13604 fix : update mentioned state provinces for country 'Guatemala'

11 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-18-19-41
Tim Otten [Thu, 17 Oct 2013 12:49:48 +0000 (18:19 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-18-19-41

11 years agoMerge branch 'hr-130' of git://github.com/dakshayani/civicrm-core into pull-request...
Tim Otten [Thu, 17 Oct 2013 12:48:25 +0000 (18:18 +0530)]
Merge branch 'hr-130' of git://github.com/dakshayani/civicrm-core into pull-request-1713

11 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-17-47-49
Tim Otten [Thu, 17 Oct 2013 12:26:41 +0000 (17:56 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-17-47-49

Conflicts:
CRM/Contact/BAO/Individual.php
sql/civicrm_generated.mysql

11 years agoCRM-13604 fix : update mentioned state provinces for country 'Guatemala'
Pratik Joshi [Thu, 17 Oct 2013 09:01:50 +0000 (14:31 +0530)]
CRM-13604 fix : update mentioned state provinces for country 'Guatemala'

----------------------------------------
* CRM-13604: Few Province/State are miss-spelled for country Guatemala
  http://issues.civicrm.org/jira/browse/CRM-13604

11 years agoMerge pull request #1805 from deepak-srivastava/upgrade
deepak-srivastava [Thu, 17 Oct 2013 07:59:17 +0000 (00:59 -0700)]
Merge pull request #1805 from deepak-srivastava/upgrade

CRM-13389, CRM-13555 - Upgrade from 4.0.* to 4.4: DB Error: no such tabl...

11 years agoCRM-13389, CRM-13555 - Upgrade from 4.0.* to 4.4: DB Error: no such table civicrm_setting
Deepak Srivastava [Thu, 17 Oct 2013 07:51:34 +0000 (13:21 +0530)]
CRM-13389, CRM-13555 - Upgrade from 4.0.* to 4.4: DB Error: no such table civicrm_setting

11 years agoCRM-11245 - Reworked the patch to use the configured date format.
Dave Greenberg [Wed, 16 Oct 2013 22:43:59 +0000 (15:43 -0700)]
CRM-11245 - Reworked the patch to use the configured date format.

----------------------------------------
* CRM-11245: Display more information in the "Event Name" autocomplete when searching
  http://issues.civicrm.org/jira/browse/CRM-11245

11 years agoMerge pull request #1766 from pratik-joshi/CRM-13551
dlobo [Wed, 16 Oct 2013 15:35:46 +0000 (08:35 -0700)]
Merge pull request #1766 from pratik-joshi/CRM-13551

CRM-13551

11 years agoMerge pull request #1800 from monishdeb/CRM-13601
dlobo [Wed, 16 Oct 2013 15:33:43 +0000 (08:33 -0700)]
Merge pull request #1800 from monishdeb/CRM-13601

CRM-13601 fix -  Multilingual upgrade 4.3.5 to 4.4 beta throws up an err...

11 years agoMerge pull request #1801 from jmcclelland/jscal-fix
dlobo [Wed, 16 Oct 2013 15:29:36 +0000 (08:29 -0700)]
Merge pull request #1801 from jmcclelland/jscal-fix

No js cal on read only fields

11 years agofixing to match default smarty syntax.
Jamie McClelland [Wed, 9 Oct 2013 19:41:34 +0000 (15:41 -0400)]
fixing to match default smarty syntax.

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

11 years agodon't display js pop up on read-only date fields.
Jamie McClelland [Wed, 9 Oct 2013 19:37:23 +0000 (15:37 -0400)]
don't display js pop up on read-only date fields.

It's confusing to the users. See:
http://issues.civicrm.org/jira/browse/CRM-13565

11 years agoCRM-13601 fix - Multilingual upgrade 4.3.5 to 4.4 beta throws up an error
monishdeb [Wed, 16 Oct 2013 13:48:47 +0000 (19:18 +0530)]
CRM-13601 fix -  Multilingual upgrade 4.3.5 to 4.4 beta throws up an error

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

11 years agoMerge pull request #1797 from dlobo/CRM-11794
deepak-srivastava [Wed, 16 Oct 2013 08:56:30 +0000 (01:56 -0700)]
Merge pull request #1797 from dlobo/CRM-11794

CRM-11794 - drop all triggers with civicrm_ prefix

11 years agoCRM-11794 - drop all triggers with civicrm_ prefix
Donald A. Lobo [Tue, 15 Oct 2013 19:52:37 +0000 (12:52 -0700)]
CRM-11794 - drop all triggers with civicrm_ prefix

----------------------------------------
* CRM-11794: Drop Trigger IF Exists fatals if custom table too long
  http://issues.civicrm.org/jira/browse/CRM-11794

11 years agoMerge pull request #1796 from pratik-joshi/CRM-13591
dlobo [Tue, 15 Oct 2013 13:43:51 +0000 (06:43 -0700)]
Merge pull request #1796 from pratik-joshi/CRM-13591

CRM-13591 : fixed condition check for display value returning function for custom fields (i.e used for returning appropriate val for Yes/No fields)

11 years agoMerge pull request #1793 from dlobo/CRM-11794
deepak-srivastava [Tue, 15 Oct 2013 12:48:21 +0000 (05:48 -0700)]
Merge pull request #1793 from dlobo/CRM-11794

CRM-11794 - shorten trigger names and add random string to ensure uniqne...

11 years agoCRM-13591 : fixed condition check for display value returning function for custom...
Pratik Joshi [Tue, 15 Oct 2013 08:54:42 +0000 (14:24 +0530)]
CRM-13591 : fixed condition check for display value returning function for custom fields (i.e used for returning appropriate val for Yes/No fields)

----------------------------------------
* CRM-13591: Yes / No fields are not properly displayed in profile view
  http://issues.civicrm.org/jira/browse/CRM-13591

11 years agoMerge pull request #1783 from ravishnair/CRM-13557fix
Dave Greenberg [Mon, 14 Oct 2013 19:16:35 +0000 (12:16 -0700)]
Merge pull request #1783 from ravishnair/CRM-13557fix

-- CRM-13557 changes as per comment

11 years agoMerge pull request #1794 from dlobo/CRM-13560
dlobo [Mon, 14 Oct 2013 17:45:26 +0000 (10:45 -0700)]
Merge pull request #1794 from dlobo/CRM-13560

CRM-13560 - add documentation

11 years agoCRM-13560 - add documentation
Donald A. Lobo [Mon, 14 Oct 2013 17:44:03 +0000 (10:44 -0700)]
CRM-13560 - add documentation

----------------------------------------
* CRM-13560: hook_civicrm_unsubscribeGroups is undocumented
  http://issues.civicrm.org/jira/browse/CRM-13560

11 years agoCRM-11794 - shorten trigger names and add random string to ensure uniqness
Donald A. Lobo [Mon, 14 Oct 2013 17:07:45 +0000 (10:07 -0700)]
CRM-11794 - shorten trigger names and add random string to ensure uniqness

----------------------------------------
* CRM-11794: Drop Trigger IF Exists fatals if custom table too long
  http://issues.civicrm.org/jira/browse/CRM-11794

11 years agoMerge pull request #1769 from vivekarora/CRM-12060-4.4Patch
dlobo [Mon, 14 Oct 2013 14:21:47 +0000 (07:21 -0700)]
Merge pull request #1769 from vivekarora/CRM-12060-4.4Patch

CRM-12060 - Support hook_civicrm_permissions on WordPress

11 years agoMerge pull request #1791 from pratik-joshi/CRM-13573
dlobo [Mon, 14 Oct 2013 14:17:33 +0000 (07:17 -0700)]
Merge pull request #1791 from pratik-joshi/CRM-13573

CRM-13573 : fix to process search criteria on page load as well

11 years agoMerge pull request #1789 from pratik-joshi/CRM-13571
dlobo [Mon, 14 Oct 2013 14:16:27 +0000 (07:16 -0700)]
Merge pull request #1789 from pratik-joshi/CRM-13571

CRM-13571 : replace 'Møre ag Romsdal' with 'Møre og Romsdal'

11 years agoMerge pull request #1773 from davejenx/CRM-8338-merge-by-household
dlobo [Mon, 14 Oct 2013 14:15:47 +0000 (07:15 -0700)]
Merge pull request #1773 from davejenx/CRM-8338-merge-by-household

CRM-8338 implement CRM_Contact_Form_Task::mergeContactIdsByHousehold(), ...

11 years agoMerge pull request #1792 from ravishnair/CRM-13570
deepak-srivastava [Mon, 14 Oct 2013 13:05:01 +0000 (06:05 -0700)]
Merge pull request #1792 from ravishnair/CRM-13570

-- CRM-13570 fix

11 years ago-- CRM-13570 fix
Ravish Nair [Mon, 14 Oct 2013 12:50:50 +0000 (18:20 +0530)]
-- CRM-13570 fix

----------------------------------------
* CRM-13570: Admin-only price set fields not available when adding multiple contacts to event from advanced search results
  http://issues.civicrm.org/jira/browse/CRM-13570

11 years agoMerge pull request #1790 from deepak-srivastava/cf-reports
deepak-srivastava [Mon, 14 Oct 2013 11:12:41 +0000 (04:12 -0700)]
Merge pull request #1790 from deepak-srivastava/cf-reports

CRM-13546 - Custom fields in CiviReport: 'access all custom data' permis...

11 years agoCRM-13573 : fix to process search criteria on page load as well
Pratik Joshi [Mon, 14 Oct 2013 11:11:18 +0000 (16:41 +0530)]
CRM-13573 : fix to process search criteria on page load as well

----------------------------------------
* CRM-13573: Manage Groups display shows disabled groups on initial display - but disabled groups option is NOT selected
  http://issues.civicrm.org/jira/browse/CRM-13573

11 years agoCRM-13546 - Custom fields in CiviReport: 'access all custom data' permission not...
Deepak Srivastava [Mon, 14 Oct 2013 11:06:32 +0000 (16:36 +0530)]
CRM-13546 - Custom fields in CiviReport: 'access all custom data' permission not respected

11 years ago-- CRM-13557 added display_name and sort_name in the list
Ravish Nair [Mon, 14 Oct 2013 08:02:06 +0000 (13:32 +0530)]
-- CRM-13557 added display_name and sort_name in the list

----------------------------------------
* CRM-13557: Contact Hash is appearing on manual merge screen and should be suppressed
  http://issues.civicrm.org/jira/browse/CRM-13557

11 years agoCRM-13571 : replace 'Møre ag Romsdal' with 'Møre og Romsdal'
Pratik Joshi [Mon, 14 Oct 2013 07:49:37 +0000 (13:19 +0530)]
CRM-13571 : replace 'Møre ag Romsdal' with 'Møre og Romsdal'

----------------------------------------
* CRM-13571: Wrong name on a Norwegian county in the core files
  http://issues.civicrm.org/jira/browse/CRM-13571

11 years agoMerge pull request #1785 from sfe-ev/name_fields_config
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

11 years agoMerge pull request #1784 from vivekarora/HR-176-Corrected
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 ...

11 years agoMerge pull request #1786 from totten/4.4-smarty-ts
Kurund Jalmi [Sat, 12 Oct 2013 14:02:20 +0000 (07:02 -0700)]
Merge pull request #1786 from totten/4.4-smarty-ts

CRM-13580 - Set translation domain implicitly (for Smarty)

11 years agoCRM-13580 - ts - Set the default translation domain based on $extensionKey
Tim Otten [Fri, 11 Oct 2013 17:59:44 +0000 (18:59 +0100)]
CRM-13580 - ts - Set the default translation domain based on $extensionKey

Reset $extensionKey when loading each file. This puts the onus on developers
to set the extensionKey once in each file using {assign} or {tsScope}, but
it prevents the extension key from leaking unintentionally to other files,
and it allows developers to handle weird situations explicitly.

(Example weird situation -- using one extension to override another
extension's template; or having multiple extensions share a common
translation key.)

----------------------------------------
* CRM-13580: Set translation domain implicitly in extensions
  http://issues.civicrm.org/jira/browse/CRM-13580

11 years agoCRM-13580 - crmScope - Add support for "dynamic variable scopes" in Smarty
Tim Otten [Fri, 11 Oct 2013 17:53:42 +0000 (18:53 +0100)]
CRM-13580 - crmScope - Add support for "dynamic variable scopes" in Smarty

This allows one to temporarily a set variable for a brief duration -- and
restore the variable's original value afterward.

----------------------------------------
* CRM-13580: Set translation domain implicitly in extensions
  http://issues.civicrm.org/jira/browse/CRM-13580

11 years agoMake all Individual name fields configurable
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.

11 years agoRevert "Make `formal_title` field optional"
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.

11 years agoHR-176 - External ID - this field needs to be included below the CiviHR ID field
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

11 years agoMerge pull request #1772 from eileenmcnaughton/CRM-13234
Kurund Jalmi [Fri, 11 Oct 2013 13:30:25 +0000 (06:30 -0700)]
Merge pull request #1772 from eileenmcnaughton/CRM-13234

CRM-13234 add adjust profile api to link related items

11 years agoMerge pull request #1775 from pratik-joshi/CRM-13237
Kurund Jalmi [Fri, 11 Oct 2013 13:29:21 +0000 (06:29 -0700)]
Merge pull request #1775 from pratik-joshi/CRM-13237

fix for CRM-13237 : we are currently not updating contribution activity while editing contributions, thats why the campaign id doesn't get saved in activity record during contribution edits

11 years agoMerge pull request #1776 from monishdeb/CRM-9988
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

11 years agoMerge pull request #1777 from monishdeb/CRM-12653
Kurund Jalmi [Fri, 11 Oct 2013 13:26:35 +0000 (06:26 -0700)]
Merge pull request #1777 from monishdeb/CRM-12653

Crm 12653 related fix

11 years agoMerge pull request #1779 from pratik-joshi/CRM-13563
Kurund Jalmi [Fri, 11 Oct 2013 13:26:07 +0000 (06:26 -0700)]
Merge pull request #1779 from pratik-joshi/CRM-13563

CRM-13563 fix: exclude the 'save and new' button on form for group search context

11 years agoMerge pull request #1780 from pratik-joshi/CRM-13568
Kurund Jalmi [Fri, 11 Oct 2013 13:25:26 +0000 (06:25 -0700)]
Merge pull request #1780 from pratik-joshi/CRM-13568

CRM-13568 : variable definition was missing

11 years agoMerge pull request #1763 from colemanw/prefix-suffix
Kurund Jalmi [Fri, 11 Oct 2013 12:45:03 +0000 (05:45 -0700)]
Merge pull request #1763 from colemanw/prefix-suffix

CRM-13344 - Individual/Pseudoconstant - Fix prefix/suffix

11 years ago-- CRM-13557 changes as per comment
Ravish Nair [Fri, 11 Oct 2013 08:34:22 +0000 (14:04 +0530)]
-- CRM-13557 changes as per comment

----------------------------------------
* CRM-13557: Contact Hash is appearing on manual merge screen and should be suppressed
  http://issues.civicrm.org/jira/browse/CRM-13557

11 years agoMerge pull request #1782 from deepak-srivastava/upgrade
deepak-srivastava [Thu, 10 Oct 2013 13:35:49 +0000 (06:35 -0700)]
Merge pull request #1782 from deepak-srivastava/upgrade

CRM-13555, remove description column from default list atleast for upgra...

11 years agoCRM-13555, remove description column from default list atleast for upgrade.
Deepak Srivastava [Thu, 10 Oct 2013 13:26:52 +0000 (18:56 +0530)]
CRM-13555, remove description column from default list atleast for upgrade.

11 years agoMerge pull request #1778 from ravishnair/CRM-13557fix
deepak-srivastava [Thu, 10 Oct 2013 11:34:14 +0000 (04:34 -0700)]
Merge pull request #1778 from ravishnair/CRM-13557fix

-- CRM-13557 suppressed invalid fields during manual merge

11 years agoCRM-13568 : variable definition was missing
Pratik Joshi [Thu, 10 Oct 2013 11:14:56 +0000 (16:44 +0530)]
CRM-13568 : variable definition was missing

----------------------------------------
* CRM-13568: e-notices on contribution -membership report
  http://issues.civicrm.org/jira/browse/CRM-13568

11 years agoCRM-13563 fix: exclude the 'save and new' button on form for group search context
Pratik Joshi [Thu, 10 Oct 2013 10:55:52 +0000 (16:25 +0530)]
CRM-13563 fix: exclude the 'save and new' button on form for group search context

----------------------------------------
* CRM-13563: Registering a group of contacts for an event from Manage group option gets error when "Save and New" button is selected.
  http://issues.civicrm.org/jira/browse/CRM-13563

11 years agoIndentation fix at same commit
monishdeb [Thu, 10 Oct 2013 10:31:37 +0000 (16:01 +0530)]
Indentation fix at same commit

11 years agoCRM-12653 related fix
monishdeb [Thu, 10 Oct 2013 10:20:52 +0000 (15:50 +0530)]
CRM-12653 related fix

----------------------------------------
* CRM-12653: Add Soft Credit Amount Field to Batch Data Entry
  http://issues.civicrm.org/jira/browse/CRM-12653

11 years agoCRM-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

11 years ago-- CRM-13557 also suppressed other invalid fields
Ravish Nair [Thu, 10 Oct 2013 08:59:53 +0000 (14:29 +0530)]
-- CRM-13557 also suppressed other invalid fields

----------------------------------------
* CRM-13557: Contact Hash is appearing on manual merge screen and should be suppressed
  http://issues.civicrm.org/jira/browse/CRM-13557

11 years agoMerge pull request #1770 from agh1/record-activity-task-custom-search
dlobo [Thu, 10 Oct 2013 09:36:35 +0000 (02:36 -0700)]
Merge pull request #1770 from agh1/record-activity-task-custom-search

CRM-13564 "Could not find a valid session key" after create activity in custom search

11 years agoCRM-13237 : code comment
Pratik Joshi [Thu, 10 Oct 2013 08:39:14 +0000 (14:09 +0530)]
CRM-13237 : code comment

----------------------------------------
* CRM-13237: Campaign ID in Activites table does not update after edits
  http://issues.civicrm.org/jira/browse/CRM-13237

11 years agofix for CRM-13237 : we are currently not updating contribution activity while editing...
Pratik Joshi [Thu, 10 Oct 2013 08:30:29 +0000 (14:00 +0530)]
fix for CRM-13237 : we are currently not updating contribution activity while editing contributions, thats why the campaign id doesn't get saved in activity record during contribution edits

----------------------------------------
* CRM-13237: Campaign ID in Activites table does not update after edits
  http://issues.civicrm.org/jira/browse/CRM-13237

11 years agoMerge pull request #1774 from deepak-srivastava/csearch
deepak-srivastava [Thu, 10 Oct 2013 08:27:58 +0000 (01:27 -0700)]
Merge pull request #1774 from deepak-srivastava/csearch

CRM-13561 - added new hook for panes-mapper

11 years agoCRM-13561 - added new hook for panes-mapper
Deepak Srivastava [Thu, 10 Oct 2013 08:23:37 +0000 (13:53 +0530)]
CRM-13561 - added new hook for panes-mapper

11 years ago-- CRM-13557 suppressed hash
Ravish Nair [Thu, 10 Oct 2013 07:47:21 +0000 (13:17 +0530)]
-- CRM-13557 suppressed hash

----------------------------------------
* CRM-13557: Contact Hash is appearing on manual merge screen and should be suppressed
  http://issues.civicrm.org/jira/browse/CRM-13557

11 years agoCRM-8338 removed CRM_Contact_Form_Task_Label::mergeSameHousehold(), made obsolete...
Dave Jenkins [Wed, 9 Oct 2013 22:30:48 +0000 (23:30 +0100)]
CRM-8338 removed CRM_Contact_Form_Task_Label::mergeSameHousehold(), made obsolete by CRM_Contact_Form_Task::mergeContactIdsByHousehold() implemented in previous commit.

----------------------------------------
* CRM-8338: Mailing Label Household Merge requires Household to be selected as well as individuals
  http://issues.civicrm.org/jira/browse/CRM-8338

11 years agoCRM-8338 implement CRM_Contact_Form_Task::mergeContactIdsByHousehold(), replacing...
Dave Jenkins [Wed, 9 Oct 2013 21:57:41 +0000 (22:57 +0100)]
CRM-8338 implement CRM_Contact_Form_Task::mergeContactIdsByHousehold(), replacing ids of household members with the id of their household so we can merge labels by household without needing the households to be in the search results.

----------------------------------------
* CRM-8338: Mailing Label Household Merge requires Household to be selected as well as individuals
  http://issues.civicrm.org/jira/browse/CRM-8338

11 years agoprofile-api comments tidy-up
Eileen [Wed, 9 Oct 2013 20:36:52 +0000 (09:36 +1300)]
profile-api comments tidy-up

11 years agoCRM-13234 add adjust profile api to link related items
Eileen [Wed, 9 Oct 2013 20:29:44 +0000 (09:29 +1300)]
CRM-13234 add adjust profile api to link related items

11 years agofix for returning to custom search from new activity task
Andrew Hunt [Wed, 9 Oct 2013 18:34:36 +0000 (14:34 -0400)]
fix for returning to custom search from new activity task

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 agoMerge pull request #1457 from sfe-ev/greetings-PR
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

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 agoCRM-13551 : includes 'point b)' fix as well as code improvement
Pratik Joshi [Wed, 9 Oct 2013 10:49:37 +0000 (16:19 +0530)]
CRM-13551 : includes 'point b)' fix as well as code improvement

----------------------------------------
* CRM-13551: Fix bug in Activity Form
  http://issues.civicrm.org/jira/browse/CRM-13551

11 years agoCRM-13551 : fix for point 'a)' mentioned in issue - the json object was not properly...
Pratik Joshi [Tue, 8 Oct 2013 12:49:45 +0000 (18:19 +0530)]
CRM-13551 : fix for point 'a)' mentioned in issue - the json object was not properly getting created

----------------------------------------
* CRM-13551: Fix bug in Activity Form
  http://issues.civicrm.org/jira/browse/CRM-13551

11 years agoMerge pull request #1751 from elcapo/master
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)

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 #1756 from tttp/crm-13552-crmAPI
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}

11 years agoMerge pull request #1760 from ravishnair/CRM-10347
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

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 agoAdd configuration UI for Communication Style options
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.

11 years agoIntroduce new `communication_style` field for Contacts
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...

11 years agoMake `formal_title` field optional
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...

11 years agoIntroduce new `formal_title` field for contacts
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.

11 years agoProcess greeting templates with Smarty
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...)

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 agoCRM-13344 - Individual/Pseudoconstant - Fix prefix/suffix
Coleman Watts [Tue, 8 Oct 2013 12:04:31 +0000 (13:04 +0100)]
CRM-13344 - Individual/Pseudoconstant - Fix prefix/suffix

----------------------------------------
* 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 #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 ago-- CRM-10347 added birth date columns and filters
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

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