monishdeb [Tue, 17 Sep 2013 09:44:47 +0000 (15:14 +0530)]
Webtest fixes - Related to Search Builder
Kurund Jalmi [Tue, 17 Sep 2013 08:47:19 +0000 (01:47 -0700)]
Merge pull request #1646 from monishdeb/CRM-13383
CRM-13383 fix
Tim Otten [Mon, 16 Sep 2013 23:35:32 +0000 (16:35 -0700)]
Merge pull request #1639 from eileenmcnaughton/master
test fixes (api tests) - one real fix (getfields action alias) & one in test class only
colemanw [Mon, 16 Sep 2013 18:20:44 +0000 (11:20 -0700)]
Merge pull request #1650 from colemanw/master
CRM-13313 - Payments - prevent fatal error when line-item has no price set
Coleman Watts [Mon, 16 Sep 2013 18:19:29 +0000 (11:19 -0700)]
CRM-13313 - Payments - prevent fatal error when line-item has no price set
----------------------------------------
* CRM-13313: "Pay Later" for Drupal Webforms
http://issues.civicrm.org/jira/browse/CRM-13313
colemanw [Mon, 16 Sep 2013 17:50:52 +0000 (10:50 -0700)]
Merge pull request #1629 from totten/master-email-proc-btn
CRM-13377 - Manipulate the main "Send Email" button but not the "Cancel"...
Kurund Jalmi [Mon, 16 Sep 2013 13:32:47 +0000 (06:32 -0700)]
Merge pull request #1644 from davecivicrm/CRM-13399
CRM-13399 - Include Available status activities in Assigned Activities s...
Kurund Jalmi [Mon, 16 Sep 2013 13:29:50 +0000 (06:29 -0700)]
Merge pull request #1642 from davecivicrm/CRM-13341
CRM-13341 - Fix typos in subscribe message.
monishdeb [Mon, 16 Sep 2013 08:45:14 +0000 (14:15 +0530)]
CRM-13383 fix
----------------------------------------
* CRM-13383: Add Bounce Type option in Advance Search/Mailing section
http://issues.civicrm.org/jira/browse/CRM-13383
deepak-srivastava [Mon, 16 Sep 2013 07:43:39 +0000 (00:43 -0700)]
Merge pull request #1631 from josephlacey/bookkeeping-report-updates
Adding Contact Sort Name, Financial Type, Contribution ID and Status and...
Dave Greenberg [Mon, 16 Sep 2013 01:41:20 +0000 (18:41 -0700)]
CRM-13399 - Include Available status activities in Assigned Activities section of User Dashboard. This will be valuable for sites using CiviVolunteer.
----------------------------------------
* CRM-13399: User Dashboard Assigned Activities should also show activities with Available status
http://issues.civicrm.org/jira/browse/CRM-13399
Dave Greenberg [Mon, 16 Sep 2013 01:28:22 +0000 (18:28 -0700)]
CRM-13341 - Fix typos in subscribe message.
----------------------------------------
* CRM-13341: group subscription emails fail for multiple groups
http://issues.civicrm.org/jira/browse/CRM-13341
Dave Greenberg [Mon, 16 Sep 2013 01:23:50 +0000 (18:23 -0700)]
Merge pull request #1597 from lcdservices/CRM-13341
CRM-13341 add group_id clause to subscription confirm query
Tested the patch, works as expected.
Eileen [Mon, 16 Sep 2013 00:02:27 +0000 (00:02 +0000)]
CRM-13338 remove trailing whitespace introduced by previous commit on this issue
----------------------------------------
* CRM-13338: Profile field defaults not getting populated in contribution live page
http://issues.civicrm.org/jira/browse/CRM-13338
Eileen [Sun, 15 Sep 2013 04:03:49 +0000 (04:03 +0000)]
test fix - for some reason JENKINs fails on these (although my local doesn't)
Eileen [Sun, 15 Sep 2013 04:03:00 +0000 (04:03 +0000)]
test fix - EventTest fix getfields api_action alias (for rest)
Kurund Jalmi [Sat, 14 Sep 2013 19:15:21 +0000 (12:15 -0700)]
Merge pull request #1636 from pratik-joshi/CRM-13380
CRM-13380 : fix status and date filters for mailing search pages
Kurund Jalmi [Sat, 14 Sep 2013 19:12:19 +0000 (12:12 -0700)]
Merge pull request #1634 from eileenmcnaughton/master
CRM-13234 api/v3/Profile fix tests & support lower case primary fields
Kurund Jalmi [Sat, 14 Sep 2013 19:10:06 +0000 (12:10 -0700)]
Merge pull request #1633 from yashodha/CRM-13386
CRM-13386
Kurund Jalmi [Sat, 14 Sep 2013 19:08:54 +0000 (12:08 -0700)]
Merge pull request #1630 from yashodha/CRM-13366
worked on CRM-13366
Tim Otten [Fri, 13 Sep 2013 21:25:24 +0000 (14:25 -0700)]
Merge pull request #1632 from totten/master-ufgroup-upgrade-error
CRM-13388 - Fix upgrade error due to undefined column, "description"
Pratik Joshi [Fri, 13 Sep 2013 16:49:20 +0000 (22:19 +0530)]
CRM-13382 : exposing of 'Canceled', 'All Status' status option of mailing status filter on mailing search pages for easy search
----------------------------------------
* CRM-13382: Make 'Mailings' searches more comprehensive
http://issues.civicrm.org/jira/browse/CRM-13382
* CRM-13380: 'Mailings' pages: search doesn't work correctly.
http://issues.civicrm.org/jira/browse/CRM-13380
Pratik Joshi [Fri, 13 Sep 2013 11:25:17 +0000 (16:55 +0530)]
CRM-13380 : fix status and date filters for mailing search pages
----------------------------------------
* CRM-13380: 'Mailings' pages: search doesn't work correctly.
http://issues.civicrm.org/jira/browse/CRM-13380
Eileen [Fri, 13 Sep 2013 10:06:05 +0000 (10:06 +0000)]
CRM-13234 ensure original params are tested
Eileen [Fri, 13 Sep 2013 09:48:08 +0000 (21:48 +1200)]
CRM-13234 tests re-add test to ensure email-Primary still works
Eileen [Fri, 13 Sep 2013 09:03:06 +0000 (21:03 +1200)]
CRM-13234 fix profile to support lcase 'primary' & fix existing test failures
Eileen [Fri, 13 Sep 2013 07:35:27 +0000 (19:35 +1200)]
CRM/Contact/BAO/Contact.php comment block fixes
yashodha [Fri, 13 Sep 2013 06:28:19 +0000 (11:58 +0530)]
CRM-13386
Eileen [Fri, 13 Sep 2013 06:22:05 +0000 (18:22 +1200)]
CRM-13234 api/v3/CustomField more cache clearing on custom field create
Eileen [Fri, 13 Sep 2013 06:21:04 +0000 (18:21 +1200)]
CRM-13234, possible fix for CRM-13252 api nesting functionality fix inappropriate re-use of a param causing bad nesting outcomes
Eileen [Fri, 13 Sep 2013 06:19:17 +0000 (18:19 +1200)]
CRM-13234 tests/apiv3/profile switch to creating ufFields via api so we can leverage the cache clearing functionality
As always expanding api usage in the tests extends api test coverage & required a few fixes
unknown [Fri, 13 Sep 2013 05:54:57 +0000 (17:54 +1200)]
api/v3/UFField.php default is_active to TRUE
unknown [Fri, 13 Sep 2013 05:37:47 +0000 (17:37 +1200)]
api/v3/UFGroup.php fix comments
unknown [Fri, 13 Sep 2013 05:29:36 +0000 (17:29 +1200)]
CRM-13234 api/v3/UFField clear cache after create, default to fixing weights & using current user as creator, E-notice, comments
unknown [Fri, 13 Sep 2013 05:25:56 +0000 (17:25 +1200)]
CRM/Core/BAO/UFField fix e-notice, CRM/Core fix comments
unknown [Fri, 13 Sep 2013 05:12:00 +0000 (17:12 +1200)]
api/api.php fix comment block
unknown [Fri, 13 Sep 2013 04:46:53 +0000 (16:46 +1200)]
comment fixes
unknown [Fri, 13 Sep 2013 03:57:14 +0000 (15:57 +1200)]
CRM-13234 update add so that is option per standards, comments block fixes
unknown [Fri, 13 Sep 2013 01:40:36 +0000 (13:40 +1200)]
CRM-13234 update test to ensure 'primary' works with & without Ucase
unknown [Fri, 13 Sep 2013 01:40:01 +0000 (13:40 +1200)]
CRM-13234 tidy up on whitespace, cleanup routine
unknown [Fri, 13 Sep 2013 01:29:08 +0000 (13:29 +1200)]
fix error to throw Exception
Tim Otten [Thu, 12 Sep 2013 23:24:12 +0000 (16:24 -0700)]
CRM-13388 - Fix upgrade error due to undefined column, "description"
This change allow civicrm_user_categories() to call getModuleUFGroup() without fetching the unused "descripton" column. During an upgrade, civicrm_user_categories() runs before the "description" column is created.
----------------------------------------
* CRM-13388: Drush upgrade fails due to missing column, civicrm_uf_group.description
http://issues.civicrm.org/jira/browse/CRM-13388
Joseph Lacey [Thu, 12 Sep 2013 15:28:47 +0000 (11:28 -0400)]
Adding Contact Sort Name, Financial Type, Contribution ID and Status and Payment Instrument Order By's. Adding Group and Tag filter. CRM-13384
yashodha [Thu, 12 Sep 2013 09:35:53 +0000 (15:05 +0530)]
worked on CRM-13366
Kurund Jalmi [Thu, 12 Sep 2013 07:43:41 +0000 (00:43 -0700)]
Merge pull request #1628 from totten/master-msg-tmpl-rename
Rename MessageTemplates to MessageTemplate
Tim Otten [Thu, 12 Sep 2013 06:43:08 +0000 (23:43 -0700)]
CRM-13377 - Manipulate the main "Send Email" button but not the "Cancel" button
----------------------------------------
* CRM-13377: "Send email" produces double "Processing" button
http://issues.civicrm.org/jira/browse/CRM-13377
unknown [Thu, 12 Sep 2013 06:23:45 +0000 (18:23 +1200)]
remove unused variable
Tim Otten [Thu, 12 Sep 2013 05:36:40 +0000 (22:36 -0700)]
MessageTemplate - Update api/v3/examples
Tim Otten [Thu, 12 Sep 2013 05:31:12 +0000 (22:31 -0700)]
MessageTemplate - Rename APIv3 files from "MessageTemplates" to "MessageTemplate"
Tim Otten [Thu, 12 Sep 2013 05:30:40 +0000 (22:30 -0700)]
MessageTemplate - Change APIv3 references from "MessageTemplates" to "MessageTemplate"
Tim Otten [Thu, 12 Sep 2013 05:22:15 +0000 (22:22 -0700)]
MessageTemplate - Rename XML/BAO files
Tim Otten [Thu, 12 Sep 2013 05:20:20 +0000 (22:20 -0700)]
MessageTemplate - Change XML/BAO/DAO references from "MessageTemplates" to "MessageTemplate"
Eileen [Thu, 12 Sep 2013 05:28:15 +0000 (05:28 +0000)]
fix 5.4 static errors
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
projects / civicrm-core.git / log