Donald A. Lobo [Fri, 18 Oct 2013 20:20:02 +0000 (13:20 -0700)]
Fix notices and formatting for word replacement
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
Tim Otten [Fri, 18 Oct 2013 11:41:59 +0000 (17:11 +0530)]
mk-drupal-test-site - Allow space in SQL file name
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)
Tim Otten [Fri, 18 Oct 2013 11:34:07 +0000 (17:04 +0530)]
setup.sh - Quote directory names (which may have spaces)
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)
Tim Otten [Fri, 18 Oct 2013 11:14:41 +0000 (16:44 +0530)]
setup.sh - Quote directory names (which may have spaces)
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.
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'
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
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
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...
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
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
dlobo [Wed, 16 Oct 2013 15:35:46 +0000 (08:35 -0700)]
Merge pull request #1766 from pratik-joshi/CRM-13551
CRM-13551
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...
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
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
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
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)
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...
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
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
dlobo [Mon, 14 Oct 2013 17:45:26 +0000 (10:45 -0700)]
Merge pull request #1794 from dlobo/CRM-13560
CRM-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
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
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
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
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'
deepak-srivastava [Mon, 14 Oct 2013 13:05:01 +0000 (06:05 -0700)]
Merge pull request #1792 from ravishnair/CRM-13570
-- 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
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...
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
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
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
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
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)
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
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
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
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
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
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
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
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
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
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...
Deepak Srivastava [Thu, 10 Oct 2013 13:26:52 +0000 (18:56 +0530)]
CRM-13555, remove description column from default list atleast for upgrade.
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
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
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
monishdeb [Thu, 10 Oct 2013 10:31:37 +0000 (16:01 +0530)]
Indentation fix at same commit
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
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
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
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
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
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
Deepak Srivastava [Thu, 10 Oct 2013 08:23:37 +0000 (13:53 +0530)]
CRM-13561 - added new hook for panes-mapper
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
Eileen [Wed, 9 Oct 2013 20:36:52 +0000 (09:36 +1300)]
profile-api comments tidy-up
Eileen [Wed, 9 Oct 2013 20:29:44 +0000 (09:29 +1300)]
CRM-13234 add adjust profile api to link related items
Andrew Hunt [Wed, 9 Oct 2013 18:34:36 +0000 (14:34 -0400)]
fix for returning to custom search from new activity task
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
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.
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
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
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
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
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...
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
Deepak Srivastava [Wed, 9 Oct 2013 08:23:19 +0000 (13:53 +0530)]
CRM-13553 - The last remaining enabled component cannot be disabled
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
Dave Greenberg [Tue, 8 Oct 2013 15:38:32 +0000 (08:38 -0700)]
Merge pull request #1754 from yashodha/CRM-13548
CRM-13548
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.
yashodha [Tue, 8 Oct 2013 14:39:12 +0000 (20:09 +0530)]
fix onload text changes to help
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
yashodha [Tue, 8 Oct 2013 12:40:52 +0000 (18:10 +0530)]
UI changes to Activity Search form
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
Coleman Watts [Tue, 8 Oct 2013 12:10:00 +0000 (13:10 +0100)]
VOL-20 - CSS - Make grid css work in popup
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.
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
Tim Otten [Mon, 7 Oct 2013 23:46:00 +0000 (00:46 +0100)]
gitify - Setup both "origin" and "upstream" remotes (optionally)
yashodha [Mon, 7 Oct 2013 22:12:48 +0000 (03:42 +0530)]
more UI changes to search screen
yashodha [Mon, 7 Oct 2013 21:51:18 +0000 (03:21 +0530)]
made changes to text to make context clearer
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.
Tim Otten [Mon, 7 Oct 2013 17:59:12 +0000 (18:59 +0100)]
gitify - Extract helpers, do_gencode and config_repo
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
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.
Mathieu Lutfy [Mon, 7 Oct 2013 16:32:45 +0000 (12:32 -0400)]
Fix ts() usage.
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
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
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
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
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
Coleman Watts [Mon, 7 Oct 2013 14:28:41 +0000 (15:28 +0100)]
CRM_Contact_BAO_Individual Code cleanup
Mathieu Lutfy [Mon, 7 Oct 2013 13:42:43 +0000 (09:42 -0400)]
Fix ts() usage.
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
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
Mathieu Lutfy [Mon, 7 Oct 2013 11:38:54 +0000 (07:38 -0400)]
Fix ts() usage.
projects / civicrm-core.git / log