civicrm-core.git
11 years agoMerge pull request #1828 from pratik-joshi/CRM-13631
Kurund Jalmi [Tue, 22 Oct 2013 11:51:47 +0000 (04:51 -0700)]
Merge pull request #1828 from pratik-joshi/CRM-13631

CRM-13631

11 years agoMerge pull request #1829 from deepak-srivastava/CRM-13629
deepak-srivastava [Tue, 22 Oct 2013 09:50:22 +0000 (02:50 -0700)]
Merge pull request #1829 from deepak-srivastava/CRM-13629

CRM-13629

11 years agoCRM-13629
Deepak Srivastava [Tue, 22 Oct 2013 09:48:45 +0000 (15:18 +0530)]
CRM-13629

11 years agoCRM-13631
Pratik Joshi [Tue, 22 Oct 2013 05:10:42 +0000 (10:40 +0530)]
CRM-13631

----------------------------------------
* CRM-13631: vCard not including organization name
  http://issues.civicrm.org/jira/browse/CRM-13631

11 years agoMerge pull request #1827 from davecivicrm/CRM-13567
colemanw [Mon, 21 Oct 2013 23:22:34 +0000 (16:22 -0700)]
Merge pull request #1827 from davecivicrm/CRM-13567

  CRM-13567 - Incorporate query fix for contribution detail reports to … …  …filter by Batch + fixing the getBatches BAO to remove unneeded filtering on batch type and batch status. Now we only exclude batches that are still in Data Entry status.

11 years agoCRM-13567 - Incorporate query fix for contribution detail reports to filter by Batch...
Dave Greenberg [Mon, 21 Oct 2013 23:16:41 +0000 (16:16 -0700)]
CRM-13567 - Incorporate query fix for contribution detail reports to filter by Batch + fixing the getBatches BAO to remove unneeded filtering on batch type and batch status. Now we only exclude batches that are still in Data Entry status.

----------------------------------------
* CRM-13567: CiviContribute Detail report fails if you add batch data as a filter
  http://issues.civicrm.org/jira/browse/CRM-13567

11 years agoIncorporate query fix for contribution detail reports to filter by Batch + fixing...
Dave Greenberg [Mon, 21 Oct 2013 23:00:09 +0000 (16:00 -0700)]
Incorporate query fix for contribution detail reports to filter by Batch + fixing the getBatches BAO to remove unneeded filtering on batch type and batch status. Now we only exclude batches that are still in Data Entry status.

11 years agoMerge pull request #1823 from lcdservices/CRM-13628
dlobo [Mon, 21 Oct 2013 19:57:42 +0000 (12:57 -0700)]
Merge pull request #1823 from lcdservices/CRM-13628

CRM-13628 fix memory leak in note deletion by freeing DAO

