Tim Otten [Mon, 12 Aug 2013 06:47:01 +0000 (23:47 -0700)]
CRM-13165 - CRM/Form/validate.tpl - Make it easier to include in CiviHR
----------------------------------------
* CRM-13165: hrjob: Re-save produces blocking error, "X is not a valid amount"
http://issues.civicrm.org/jira/browse/CRM-13165
Tim Otten [Mon, 12 Aug 2013 05:34:05 +0000 (22:34 -0700)]
CRM-13165 - api/v3/utils - Don't mandate that all "MONEY" fields be non-null
----------------------------------------
* CRM-13165: hrjob: Re-save produces blocking error, "X is not a valid amount"
http://issues.civicrm.org/jira/browse/CRM-13165
Tim Otten [Sat, 10 Aug 2013 00:22:21 +0000 (17:22 -0700)]
Merge pull request #1229 from totten/master-exttesthook
CRM_Utils_Hook_UnitTests - When running tests from an extension...
Tim Otten [Fri, 9 Aug 2013 22:36:19 +0000 (15:36 -0700)]
CRM-13089 - Add unit test for a creating field with a specific "name"
----------------------------------------
* CRM-13089: CRM_Core_BAO_CustomField::create overrides user-defined name parameter values
http://issues.civicrm.org/jira/browse/CRM-13089
Tim Otten [Fri, 9 Aug 2013 22:31:02 +0000 (15:31 -0700)]
CRM-13089 - Restore numeric suffix for new (default) column names
----------------------------------------
* CRM-13089: CRM_Core_BAO_CustomField::create overrides user-defined name parameter values
http://issues.civicrm.org/jira/browse/CRM-13089
Tim Otten [Fri, 9 Aug 2013 22:39:15 +0000 (15:39 -0700)]
Merge branch 'crm-13089-CRM_Core_BAO_CustomField_overrides_name' of git://github.com/mmikitka/civicrm-core into pull-request-1206
colemanw [Fri, 9 Aug 2013 22:01:39 +0000 (15:01 -0700)]
Merge pull request #1381 from colemanw/ccJs
Abstract payment js to work in webform context
Kurund Jalmi [Fri, 9 Aug 2013 16:44:55 +0000 (09:44 -0700)]
Merge pull request #1384 from yashodha/4.4.CRM-10138
fix notice for failing test(CRM-10138)
Dave Greenberg [Fri, 9 Aug 2013 16:40:50 +0000 (09:40 -0700)]
Merge pull request #1367 from agh1/past3months-events
3 months of events & don't default to sending receipt for past events (CRM-13189)
Thx Andrew. I think the last change you made is quite helpful and works nicely.
mmikitka [Fri, 9 Aug 2013 04:00:48 +0000 (00:00 -0400)]
Fixed bug https://github.com/civicrm/civicrm-core/pull/1206#issuecomment-
21285959
Coleman Watts [Fri, 9 Aug 2013 03:26:12 +0000 (20:26 -0700)]
Abstract payment js to work in webform context
Andrew Hunt [Fri, 9 Aug 2013 01:52:06 +0000 (21:52 -0400)]
allow toggle back to current/future events
Tim Otten [Fri, 9 Aug 2013 00:30:02 +0000 (17:30 -0700)]
Merge pull request #1380 from totten/master-reapply-1371
CRM-12930 Always use Smarty security for string templates
Neil Drumm [Thu, 8 Aug 2013 05:55:56 +0000 (05:55 +0000)]
CRM-12930 Always use Smarty security for string templates
Tim Otten [Thu, 8 Aug 2013 23:51:04 +0000 (16:51 -0700)]
Merge pull request #1379 from totten/master-viewperm-fix
CRM-10935 - CRM/Core/xml/Menu/Contact.xml - Fix malformed permissions
Tim Otten [Thu, 8 Aug 2013 23:48:50 +0000 (16:48 -0700)]
CRM-10935 - CRM/Core/xml/Menu/Contact.xml - Fix malformed permissions
----------------------------------------
* CRM-10935: Create new Core Permission - CiviCRM: Access own Contact or both "CiviCRM: View own Contact" and "CiviCRM: Edit own Contact"
http://issues.civicrm.org/jira/browse/CRM-10935
Tim Otten [Thu, 8 Aug 2013 22:42:16 +0000 (15:42 -0700)]
Update ReloadOption.php
Tim Otten [Thu, 8 Aug 2013 21:33:31 +0000 (14:33 -0700)]
Merge pull request #1377 from kurund/CRM-12930
CRM-12930, reverting commits associated with this issue
kurund [Thu, 8 Aug 2013 19:36:14 +0000 (01:06 +0530)]
Revert "Merge pull request #1368 from drumm/CRM-12930-smarty-compile"
This reverts commit
30ffbdf089db87d9cf2905939f84348a0b03b5e1, reversing
changes made to
94ee5a7f70c82520c5ff4c736d5e6638ec49e780.
kurund [Thu, 8 Aug 2013 19:35:08 +0000 (01:05 +0530)]
Revert "Merge pull request #1376 from monishdeb/CRM-12930"
This reverts commit
ab705a177447f37bbc6ee107a79927ca13498343, reversing
changes made to
c77d25a7703832e635e36ef92192a278e42fc8e7.
kurund [Thu, 8 Aug 2013 19:31:40 +0000 (01:01 +0530)]
Revert "Merge pull request #1371 from drumm/CRM-12930-smarty-safe-mode"
This reverts commit
94ee5a7f70c82520c5ff4c736d5e6638ec49e780, reversing
changes made to
a487a4bf777638a15e079baa489eabf13a7e035d.
Kurund Jalmi [Thu, 8 Aug 2013 15:13:51 +0000 (08:13 -0700)]
Merge pull request #1376 from monishdeb/CRM-12930
CRM-12930 related small fix
monishdeb [Thu, 8 Aug 2013 15:10:51 +0000 (20:40 +0530)]
CRM-12930 related small fix
----------------------------------------
* CRM-12930: CRM/Core/BAO/MessageTemplates.php does not obey CIVICRM_MAIL_SMARTY
http://issues.civicrm.org/jira/browse/CRM-12930
yashodha [Thu, 8 Aug 2013 13:36:00 +0000 (19:06 +0530)]
fix notice for failing test(CRM-10138)
deepak-srivastava [Thu, 8 Aug 2013 08:54:02 +0000 (01:54 -0700)]
Merge pull request #1373 from ravishnair/CRM-13037
-- CRM-13037 handled GroupBy clause and for selecting the correct report object
Ravish Nair [Thu, 8 Aug 2013 08:27:15 +0000 (13:57 +0530)]
-- CRM-13037 handled for GroupBy clause and for selecting the correct report object
----------------------------------------
* CRM-13037: Navigating among tabs produces wrong popups
http://issues.civicrm.org/jira/browse/CRM-13037
Kurund Jalmi [Thu, 8 Aug 2013 08:07:14 +0000 (01:07 -0700)]
Merge pull request #1368 from drumm/CRM-12930-smarty-compile
CRM-12930 Execute Smarty templates before token replacement
Kurund Jalmi [Thu, 8 Aug 2013 07:57:50 +0000 (00:57 -0700)]
Merge pull request #1371 from drumm/CRM-12930-smarty-safe-mode
CRM-12930 Always use Smarty security for string templates
Kurund Jalmi [Thu, 8 Aug 2013 07:51:21 +0000 (00:51 -0700)]
Merge pull request #1372 from pratik-joshi/CRM-12926-improvement
CRM-12926-improvement : some improvement after reading totten's comment on PR #1362
Kurund Jalmi [Thu, 8 Aug 2013 07:15:11 +0000 (00:15 -0700)]
Merge pull request #1366 from eileenmcnaughton/CRM-13179
CRM-13179 fix profile api to support multiple profiles incl billing.
Pratik Joshi [Thu, 8 Aug 2013 06:53:47 +0000 (12:23 +0530)]
CRM-12926-improvement : some improvement after reading totten's comment on PR #1362
Neil Drumm [Thu, 8 Aug 2013 05:55:56 +0000 (05:55 +0000)]
CRM-12930 Always use Smarty security for string templates
Tim Otten [Thu, 8 Aug 2013 05:33:46 +0000 (22:33 -0700)]
Merge pull request #1370 from totten/master-api-reload-fix
CRM-13163 - CRM_Utils_API_ReloadOption - Fix warnings/regressions
Tim Otten [Thu, 8 Aug 2013 05:32:33 +0000 (22:32 -0700)]
CRM-13163 - CRM_Utils_API_ReloadOption - Fix warnings/regressions
----------------------------------------
* CRM-13163: hrjob: Display/edit dates with jQuery date picker
http://issues.civicrm.org/jira/browse/CRM-13163
Tim Otten [Thu, 8 Aug 2013 04:41:41 +0000 (21:41 -0700)]
Merge pull request #1369 from totten/master-api-reload
CRM-13163 - APIv3 (*.create) - Add support for options.reload=1
Tim Otten [Thu, 8 Aug 2013 04:37:34 +0000 (21:37 -0700)]
CRM-13163 - crm.backbone.js - Pass 'options.reload=1' when creating/updating records
----------------------------------------
* CRM-13163: hrjob: Display/edit dates with jQuery date picker
http://issues.civicrm.org/jira/browse/CRM-13163
Tim Otten [Thu, 8 Aug 2013 04:28:21 +0000 (21:28 -0700)]
CRM-13163 - CRM_Utils_API_ReloadOption - Switch to stateless operation
----------------------------------------
* CRM-13163: hrjob: Display/edit dates with jQuery date picker
http://issues.civicrm.org/jira/browse/CRM-13163
Tim Otten [Thu, 8 Aug 2013 04:08:09 +0000 (21:08 -0700)]
CRM-13163 - APIv3 (*.create) - Add support for options.reload=1
This will refetch the created record with the API to ensure that the return value is really correct.
----------------------------------------
* CRM-13163: hrjob: Display/edit dates with jQuery date picker
http://issues.civicrm.org/jira/browse/CRM-13163
Neil Drumm [Thu, 8 Aug 2013 04:08:18 +0000 (04:08 +0000)]
CRM-12930 Execute Smarty templates before token replacement
Andrew Hunt [Thu, 8 Aug 2013 00:09:07 +0000 (20:09 -0400)]
past event: contrib ok but dont send receipt
Andrew Hunt [Wed, 7 Aug 2013 23:54:40 +0000 (19:54 -0400)]
3 months of events & don't check payment for past events
Dave Greenberg [Wed, 7 Aug 2013 23:09:17 +0000 (16:09 -0700)]
Merge pull request #1359 from pradpnayak/CRM-12055
-- worked on CRM-12055
Dave Greenberg [Wed, 7 Aug 2013 22:56:08 +0000 (15:56 -0700)]
Merge pull request #1363 from kurund/CRM-12970
CRM-12970, fixes to setdefaults discount fees
eileen [Wed, 7 Aug 2013 22:15:24 +0000 (10:15 +1200)]
e-notice fix
eileen [Wed, 7 Aug 2013 20:58:25 +0000 (08:58 +1200)]
CRM-13179 fix profile api to support multiple profiles incl billing.
As it is non-standard I've had to be a bit hacky - since there are tests we need to ensure code relying on the non-standard behaviour doesn't break
Dave Greenberg [Wed, 7 Aug 2013 20:38:05 +0000 (13:38 -0700)]
Merge pull request #1365 from colemanw/currency
Fix currency display CRM-13144
Coleman Watts [Wed, 7 Aug 2013 20:25:38 +0000 (13:25 -0700)]
Fix currency display CRM-13144
----------------------------------------
* CRM-13144: Currency display is messed up
http://issues.civicrm.org/jira/browse/CRM-13144
Coleman Watts [Wed, 7 Aug 2013 20:15:15 +0000 (13:15 -0700)]
Make formValues public CRM-13155
----------------------------------------
* CRM-13155: Add searching for recurring contribution data to search
http://issues.civicrm.org/jira/browse/CRM-13155
kurund [Wed, 7 Aug 2013 18:01:23 +0000 (23:31 +0530)]
minor fix, CRM-12970
----------------------------------------
* CRM-12970: civicrm_price_field_value not removed for discount price set
http://issues.civicrm.org/jira/browse/CRM-12970
kurund [Wed, 7 Aug 2013 17:41:44 +0000 (23:11 +0530)]
fixes to setdefaults, CRM-12970
----------------------------------------
* CRM-12970: civicrm_price_field_value not removed for discount price set
http://issues.civicrm.org/jira/browse/CRM-12970
kurund [Wed, 7 Aug 2013 17:12:51 +0000 (22:42 +0530)]
remove obsolete code
Dave Greenberg [Wed, 7 Aug 2013 16:20:36 +0000 (09:20 -0700)]
Merge pull request #1362 from pratik-joshi/CRM-12926
CRM-12926 : convert the flash to image and upload the image
Pratik Joshi [Wed, 7 Aug 2013 15:13:23 +0000 (20:43 +0530)]
CRM-12926 : convert the flash to image and upload the image
Kurund Jalmi [Wed, 7 Aug 2013 11:36:33 +0000 (04:36 -0700)]
Merge pull request #1361 from kurund/test-fixes
fixed failing mailing CRM tests
kurund [Wed, 7 Aug 2013 11:35:12 +0000 (17:05 +0530)]
fixed failing mailing CRM tests
Kurund Jalmi [Wed, 7 Aug 2013 11:04:54 +0000 (04:04 -0700)]
Merge pull request #1358 from yashodha/4.4.CRM-13092
fixed export for activity source contact ID
Kurund Jalmi [Wed, 7 Aug 2013 10:57:41 +0000 (03:57 -0700)]
Merge pull request #1357 from monishdeb/CRM-12812
CRM-12812 Webtest related fix
Kurund Jalmi [Wed, 7 Aug 2013 10:56:10 +0000 (03:56 -0700)]
Merge pull request #1360 from kurund/test-fixes
fixes for failing CRM tests
kurund [Wed, 7 Aug 2013 10:54:10 +0000 (16:24 +0530)]
fixes due to change to prefix/suffix/gender
kurund [Wed, 7 Aug 2013 10:44:56 +0000 (16:14 +0530)]
fixed the test failure due to duplicate contacts being listed
Pradeep Nayak [Wed, 7 Aug 2013 10:24:51 +0000 (15:54 +0530)]
-- added formrule for CRM-12055
----------------------------------------
* CRM-12055: Allow users to change label used for Contribution Amounts in online contribution page w/o switching to a price set
http://issues.civicrm.org/jira/browse/CRM-12055
Pradeep Nayak [Wed, 7 Aug 2013 09:54:13 +0000 (15:24 +0530)]
-- worked on CRM-12055
----------------------------------------
* CRM-12055: Allow users to change label used for Contribution Amounts in online contribution page w/o switching to a price set
http://issues.civicrm.org/jira/browse/CRM-12055
yashodha [Wed, 7 Aug 2013 08:17:00 +0000 (13:47 +0530)]
fixed export for activity source contact ID
kurund [Wed, 7 Aug 2013 08:08:56 +0000 (13:38 +0530)]
fixes to test due to changes in createProfileContact
monishdeb [Wed, 7 Aug 2013 07:47:32 +0000 (13:17 +0530)]
CRM-12812 Webtest related fix
----------------------------------------
* CRM-12812: case custom field using wysiwyg fails to load
http://issues.civicrm.org/jira/browse/CRM-12812
Kurund Jalmi [Wed, 7 Aug 2013 07:44:59 +0000 (00:44 -0700)]
Merge pull request #1356 from kurund/test-fixes
Test fixes
kurund [Wed, 7 Aug 2013 07:43:33 +0000 (13:13 +0530)]
fixed failing api test CRM-13122
----------------------------------------
* CRM-13122: API contact.get no longer returning prefix_id, suffix_id by default
http://issues.civicrm.org/jira/browse/CRM-13122
kurund [Wed, 7 Aug 2013 07:22:12 +0000 (12:52 +0530)]
whitespace fixes
Kurund Jalmi [Wed, 7 Aug 2013 07:07:34 +0000 (00:07 -0700)]
Merge pull request #1355 from colemanw/recurringPane
Open recurring pane when data has been entered CRM-13155
Kurund Jalmi [Wed, 7 Aug 2013 07:06:36 +0000 (00:06 -0700)]
Merge pull request #1354 from totten/master-revlink-jquery
CRM-12910 - Extract JS from logButton.tpl so it can be reused by client-side apps
Kurund Jalmi [Wed, 7 Aug 2013 07:04:15 +0000 (00:04 -0700)]
Merge pull request #1352 from eileenmcnaughton/CRM-13159
Crm 13159 plus a couple of minor fixes
Kurund Jalmi [Wed, 7 Aug 2013 07:00:56 +0000 (00:00 -0700)]
Merge pull request #1351 from pratik-joshi/CRM-12639-minor-fix-for-state-name-display
CRM-12639-minor-fix-for-state-name-display : state abbreviations were getting displayed instead of state names
Tim Otten [Wed, 7 Aug 2013 04:34:37 +0000 (21:34 -0700)]
Merge pull request #1199 from totten/master-premature-commit
CRM-13085 - Fix premature transaction commit (due to ACL)
Coleman Watts [Wed, 7 Aug 2013 04:20:25 +0000 (21:20 -0700)]
Open recurring pane when data has been entered CRM-13155
----------------------------------------
* CRM-13155: Add searching for recurring contribution data to search
http://issues.civicrm.org/jira/browse/CRM-13155
Dave Greenberg [Wed, 7 Aug 2013 00:43:20 +0000 (17:43 -0700)]
Merge pull request #1350 from pradpnayak/CRM-12970
-- fixed for CRM-12970
Tim Otten [Wed, 7 Aug 2013 00:30:57 +0000 (17:30 -0700)]
CRM-12910 - logButton.tpl - Move $.fn.crmRevisionLink to its own file
----------------------------------------
* CRM-12910:
http://issues.civicrm.org/jira/browse/CRM-12910
Tim Otten [Wed, 7 Aug 2013 00:06:44 +0000 (17:06 -0700)]
CRM-12910 - logButton.tpl - Remove unnecesary option, cssDialogSelector
----------------------------------------
* CRM-12910:
http://issues.civicrm.org/jira/browse/CRM-12910
Tim Otten [Tue, 6 Aug 2013 23:53:50 +0000 (16:53 -0700)]
CRM-12910 - logButton.tpl - Construct dialog HTML on demand
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
Tim Otten [Tue, 6 Aug 2013 23:42:37 +0000 (16:42 -0700)]
CRM-12910 - logButton.tpl - Pass options directly into $.fn.crmRevisionLink
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
Tim Otten [Tue, 6 Aug 2013 23:40:21 +0000 (16:40 -0700)]
CRM-12910 - logButton.tpl - Move most JS inside $.fn.crmRevisionLink
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
Dave Greenberg [Tue, 6 Aug 2013 23:35:40 +0000 (16:35 -0700)]
Merge pull request #1353 from eileenmcnaughton/CRM-13162
CRM-13162 [closes ticket] make table for disabled relationships show the same fields as ...
Tim Otten [Tue, 6 Aug 2013 23:33:53 +0000 (16:33 -0700)]
CRM-1291- = logButton.tpl - Move JS vars into "options"
----------------------------------------
* CRM-1291-:
http://issues.civicrm.org/jira/browse/CRM-1291-
Tim Otten [Tue, 6 Aug 2013 23:30:54 +0000 (16:30 -0700)]
CRM-12910 - logButton.tpl - Use more JS variables instead of Smarty variables
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
eileen [Tue, 6 Aug 2013 23:28:47 +0000 (11:28 +1200)]
CRM-13162 remove extra indents from last commit (copy & pastegit add templates/CRM/Contact/Page/View/Relationship.tplgit add templates/CRM/Contact/Page/View/Relationship.tpl)
Tim Otten [Tue, 6 Aug 2013 23:26:09 +0000 (16:26 -0700)]
CRM-12910 - logButton.tpl - Use a JS closure
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
eileen [Tue, 6 Aug 2013 23:25:48 +0000 (11:25 +1200)]
CRM-13162 make table for disabled relationships show the same fields as enabled relationships on relationship tab
Tim Otten [Tue, 6 Aug 2013 23:16:18 +0000 (16:16 -0700)]
CRM-12910 - logButton.tpl - More client-side logic:
* Use JS variable instead of Smarty variable
* Construct URL on client side
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
eileen [Tue, 6 Aug 2013 21:19:34 +0000 (09:19 +1200)]
unrelated e-notice fixes
eileen [Tue, 6 Aug 2013 21:18:39 +0000 (09:18 +1200)]
CRM-12869 ensure giftors email is not over-written on behalf membership
eileen [Tue, 6 Aug 2013 21:15:47 +0000 (09:15 +1200)]
CRM-13159 need to assign var to tpl
eileen [Tue, 6 Aug 2013 21:14:27 +0000 (09:14 +1200)]
CRM-13160 partial fix, eliminates fatal but doesn't address where there are multiple relationship type possibilities, required to avoid fatals on tests
eileen [Tue, 6 Aug 2013 21:12:56 +0000 (09:12 +1200)]
CRM-13159 enable 'membership_type' as a param on relationship get, display count of available relationships on back-office member form using this
Pratik Joshi [Tue, 6 Aug 2013 14:48:14 +0000 (20:18 +0530)]
CRM-12639-minor-fix-for-state-name-display : state abbreviations were getting displayed instead of state names
Pradeep Nayak [Tue, 6 Aug 2013 12:57:39 +0000 (18:27 +0530)]
-- fixed for CRM-12970
----------------------------------------
* CRM-12970: civicrm_price_field_value not removed for discount price set
http://issues.civicrm.org/jira/browse/CRM-12970
Kurund Jalmi [Tue, 6 Aug 2013 12:06:10 +0000 (05:06 -0700)]
Merge pull request #1348 from pratik-joshi/CRM-12689_fixes
Crm 12689 fixes
Kurund Jalmi [Tue, 6 Aug 2013 11:59:28 +0000 (04:59 -0700)]
Merge pull request #1349 from kurund/CRM-13107
CRM-13107 removed obsolete code
Pratik Joshi [Tue, 6 Aug 2013 11:25:50 +0000 (16:55 +0530)]
CRM-12689_fixes : is_repeat handling for 'addtion to' recipients
Pratik Joshi [Tue, 6 Aug 2013 14:15:38 +0000 (19:45 +0530)]
CRM-12689-fixes : minor fix
Pratik Joshi [Mon, 5 Aug 2013 13:38:41 +0000 (19:08 +0530)]
CRM-12689-fixes : few improvements after testing
Pratik Joshi [Fri, 2 Aug 2013 16:23:17 +0000 (21:53 +0530)]
CRM-12689-fixes : adding restriction to building additional recipient when 'state_action_date' has been selected which depends on mapping enitity configured for a reminder