Tim Otten [Thu, 12 Sep 2013 05:11:01 +0000 (22:11 -0700)]
Merge pull request #1627 from totten/master-msg-tmpl-api
SyntaxConformanceTest - Fix failure for MessageTemplates
Tim Otten [Thu, 12 Sep 2013 05:07:46 +0000 (22:07 -0700)]
SyntaxConformanceTest - Fix failure for MessageTemplates
Tim Otten [Thu, 12 Sep 2013 03:43:57 +0000 (20:43 -0700)]
Merge pull request #1626 from eileenmcnaughton/master
test & comment block fixes
Eileen [Thu, 12 Sep 2013 03:18:31 +0000 (03:18 +0000)]
fix comment blocks
Eileen [Thu, 12 Sep 2013 03:14:09 +0000 (03:14 +0000)]
fix comment blocks
Eileen [Thu, 12 Sep 2013 03:11:19 +0000 (03:11 +0000)]
fix spelling error
Eileen [Thu, 12 Sep 2013 00:56:16 +0000 (00:56 +0000)]
fix comment blocks
Eileen [Thu, 12 Sep 2013 00:40:11 +0000 (00:40 +0000)]
Update utils test to reflect changed funciton signature
Vagrant User [Thu, 12 Sep 2013 00:38:21 +0000 (00:38 +0000)]
Fix comment blocks
Vagrant User [Thu, 12 Sep 2013 00:08:34 +0000 (00:08 +0000)]
fix whitespace error from formatter
CiviCRM [Wed, 11 Sep 2013 20:22:56 +0000 (13:22 -0700)]
Update version to 4.4.beta3
colemanw [Wed, 11 Sep 2013 20:13:40 +0000 (13:13 -0700)]
Merge pull request #1612 from eileenmcnaughton/master
CRM-13318 revert part of Coleman's patch that breaks profile retrieval
colemanw [Wed, 11 Sep 2013 20:12:39 +0000 (13:12 -0700)]
Merge pull request #1624 from pratik-joshi/CRM-10760
CRM-10760 : adding lcMessages to CRM.config setting so that can be used inside .js file
Coleman Watts [Wed, 11 Sep 2013 14:09:58 +0000 (09:09 -0500)]
fix js typo CRM-13331
----------------------------------------
* CRM-13331: emails can be 'double-sent' from search action
http://issues.civicrm.org/jira/browse/CRM-13331
Coleman Watts [Wed, 11 Sep 2013 14:03:14 +0000 (09:03 -0500)]
Merge branch 'CRM-13331' of https://github.com/eileenmcnaughton/civicrm-core into CRM-13331
Kurund Jalmi [Wed, 11 Sep 2013 12:42:30 +0000 (05:42 -0700)]
Merge pull request #1621 from eileenmcnaughton/CRM-13372
CRM-13372 - (closes) fix over-long paypal string
Kurund Jalmi [Wed, 11 Sep 2013 12:39:16 +0000 (05:39 -0700)]
Merge pull request #1623 from monishdeb/CRM-13323
CRM-13323 improvised changes
Kurund Jalmi [Wed, 11 Sep 2013 12:38:48 +0000 (05:38 -0700)]
Merge pull request #1622 from pratik-joshi/CRM-13026-exclude-test-jobs
CRM-13026 : exclude test mailing jobs from searching
Pratik Joshi [Wed, 11 Sep 2013 10:34:58 +0000 (16:04 +0530)]
CRM-10760 : adding lcMessages to CRM.config setting so that can be used inside .js file
----------------------------------------
* CRM-10760: Upgrade to jQuery UI autocomplete
http://issues.civicrm.org/jira/browse/CRM-10760
monishdeb [Wed, 11 Sep 2013 09:23:56 +0000 (14:53 +0530)]
CRM-13339 improvised changes
----------------------------------------
* CRM-13339: CRM_Core_PseudoConstant warnings
http://issues.civicrm.org/jira/browse/CRM-13339
Pratik Joshi [Wed, 11 Sep 2013 08:17:25 +0000 (13:47 +0530)]
CRM-13026 : exclude test jobs
----------------------------------------
* CRM-13026: Advanced Search : Display results as Mailings
http://issues.civicrm.org/jira/browse/CRM-13026
* CRM-13026-exclude-test-jobs:
http://issues.civicrm.org/jira/browse/CRM-13026-exclude-test-jobs
Eileen [Wed, 11 Sep 2013 04:08:10 +0000 (00:08 -0400)]
CRM-13372 truncate description string before passing to paypal
eileen [Fri, 6 Sep 2013 04:48:58 +0000 (16:48 +1200)]
remove a couple of unrequired lines from test
Eileen McNaughton [Wed, 11 Sep 2013 01:06:25 +0000 (13:06 +1200)]
code style change from @colemanw
Eileen McNaughton [Tue, 10 Sep 2013 20:58:33 +0000 (08:58 +1200)]
minor changes per Coleman's comment
Kurund Jalmi [Tue, 10 Sep 2013 16:28:30 +0000 (09:28 -0700)]
Merge pull request #1616 from yashodha/CRM-13357
applied patch for CRM-13357
Kurund Jalmi [Tue, 10 Sep 2013 16:21:09 +0000 (09:21 -0700)]
Merge pull request #1618 from ravishnair/CRM-13352
-- CRM-13352 applied the fix
Ravish Nair [Tue, 10 Sep 2013 10:50:02 +0000 (16:20 +0530)]
-- CRM-13352 applied the fix
----------------------------------------
* CRM-13352: After disabling some Event Types I don't need, get undefined index error in Event Template browse()
http://issues.civicrm.org/jira/browse/CRM-13352
Kurund Jalmi [Tue, 10 Sep 2013 06:07:54 +0000 (23:07 -0700)]
Merge pull request #1617 from kurund/CRM-13329
CRM-13329, added more rows for event name badges
yashodha [Tue, 10 Sep 2013 06:03:44 +0000 (11:33 +0530)]
applied patch for CRM-13357
kurund [Tue, 10 Sep 2013 05:57:13 +0000 (11:27 +0530)]
CRM-13329, added spacer
----------------------------------------
* 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 [Wed, 4 Sep 2013 11:44:21 +0000 (17:14 +0530)]
CRM-13329, add 2 more rows
----------------------------------------
* 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, 9 Sep 2013 21:27:32 +0000 (16:27 -0500)]
Tag js cleanup
colemanw [Mon, 9 Sep 2013 20:16:50 +0000 (13:16 -0700)]
Merge pull request #1615 from colemanw/master
Fix contact tag tab with tagsets
Coleman Watts [Mon, 9 Sep 2013 20:05:37 +0000 (15:05 -0500)]
Fix contact tag tab with tagsets
Kurund Jalmi [Fri, 6 Sep 2013 14:29:20 +0000 (07:29 -0700)]
Merge pull request #1606 from davecivicrm/CRM-13346
CRM-13346 add contribution page column and filter to contribution summar...
Kurund Jalmi [Fri, 6 Sep 2013 14:28:54 +0000 (07:28 -0700)]
Merge pull request #1605 from ravishnair/webtestfix
-- webtest fixes and some improvements based on the error on server
Kurund Jalmi [Fri, 6 Sep 2013 14:28:40 +0000 (07:28 -0700)]
Merge pull request #1609 from colemanw/ops
User friendly search builder operator labels
Kurund Jalmi [Fri, 6 Sep 2013 12:44:14 +0000 (05:44 -0700)]
Merge pull request #1614 from monishdeb/CRM-13323
CRM-13323 fix
monishdeb [Fri, 6 Sep 2013 12:39:53 +0000 (18:09 +0530)]
CRM-13323 fix
----------------------------------------
* CRM-13323: Contribution widgets break when pasted into ckeditor
http://issues.civicrm.org/jira/browse/CRM-13323
Kurund Jalmi [Fri, 6 Sep 2013 09:56:30 +0000 (02:56 -0700)]
Merge pull request #1613 from pratik-joshi/CRM-13336-more-improvements
Crm 13336 more improvements
Pratik Joshi [Fri, 6 Sep 2013 07:27:55 +0000 (12:57 +0530)]
CRM-13336 more improvements : click on printer friendly view (click on top right print icon) should open up view in browser's new tab or window of any civicrm form / page
----------------------------------------
* CRM-13336: remove inline edit from contact summary in print mode
http://issues.civicrm.org/jira/browse/CRM-13336
* CRM-13336-more-improvements:
http://issues.civicrm.org/jira/browse/CRM-13336-more-improvements
Pratik Joshi [Fri, 6 Sep 2013 07:09:14 +0000 (12:39 +0530)]
CRM-13336 more improvements : remove action links on contact summary page while in print mode
----------------------------------------
* CRM-13336: remove inline edit from contact summary in print mode
http://issues.civicrm.org/jira/browse/CRM-13336
* CRM-13336-more-improvements:
http://issues.civicrm.org/jira/browse/CRM-13336-more-improvements
eileen [Fri, 6 Sep 2013 04:54:27 +0000 (16:54 +1200)]
CRM-13234 call getfields less times & pass in variables that might affect it (profile_id & potentially later other ones)
eileen [Fri, 6 Sep 2013 04:48:58 +0000 (16:48 +1200)]
remove a couple of unrequired lines from test
eileen [Fri, 6 Sep 2013 04:36:54 +0000 (16:36 +1200)]
CRM-13318 revert part of Coleman's patch that breaks profile retrieval
Tim Otten [Thu, 5 Sep 2013 23:12:38 +0000 (16:12 -0700)]
Merge pull request #1611 from eileenmcnaughton/master
another test tweak
eileen [Thu, 5 Sep 2013 22:42:00 +0000 (10:42 +1200)]
another test tweak
Tim Otten [Thu, 5 Sep 2013 21:43:25 +0000 (14:43 -0700)]
Merge pull request #1610 from eileenmcnaughton/master
minor test fixes
CiviCRM [Thu, 5 Sep 2013 21:13:20 +0000 (14:13 -0700)]
Update version to 4.4.beta2
Tim Otten [Thu, 5 Sep 2013 21:03:00 +0000 (14:03 -0700)]
Merge pull request #1608 from totten/master-mailer-hook-cleanup2
CRM_Core_Config - Typo
Tim Otten [Thu, 5 Sep 2013 21:02:30 +0000 (14:02 -0700)]
CRM_Core_Config - Typo
eileen [Thu, 5 Sep 2013 20:59:56 +0000 (08:59 +1200)]
minor test fixes
Coleman Watts [Thu, 5 Sep 2013 17:56:11 +0000 (13:56 -0400)]
User friendly search builder operator labels
Tim Otten [Thu, 5 Sep 2013 19:24:40 +0000 (12:24 -0700)]
Merge pull request #1607 from totten/master-mailer-hook-cleanup
CRM-11958 - Cleanup
Tim Otten [Thu, 5 Sep 2013 19:20:36 +0000 (12:20 -0700)]
CRM-11958 - hook_civicrm_alterMailer - Cleanup comments/formatting
----------------------------------------
* CRM-11958: New hook implementation for altering outgoing mail configuration
http://issues.civicrm.org/jira/browse/CRM-11958
Tim Otten [Thu, 5 Sep 2013 19:16:21 +0000 (12:16 -0700)]
CRM-11958 - hook_civicrm_alterMailer - Cleanup hook definition
----------------------------------------
* CRM-11958: New hook implementation for altering outgoing mail configuration
http://issues.civicrm.org/jira/browse/CRM-11958
Dave Greenberg [Thu, 5 Sep 2013 16:12:46 +0000 (12:12 -0400)]
CRM-13346 add contribution page column and filter to contribution summary and detail report.
----------------------------------------
* CRM-13346: Add Contribution Page column and filter to Contribution Summary and Detail reports
http://issues.civicrm.org/jira/browse/CRM-13346
Ravish Nair [Thu, 5 Sep 2013 14:39:49 +0000 (20:09 +0530)]
-- webtest fixes and some inprovements based on the error on server
Kurund Jalmi [Thu, 5 Sep 2013 12:42:41 +0000 (05:42 -0700)]
Merge pull request #1604 from ravishnair/CRM-13327
-- CRM-13327 added event badge formats
Kurund Jalmi [Thu, 5 Sep 2013 12:41:30 +0000 (05:41 -0700)]
Merge pull request #1602 from ravishnair/CRM-13325
-- CRM-13325 added 'data-crm-custom' attribute to "link" custom field
Kurund Jalmi [Thu, 5 Sep 2013 12:41:10 +0000 (05:41 -0700)]
Merge pull request #1603 from pratik-joshi/CRM-13337
CRM-13337
Ravish Nair [Thu, 5 Sep 2013 12:34:23 +0000 (18:04 +0530)]
-- CRM-13327 added event badge formats
----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327
Pratik Joshi [Thu, 5 Sep 2013 11:39:15 +0000 (17:09 +0530)]
CRM-13337
----------------------------------------
* CRM-13337: Advanced search: improve form validation
http://issues.civicrm.org/jira/browse/CRM-13337
Ravish Nair [Thu, 5 Sep 2013 10:06:16 +0000 (15:36 +0530)]
-- CRM-13325 added attribute to "link" custom field
----------------------------------------
* CRM-13325: Custom field HTML should indicate group+field name
http://issues.civicrm.org/jira/browse/CRM-13325
Kurund Jalmi [Thu, 5 Sep 2013 09:20:52 +0000 (02:20 -0700)]
Merge pull request #1599 from totten/master-mailer-hook
CRM-11958 - Add hook_civicrm_alterMailer (with unit-test)
Kurund Jalmi [Thu, 5 Sep 2013 09:20:38 +0000 (02:20 -0700)]
Merge pull request #1600 from eileenmcnaughton/master
CRM-13252 attempt to replicate in test, Also add (passing) test on return params
Kurund Jalmi [Thu, 5 Sep 2013 09:20:12 +0000 (02:20 -0700)]
Merge pull request #1601 from pratik-joshi/CRM-13336
CRM-13336 : disable inline edit on contact summary view page while in print mode
Kurund Jalmi [Thu, 5 Sep 2013 09:19:42 +0000 (02:19 -0700)]
Merge pull request #1581 from vivekarora/CRM-13325
CRM-13325 - Added Attributes
eileen [Thu, 5 Sep 2013 08:39:21 +0000 (20:39 +1200)]
CRM-13252 attempt to replicate multiple phone create
Pratik Joshi [Thu, 5 Sep 2013 08:33:12 +0000 (14:03 +0530)]
CRM-13336 : disable inline edit on contact summary view page while in print mode
----------------------------------------
* CRM-13336: remove inline edit from contact summary in print mode
http://issues.civicrm.org/jira/browse/CRM-13336
Kurund Jalmi [Thu, 5 Sep 2013 07:31:16 +0000 (00:31 -0700)]
Merge pull request #1598 from yashodha/CRM-13342
worked on CRM-13342
Tim Otten [Thu, 5 Sep 2013 07:12:11 +0000 (00:12 -0700)]
CRM-11958 - Add hook_civicrm_alterMailer (with unit-test)
----------------------------------------
* CRM-11958: New hook implementation for altering outgoing mail configuration
http://issues.civicrm.org/jira/browse/CRM-11958
yashodha [Thu, 5 Sep 2013 05:59:45 +0000 (11:29 +0530)]
indentation fixes
eileen [Thu, 5 Sep 2013 03:45:16 +0000 (15:45 +1200)]
rename test class as it turns out deceased contacts ARE returned by default
yashodha [Thu, 5 Sep 2013 03:27:27 +0000 (08:57 +0530)]
worked on CRM-13342
Tim Otten [Thu, 5 Sep 2013 01:52:17 +0000 (18:52 -0700)]
Merge pull request #1596 from GiantRobot/CRM-13343
Handle JSON decode errors in API requests, throw synthetic error.
Chris Burgess [Wed, 4 Sep 2013 22:24:50 +0000 (10:24 +1200)]
Handle JSON decode errors in API requests, throw synthetic error.
Xavier Dutoit [Wed, 4 Sep 2013 09:44:49 +0000 (11:44 +0200)]
add error_message on curl error+json_decode error
colemanw [Wed, 4 Sep 2013 18:42:24 +0000 (11:42 -0700)]
Merge pull request #1595 from colemanw/master
Fix convertToPseudoNames for CRM-13318
Coleman Watts [Wed, 4 Sep 2013 18:34:07 +0000 (14:34 -0400)]
Fix convertToPseudoNames for CRM-13318
----------------------------------------
* CRM-13318: Api doesn't return gender, prefix, suffix by default
http://issues.civicrm.org/jira/browse/CRM-13318
Kurund Jalmi [Wed, 4 Sep 2013 17:39:43 +0000 (10:39 -0700)]
Merge pull request #1594 from yashodha/notice-fixes
notice fix
Kurund Jalmi [Wed, 4 Sep 2013 17:38:53 +0000 (10:38 -0700)]
Merge pull request #1592 from ravishnair/CRM-13338
-- CRM-13338 minor fix to populate profile defaults in live contribution page
Kurund Jalmi [Wed, 4 Sep 2013 17:38:32 +0000 (10:38 -0700)]
Merge pull request #1590 from ravishnair/webtestfix
-- webtest fixes
Kurund Jalmi [Wed, 4 Sep 2013 14:09:30 +0000 (07:09 -0700)]
Merge pull request #1593 from pratik-joshi/CRM-13328-fix
CRM-13328
Pratik Joshi [Wed, 4 Sep 2013 14:00:50 +0000 (19:30 +0530)]
CRM-13328-fix
----------------------------------------
* CRM-13328-fix:
http://issues.civicrm.org/jira/browse/CRM-13328-fix
yashodha [Wed, 4 Sep 2013 13:55:34 +0000 (19:25 +0530)]
notice fix
Ravish Nair [Wed, 4 Sep 2013 13:53:44 +0000 (19:23 +0530)]
-- CRM-13338 minor fix to populate profile defaults in live contribution page
----------------------------------------
* CRM-13338: Profile field defaults not getting populated in contribution live page
http://issues.civicrm.org/jira/browse/CRM-13338
deepak-srivastava [Wed, 4 Sep 2013 12:03:55 +0000 (05:03 -0700)]
Merge pull request #1591 from deepak-srivastava/logs
CRM-13335
Deepak Srivastava [Wed, 4 Sep 2013 12:00:48 +0000 (17:30 +0530)]
CRM-13335
Kurund Jalmi [Wed, 4 Sep 2013 11:23:36 +0000 (04:23 -0700)]
Merge pull request #1588 from monishdeb/WebTestFixes
Webtest fix
Kurund Jalmi [Wed, 4 Sep 2013 11:10:52 +0000 (04:10 -0700)]
Merge pull request #1589 from kurund/CRM-13330
CRM-13330, added font style support for event badge creation
kurund [Wed, 4 Sep 2013 11:06:21 +0000 (16:36 +0530)]
CRM-13330, fixed generated data to add style
----------------------------------------
* CRM-13330: Allow user to define font style for each row in badge layout
http://issues.civicrm.org/jira/browse/CRM-13330
kurund [Wed, 4 Sep 2013 10:53:29 +0000 (16:23 +0530)]
CRM-13330, fixed generated data
----------------------------------------
* CRM-13330: Allow user to define font style for each row in badge layout
http://issues.civicrm.org/jira/browse/CRM-13330
monishdeb [Wed, 4 Sep 2013 10:47:04 +0000 (16:17 +0530)]
Webtest fix
kurund [Wed, 4 Sep 2013 10:35:30 +0000 (16:05 +0530)]
CRM-13330, fixed badge to respect style
----------------------------------------
* CRM-13330: Allow user to define font style for each row in badge layout
http://issues.civicrm.org/jira/browse/CRM-13330
kurund [Wed, 4 Sep 2013 10:19:24 +0000 (15:49 +0530)]
CRM-13330, added font style
----------------------------------------
* CRM-13330: Allow user to define font style for each row in badge layout
http://issues.civicrm.org/jira/browse/CRM-13330
Ravish Nair [Wed, 4 Sep 2013 10:06:07 +0000 (15:36 +0530)]
-- webtest fixes
pratik-joshi [Wed, 4 Sep 2013 09:58:28 +0000 (02:58 -0700)]
Merge pull request #1586 from eileenmcnaughton/CRM-9493
CRM-9493 - improve performance on group contact cache build (fixed & re-...
vivekarora [Wed, 4 Sep 2013 06:43:57 +0000 (12:13 +0530)]
CRM-13325 - Corrected code formatting
----------------------------------------
* CRM-13325: Custom field HTML should indicate group+field name
http://issues.civicrm.org/jira/browse/CRM-13325
projects / civicrm-core.git / log