11 years agoCRM-13628 fix memory leak in note deletion by freeing DAO
Brian Shaughnessy [Mon, 21 Oct 2013 19:01:32 +0000 (15:01 -0400)]
CRM-13628 fix memory leak in note deletion by freeing DAO

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-21-22-31-28
kurund [Mon, 21 Oct 2013 17:26:16 +0000 (22:56 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-21-22-31-28

Conflicts:
CRM/Report/Form/Contribute/TopDonor.php
sql/civicrm_generated.mysql
templates/CRM/Price/Form/Calculate.tpl
xml/version.xml

11 years agoMerge pull request #1807 from totten/4.3-mk-drupal-test-site-setup-conf
Kurund Jalmi [Mon, 21 Oct 2013 10:52:28 +0000 (03:52 -0700)]
Merge pull request #1807 from totten/4.3-mk-drupal-test-site-setup-conf

mk-drupal-test-site - When writing out setup.conf, include CIVISOURCEDIR

11 years agoMerge pull request #1810 from monishdeb/CRM-13344
deepak-srivastava [Mon, 21 Oct 2013 10:51:01 +0000 (03:51 -0700)]
Merge pull request #1810 from monishdeb/CRM-13344

CRM-13344 fix - Unable to import Contact's gender,prefix and suffix in update/fill case

11 years agoMerge pull request #1798 from eileenmcnaughton/4.4
colemanw [Mon, 21 Oct 2013 04:02:43 +0000 (21:02 -0700)]
Merge pull request #1798 from eileenmcnaughton/4.4

CRM-13598 d6 - use  drupal mechanism to identify table prefixing

11 years agoDrupal user fns - colemans' code
Eileen McNaughton [Sun, 20 Oct 2013 23:23:43 +0000 (12:23 +1300)]
Drupal user fns - colemans' code

11 years agoDrupal user fns - copy Coleman's code in
Eileen McNaughton [Sun, 20 Oct 2013 22:09:19 +0000 (11:09 +1300)]
Drupal user fns - copy Coleman's code in

https://github.com/civicrm/civicrm-core/pull/1798/files#r7022773

11 years agoAPI - add deprecation tag to constant api
Coleman Watts [Sat, 19 Oct 2013 18:30:21 +0000 (11:30 -0700)]
API - add deprecation tag to constant api

11 years agoMerge pull request #1816 from pradpnayak/CRM-13446
colemanw [Sat, 19 Oct 2013 18:17:43 +0000 (11:17 -0700)]
Merge pull request #1816 from pradpnayak/CRM-13446

CRM-13446

11 years agoMerge pull request #1817 from colemanw/4.4
colemanw [Sat, 19 Oct 2013 17:07:54 +0000 (10:07 -0700)]
Merge pull request #1817 from colemanw/4.4

CRM-13608 - API - Support 'sequential' param with getoptions

11 years agoCRM-13608 - API - Support 'sequential' param with getoptions
Coleman Watts [Sat, 19 Oct 2013 15:39:25 +0000 (08:39 -0700)]
CRM-13608 - API - Support 'sequential' param with getoptions

----------------------------------------
* CRM-13608: Api3 'getoptions' ordering doesn't work as JSON
  http://issues.civicrm.org/jira/browse/CRM-13608

11 years agoCRM-13446
Pradeep Nayak [Sat, 19 Oct 2013 13:17:15 +0000 (18:47 +0530)]
CRM-13446

----------------------------------------
* CRM-13446: Add ON DELETE Options for constraints fails
  http://issues.civicrm.org/jira/browse/CRM-13446

11 years agoMerge pull request #1814 from dlobo/MiscFixes
dlobo [Fri, 18 Oct 2013 20:20:46 +0000 (13:20 -0700)]
Merge pull request #1814 from dlobo/MiscFixes

Fix notices and formatting for word replacement

11 years agoFix notices and formatting for word replacement
Donald A. Lobo [Fri, 18 Oct 2013 20:20:02 +0000 (13:20 -0700)]
Fix notices and formatting for word replacement

11 years agoMerge pull request #1813 from totten/4.4-mkdrupaltestsite-space
Tim Otten [Fri, 18 Oct 2013 11:44:20 +0000 (04:44 -0700)]
Merge pull request #1813 from totten/4.4-mkdrupaltestsite-space

mk-drupal-test-site - Allow space in SQL file name

11 years agomk-drupal-test-site - Allow space in SQL file name
Tim Otten [Fri, 18 Oct 2013 11:41:59 +0000 (17:11 +0530)]
mk-drupal-test-site - Allow space in SQL file name

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

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:34:07 +0000 (17:04 +0530)]
setup.sh - Quote directory names (which may have spaces)

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 agoCRM-13344 fix - Resolve test / schema issues around prefix_id, suffix_id, gender
monishdeb [Fri, 18 Oct 2013 10:10:37 +0000 (15:40 +0530)]
CRM-13344 fix - Resolve test / schema issues around prefix_id, suffix_id, gender

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

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 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 agomk-drupal-test-site - When writing out setup.conf, include both the old SVNROOT and...
Tim Otten [Thu, 17 Oct 2013 12:29:04 +0000 (17:59 +0530)]
mk-drupal-test-site - When writing out setup.conf, include both the old SVNROOT and the new CIVISOURCEDIR

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-13598 d6 user vaauthentication - add comments
Eileen [Wed, 16 Oct 2013 22:51:19 +0000 (11:51 +1300)]
CRM-13598 d6 user vaauthentication - add comments

----------------------------------------
* CRM-13598: User drupal {users} rather than storing name of drupal user table
  http://issues.civicrm.org/jira/browse/CRM-13598

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 agoCRM-13598 d6 user validation, This commit leaves the PEAR method on authenticate...
Eileen [Wed, 16 Oct 2013 22:41:24 +0000 (11:41 +1300)]
CRM-13598 d6 user validation, This commit leaves the PEAR method on authenticate 'untouched' as there 'may' be cases where the bootstrapping is not taking place - although I am not convinced any remain, this remains a gotcha for people with prefixed tables in d6 & d7

----------------------------------------
* CRM-13598: User drupal {users} rather than storing name of drupal user table
  http://issues.civicrm.org/jira/browse/CRM-13598

11 years agoMerge pull request #1803 from dlobo/CRM-13554
dlobo [Wed, 16 Oct 2013 19:49:34 +0000 (12:49 -0700)]
Merge pull request #1803 from dlobo/CRM-13554

CRM-13554 - Fix typos in mass conversion

11 years agoMerge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-13554
Donald A. Lobo [Wed, 16 Oct 2013 19:46:15 +0000 (12:46 -0700)]
Merge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-13554

11 years agoCRM-13554
Donald A. Lobo [Wed, 16 Oct 2013 19:45:02 +0000 (12:45 -0700)]
CRM-13554

----------------------------------------
* CRM-13554: Improve string validation in the query engine
  http://issues.civicrm.org/jira/browse/CRM-13554

11 years agoMerge pull request #1802 from dlobo/CRM-13554
dlobo [Wed, 16 Oct 2013 19:35:42 +0000 (12:35 -0700)]
Merge pull request #1802 from dlobo/CRM-13554

CRM-13554

11 years agoCRM-13554
Donald A. Lobo [Wed, 16 Oct 2013 19:35:06 +0000 (12:35 -0700)]
CRM-13554

----------------------------------------
* CRM-13554: Improve string validation in the query engine
  http://issues.civicrm.org/jira/browse/CRM-13554

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 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-13598 d6 - use drupal mechanism to identify table prefixing
Eileen [Wed, 16 Oct 2013 01:54:28 +0000 (14:54 +1300)]
CRM-13598 d6 - use  drupal mechanism to identify table prefixing

----------------------------------------
* CRM-13598: User drupal {users} rather than storing name of drupal user table
  http://issues.civicrm.org/jira/browse/CRM-13598

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 #1788 from totten/4.3-ofc-delete
dlobo [Mon, 14 Oct 2013 14:19:26 +0000 (07:19 -0700)]
Merge pull request #1788 from totten/4.3-ofc-delete

CRM-13572 - Upgrader - Delete OFC file and/or display message

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 #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 agoCRM-13572 - Upgrader - Delete OFC file and/or display message
Tim Otten [Sat, 12 Oct 2013 15:45:18 +0000 (16:45 +0100)]
CRM-13572 - Upgrader - Delete OFC file and/or display message

----------------------------------------
* CRM-13572:
  http://issues.civicrm.org/jira/browse/CRM-13572

11 years agoCRM-13572 - Upgrader - Display pre-upgrade message about OFC
Tim Otten [Sat, 12 Oct 2013 14:36:51 +0000 (15:36 +0100)]
CRM-13572 - Upgrader - Display pre-upgrade message about OFC

----------------------------------------
* CRM-13572:
  http://issues.civicrm.org/jira/browse/CRM-13572

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 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 #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 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 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 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