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...
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
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
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
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
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.
Dave Greenberg [Sun, 6 Oct 2013 21:59:20 +0000 (14:59 -0700)]
Merge pull request #1740 from joannechester/config-list-update
CRM-13496 Enable Components added to site configuration section of the Configuration CHecklist
Dave Greenberg [Sun, 6 Oct 2013 21:44:07 +0000 (14:44 -0700)]
Merge pull request #1743 from davecivicrm/CRM-13442
CRM-13442 put back the help text for Redirect to Database option.
Dave Greenberg [Sun, 6 Oct 2013 21:43:21 +0000 (22:43 +0100)]
CRM-13442 put back the help text for Redirect to Database option.
----------------------------------------
* CRM-13442: Update Outbound Email help text
http://issues.civicrm.org/jira/browse/CRM-13442
colemanw [Sun, 6 Oct 2013 21:41:08 +0000 (14:41 -0700)]
Merge pull request #1742 from colemanw/4.4
CRM-13344 - Contact Import - Fix prefix, suffix, gender import
Coleman Watts [Sun, 6 Oct 2013 21:39:24 +0000 (22:39 +0100)]
CRM-13344 - Contact Import - Fix prefix, suffix, gender import
----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
http://issues.civicrm.org/jira/browse/CRM-13344
joanne [Sun, 6 Oct 2013 19:54:26 +0000 (06:54 +1100)]
civicontribute and changes to html tags
joanne [Sun, 6 Oct 2013 15:13:36 +0000 (02:13 +1100)]
CRM-13496 Enable Components added to site configuration section
----------------------------------------
* CRM-13496: Add Enable Components to the Configuration Checklist.
http://issues.civicrm.org/jira/browse/CRM-13496
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
projects / civicrm-core.git / log