civicrm-core.git
9 years agocrmMailing2 - Debugging tweaks
Tim Otten [Sat, 13 Dec 2014 00:27:23 +0000 (16:27 -0800)]
crmMailing2 - Debugging tweaks

These debug tweaks are useful for now... but should probably be removed
before 4.6.0.

9 years agocrmMailingAB2 - Add scheduling UI
Tim Otten [Mon, 15 Dec 2014 04:45:50 +0000 (20:45 -0800)]
crmMailingAB2 - Add scheduling UI

9 years agocrmMailing2 - Convert controller EditScheduleCtrl to directive crmMailingRadioDate
Tim Otten [Mon, 15 Dec 2014 09:16:20 +0000 (01:16 -0800)]
crmMailing2 - Convert controller EditScheduleCtrl to directive crmMailingRadioDate

9 years agocrmMailingAB2 - Temporarily disable attachment UI. (Frontend mostly works, but backen...
Tim Otten [Mon, 15 Dec 2014 04:20:33 +0000 (20:20 -0800)]
crmMailingAB2 - Temporarily disable attachment UI. (Frontend mostly works, but backend is incomplete.)

9 years agoCRM-15578 - crmMailingAB - Fill in "Setup" and "Targetting" tabs. Implement crmMailin...
Tim Otten [Mon, 15 Dec 2014 04:10:02 +0000 (20:10 -0800)]
CRM-15578 - crmMailingAB - Fill in "Setup" and "Targetting" tabs. Implement crmMailingAbBlockSetup directive.

9 years agoCRM-15578 - Implement crmMailingAbSlider
Tim Otten [Mon, 15 Dec 2014 02:26:10 +0000 (18:26 -0800)]
CRM-15578 - Implement crmMailingAbSlider

9 years agoCRM-15578 - crmMailingAB2 - Implement separate composition screens
Tim Otten [Sun, 14 Dec 2014 21:57:20 +0000 (13:57 -0800)]
CRM-15578 - crmMailingAB2 - Implement separate composition screens

9 years agoCRM-15578 - body_text, body_html - Allow multiple instances
Tim Otten [Sun, 14 Dec 2014 22:32:46 +0000 (14:32 -0800)]
CRM-15578 - body_text, body_html - Allow multiple instances

This commit removes the previous crmUiId() service and makes consistent use
of the newer, more adaptible crmUiId and crmUiIdScope directives.

9 years agoCRM-15578 - crmMailingAB2 - Make crmMailingAbBlockMailing more consistent+flexible
Tim Otten [Sun, 14 Dec 2014 21:49:41 +0000 (13:49 -0800)]
CRM-15578 - crmMailingAB2 - Make crmMailingAbBlockMailing more consistent+flexible

9 years agoCrmAttachment - Fix bug wherein multiple CrmAttachments mix up their targets.
Tim Otten [Sun, 14 Dec 2014 08:42:31 +0000 (00:42 -0800)]
CrmAttachment - Fix bug wherein multiple CrmAttachments mix up their targets.

9 years agoCRM-15578 - crmMailingAB2 - Support for attachments
Tim Otten [Sun, 14 Dec 2014 08:21:28 +0000 (00:21 -0800)]
CRM-15578 - crmMailingAB2 - Support for attachments

9 years agoCRM-15578 - crmMailingAB2 - Implement joint composition screen (for "Subject" and...
Tim Otten [Sun, 14 Dec 2014 02:36:03 +0000 (18:36 -0800)]
CRM-15578 - crmMailingAB2 - Implement joint composition screen (for "Subject" and "From" testing)

9 years agoCRM-15578 - crmUiWizard - Allow conditional steps
Tim Otten [Sun, 14 Dec 2014 07:25:44 +0000 (23:25 -0800)]
CRM-15578 - crmUiWizard - Allow conditional steps

9 years agoCRM-15578 - crmMailing2 - Fix regression in "From Address".
Tim Otten [Sun, 14 Dec 2014 03:15:56 +0000 (19:15 -0800)]
CRM-15578 - crmMailing2 - Fix regression in "From Address".

Also: Make convention compatible with editing multiple mailings.

9 years agoCRM-15578 - MsgTemplateCtrl - Don't hardcode dependence on upstream "scope.mailing"
Tim Otten [Sun, 14 Dec 2014 02:19:12 +0000 (18:19 -0800)]
CRM-15578 - MsgTemplateCtrl - Don't hardcode dependence on upstream "scope.mailing"

9 years agoCRM-15578 - crmMailingAB2 - Add testing_criteria_id
Tim Otten [Sat, 13 Dec 2014 04:12:43 +0000 (20:12 -0800)]
CRM-15578 - crmMailingAB2 - Add testing_criteria_id

9 years agoCRM-15578 - crmAttachments - Convert include+ctrl to a directive
Tim Otten [Sat, 13 Dec 2014 02:36:16 +0000 (18:36 -0800)]
CRM-15578 - crmAttachments - Convert include+ctrl to a directive

9 years agoCRM-15578 - crmMailing2 - Extract misc, simple directives
Tim Otten [Sat, 13 Dec 2014 00:30:15 +0000 (16:30 -0800)]
CRM-15578 - crmMailing2 - Extract misc, simple directives

<div crm-mailing-block-header-footer crm-mailing="mailing"/>
<div crm-mailing-block-mailing crm-mailing="mailing"/>
<div crm-mailing-block-preview crm-mailing="mailing"/>
<div crm-mailing-block-publication crm-mailing="mailing"/>
<div crm-mailing-block-responses crm-mailing="mailing"/>
<div crm-mailing-block-review crm-mailing="mailing"/>
<div crm-mailing-block-schedule crm-mailing="mailing"/>
<div crm-mailing-block-summary crm-mailing="mailing"/>
<div crm-mailing-block-tracking crm-mailing="mailing"/>
<div crm-mailing-body-html crm-mailing="mailing" />
<div crm-mailing-body-text crm-mailing="mailing" />

9 years agoCRM-15578 - Refactor crmUiField
Tim Otten [Fri, 12 Dec 2014 09:17:25 +0000 (01:17 -0800)]
CRM-15578 - Refactor crmUiField

This splits crmUiField into a few smaller pieces: crmUiField, crmUiId,
crmUiIdScope, crmUiFor.  This loosens the coupling and also makes it easier
to create reusable components which combine them.

9 years agoCRM-15578 - crmUiSelect - Update to work with ngModel
Tim Otten [Fri, 12 Dec 2014 23:12:59 +0000 (15:12 -0800)]
CRM-15578 - crmUiSelect - Update to work with ngModel

9 years agocrmMailing2 - Autoformat
Tim Otten [Fri, 12 Dec 2014 06:07:08 +0000 (22:07 -0800)]
crmMailing2 - Autoformat

9 years agoattachments.html - Remove one level of indirection
Tim Otten [Fri, 12 Dec 2014 06:02:09 +0000 (22:02 -0800)]
attachments.html - Remove one level of indirection

9 years agoCRM_Mailing_Info - Fix warning
Tim Otten [Fri, 12 Dec 2014 05:47:22 +0000 (21:47 -0800)]
CRM_Mailing_Info - Fix warning

9 years agoCRM-15578 - Add crmMailingAB2 module (based on crmMailingAB). Add skeletal list/edit...
Tim Otten [Fri, 12 Dec 2014 00:26:01 +0000 (16:26 -0800)]
CRM-15578 - Add crmMailingAB2 module (based on crmMailingAB). Add skeletal list/edit screens.

9 years agoMove pingback code to separate repo
Coleman Watts [Sun, 14 Dec 2014 02:28:30 +0000 (21:28 -0500)]
Move pingback code to separate repo

9 years agoCRM-15713 - Case ajax fixes
Coleman Watts [Sat, 13 Dec 2014 23:28:04 +0000 (18:28 -0500)]
CRM-15713 - Case ajax fixes

9 years agoMerge pull request #4718 from crusonweb/CRM-15723
colemanw [Sat, 13 Dec 2014 22:26:00 +0000 (17:26 -0500)]
Merge pull request #4718 from crusonweb/CRM-15723

CRM-15723 Joomla 3 Admin Footer Overlays Action Buttons

9 years agoMore changes
Dan Cruson [Sat, 13 Dec 2014 20:26:06 +0000 (15:26 -0500)]
More changes

Changes I missed the first time because of cut and paste.

9 years agoFile adjustments per Coleman
Dan Cruson [Sat, 13 Dec 2014 20:24:23 +0000 (15:24 -0500)]
File adjustments per Coleman

Make changes to the file based on feedback from Coleman

9 years agoCRM-15723 Joomla 3 Footer Bar Overlay
Dan Cruson [Sat, 13 Dec 2014 20:09:17 +0000 (15:09 -0500)]
CRM-15723 Joomla 3 Footer Bar Overlay

Fix issue with the Joomla 3 admin footer overlaying the action buttons

9 years agoMerge pull request #4717 from kurund/ui-fixes
Kurund Jalmi [Sat, 13 Dec 2014 14:11:41 +0000 (19:41 +0530)]
Merge pull request #4717 from kurund/ui-fixes

minor fixes

9 years agominor fixes
kurund [Sat, 13 Dec 2014 14:11:07 +0000 (19:41 +0530)]
minor fixes

9 years agoMerge pull request #4715 from davecivicrm/CRM-14696
Dave Greenberg [Sat, 13 Dec 2014 01:11:51 +0000 (17:11 -0800)]
Merge pull request #4715 from davecivicrm/CRM-14696

CRM-14696 - tweaks to styling for Sold Out indicator

9 years agoCRM-14696 - tweaks to styling for Sold Out indicator
Dave Greenberg [Sat, 13 Dec 2014 00:11:06 +0000 (16:11 -0800)]
CRM-14696 - tweaks to styling for Sold Out indicator

----------------------------------------
* CRM-14696:
  https://issues.civicrm.org/jira/browse/CRM-14696

9 years agoMerge pull request #4692 from kurund/CRM-14696
Dave Greenberg [Fri, 12 Dec 2014 23:45:59 +0000 (15:45 -0800)]
Merge pull request #4692 from kurund/CRM-14696

CRM-14696

9 years agoMerge pull request #4714 from davecivicrm/CRM-13984
Dave Greenberg [Fri, 12 Dec 2014 23:34:23 +0000 (15:34 -0800)]
Merge pull request #4714 from davecivicrm/CRM-13984

CRM-13984 - also move most intro text to a help pop-up.

9 years agoCRM-13984 - also move most intro text to a help pop-up.
Dave Greenberg [Fri, 12 Dec 2014 23:22:30 +0000 (15:22 -0800)]
CRM-13984 - also move most intro text to a help pop-up.

----------------------------------------
* CRM-13984:
  https://issues.civicrm.org/jira/browse/CRM-13984

9 years agoMerge pull request #4713 from colemanw/CRM-15710
Dave Greenberg [Fri, 12 Dec 2014 23:14:07 +0000 (15:14 -0800)]
Merge pull request #4713 from colemanw/CRM-15710

CRM-15710 - Fix access to contact dashboard relationships

9 years agoMerge pull request #4707 from davecivicrm/CRM-13984
Dave Greenberg [Fri, 12 Dec 2014 17:44:02 +0000 (09:44 -0800)]
Merge pull request #4707 from davecivicrm/CRM-13984

CRM-13984 - Add help regarding use of receipt message, AND cleanup the T...

9 years agoFix contact dashboard link
Coleman Watts [Fri, 12 Dec 2014 15:37:15 +0000 (10:37 -0500)]
Fix contact dashboard link

9 years agoCRM-15710 - Fix access to contact dashboard relationships
Coleman Watts [Fri, 12 Dec 2014 15:37:04 +0000 (10:37 -0500)]
CRM-15710 - Fix access to contact dashboard relationships

9 years agoMerge pull request #4710 from rohankatkar/Tests
Kurund Jalmi [Fri, 12 Dec 2014 14:46:30 +0000 (20:16 +0530)]
Merge pull request #4710 from rohankatkar/Tests

Fix for Webtest

9 years agoMerge pull request #4712 from colemanw/CRM-15679
colemanw [Fri, 12 Dec 2014 14:35:01 +0000 (09:35 -0500)]
Merge pull request #4712 from colemanw/CRM-15679

CRM-15679 - Fix translation popup for price set option form

9 years agoCRM-15679 - Fix translation popup for price set option form
Coleman Watts [Fri, 12 Dec 2014 14:31:42 +0000 (09:31 -0500)]
CRM-15679 - Fix translation popup for price set option form

9 years agoMerge pull request #4711 from colemanw/CRM-15720
colemanw [Fri, 12 Dec 2014 14:13:02 +0000 (09:13 -0500)]
Merge pull request #4711 from colemanw/CRM-15720

CRM-15720 - Update help text for locked options

9 years agoCRM-15720 - Update help text for locked options
Coleman Watts [Fri, 12 Dec 2014 14:12:27 +0000 (09:12 -0500)]
CRM-15720 - Update help text for locked options

9 years agoRemoved spaces
Rohan Katkar [Fri, 12 Dec 2014 13:30:19 +0000 (19:00 +0530)]
Removed spaces

9 years agoMerge pull request #4709 from jitendrapurohit/webtestforCRM-15662
Monish Deb [Fri, 12 Dec 2014 13:21:06 +0000 (18:51 +0530)]
Merge pull request #4709 from jitendrapurohit/webtestforCRM-15662

webtest to check for CRM-15662

9 years agoMerge pull request #4708 from jitendrapurohit/CRM-15662
Monish Deb [Fri, 12 Dec 2014 13:18:36 +0000 (18:48 +0530)]
Merge pull request #4708 from jitendrapurohit/CRM-15662

CRM-15662 fix for ACL's do not work when target is a smart group

9 years agoFix for Webtest
Rohan Katkar [Fri, 12 Dec 2014 12:58:50 +0000 (18:28 +0530)]
Fix for Webtest

9 years agowebtest to check for CRM-15662
jitendrapurohit [Fri, 12 Dec 2014 12:43:47 +0000 (18:13 +0530)]
webtest to check for CRM-15662

9 years agoCRM-15662 fix for ACL's do not work when target is a smart group
jitendrapurohit [Fri, 12 Dec 2014 09:05:03 +0000 (14:35 +0530)]
CRM-15662 fix for ACL's do not work when target is a smart group

9 years agoMerge pull request #4693 from jaapjansma/CRM-15702
Yashodha Chaku [Fri, 12 Dec 2014 06:18:18 +0000 (11:48 +0530)]
Merge pull request #4693 from jaapjansma/CRM-15702

fix for issue CRM-15702 sending bulk smses to contacts without e-mail ad...

9 years agoCRM-15578 - Add crmMailingMgr.mergeInto()
Tim Otten [Fri, 12 Dec 2014 02:47:23 +0000 (18:47 -0800)]
CRM-15578 - Add crmMailingMgr.mergeInto()

This should be useful for creating different variations on a mailings in A/B
testing.

9 years agoCRM-13984 - Add help regarding use of receipt message, AND cleanup the Thank-you...
Dave Greenberg [Fri, 12 Dec 2014 01:37:00 +0000 (17:37 -0800)]
CRM-13984 - Add help regarding use of receipt message, AND cleanup the Thank-you and Receipting form (move inline help strings to help pop-ups).

----------------------------------------
* CRM-13984:
  https://issues.civicrm.org/jira/browse/CRM-13984

9 years agoMerge pull request #4706 from colemanw/ajaxFail
colemanw [Fri, 12 Dec 2014 01:09:13 +0000 (20:09 -0500)]
Merge pull request #4706 from colemanw/ajaxFail

Provide more descriptive ajax error messages

9 years agoProvide more descriptive ajax error messages
Coleman Watts [Fri, 12 Dec 2014 01:07:51 +0000 (20:07 -0500)]
Provide more descriptive ajax error messages

9 years agoMerge pull request #4699 from totten/master-civimail-rte
Tim Otten [Fri, 12 Dec 2014 00:12:57 +0000 (16:12 -0800)]
Merge pull request #4699 from totten/master-civimail-rte

CRM-15578 - Implement crmUiRichtext. Update crmMailing2 UI.

9 years agoMerge pull request #4703 from colemanw/CRM-13611
colemanw [Thu, 11 Dec 2014 21:08:05 +0000 (16:08 -0500)]
Merge pull request #4703 from colemanw/CRM-13611

CRM-13611 - Fix create/copy report form errors

9 years agoMerge pull request #4646 from eileenmcnaughton/action-test
Eileen McNaughton [Thu, 11 Dec 2014 20:29:39 +0000 (09:29 +1300)]
Merge pull request #4646 from eileenmcnaughton/action-test

CRM-15550 test + test error fix

9 years agoMerge pull request #4698 from colemanw/CRM-15711
colemanw [Thu, 11 Dec 2014 19:52:18 +0000 (14:52 -0500)]
Merge pull request #4698 from colemanw/CRM-15711

CRM-15711 - Improve efficiency of deleting a contact

9 years agoCRM-13611 - Improve report UI when saving a new report
Coleman Watts [Thu, 11 Dec 2014 19:47:14 +0000 (14:47 -0500)]
CRM-13611 - Improve report UI when saving a new report

9 years agoRemove unused legacy report list
Coleman Watts [Thu, 11 Dec 2014 18:43:15 +0000 (13:43 -0500)]
Remove unused legacy report list

9 years agoReport tpl whitespace cleanup
Coleman Watts [Thu, 11 Dec 2014 18:32:44 +0000 (13:32 -0500)]
Report tpl whitespace cleanup

9 years agoCRM.utils.renderOptions - make escapeHtml optional
Coleman Watts [Thu, 11 Dec 2014 18:20:18 +0000 (13:20 -0500)]
CRM.utils.renderOptions - make escapeHtml optional

9 years agoCRM-15495 - Fix CRM.utils.renderOptions to handle optgroups correctly
Coleman Watts [Thu, 11 Dec 2014 17:58:10 +0000 (12:58 -0500)]
CRM-15495 - Fix CRM.utils.renderOptions to handle optgroups correctly

9 years agoCRM-13611 - Fix create/copy report form errors
Coleman Watts [Thu, 11 Dec 2014 16:28:13 +0000 (11:28 -0500)]
CRM-13611 - Fix create/copy report form errors

9 years agoMerge pull request #4701 from rohankatkar/Tests
Monish Deb [Thu, 11 Dec 2014 15:44:49 +0000 (21:14 +0530)]
Merge pull request #4701 from rohankatkar/Tests

Webtest Fixes

9 years agoWebtest Fix
Rohan Katkar [Thu, 11 Dec 2014 13:24:46 +0000 (18:54 +0530)]
Webtest Fix

9 years agoQA fixes
monishdeb [Thu, 11 Dec 2014 13:02:08 +0000 (18:32 +0530)]
QA fixes

9 years agoCRM-15709 fix - Searchbuilder contactsubtype ≠ 'value' fails
monishdeb [Thu, 11 Dec 2014 10:44:52 +0000 (16:14 +0530)]
CRM-15709 fix - Searchbuilder contactsubtype ≠ 'value' fails

https://issues.civicrm.org/jira/browse/CRM-15709

9 years agoCRM-15711 - Improve efficiency of deleting a contact
Coleman Watts [Wed, 10 Dec 2014 22:30:37 +0000 (17:30 -0500)]
CRM-15711 - Improve efficiency of deleting a contact

9 years agoCRM-15578 - crmMailing2 - Respect $config->replyTo option
Tim Otten [Thu, 11 Dec 2014 02:26:56 +0000 (18:26 -0800)]
CRM-15578 - crmMailing2 - Respect $config->replyTo option

9 years agoCRM-15578 - Implement crmUiRichtext; incorporate into crmMailing2 UI.
Tim Otten [Thu, 11 Dec 2014 01:54:35 +0000 (17:54 -0800)]
CRM-15578 - Implement crmUiRichtext; incorporate into crmMailing2 UI.

9 years agoCRM-15578 - Extract crmUiId
Tim Otten [Thu, 11 Dec 2014 01:17:18 +0000 (17:17 -0800)]
CRM-15578 - Extract crmUiId

9 years agoMerge pull request #4694 from monishdeb/CRM-15626
Dave Greenberg [Thu, 11 Dec 2014 00:49:44 +0000 (16:49 -0800)]
Merge pull request #4694 from monishdeb/CRM-15626

CRM-15626 fix - Relationship Create Widget Not always showing the correc...

9 years agoMerge pull request #4681 from totten/master-civimail-attachment
Tim Otten [Wed, 10 Dec 2014 21:25:05 +0000 (13:25 -0800)]
Merge pull request #4681 from totten/master-civimail-attachment

CRM-15578 - crmAttachments - Add support for attaching files to mailings

9 years agoMerge pull request #4690 from jitendrapurohit/CRM-15559
Monish Deb [Wed, 10 Dec 2014 18:30:06 +0000 (00:00 +0530)]
Merge pull request #4690 from jitendrapurohit/CRM-15559

Additional fix for Cannot register lifetime membership for someone else ...

9 years agoCRM-15626 fixes - Relationship Create Widget Not always showing the correct available...
monishdeb [Wed, 10 Dec 2014 14:38:09 +0000 (20:08 +0530)]
CRM-15626 fixes - Relationship Create Widget Not always showing the correct available relationships in select tool

https://issues.civicrm.org/jira/browse/CRM-15626

9 years agoCRM-15578 - crmMailing2 - Incorporate crmAttachments
Tim Otten [Tue, 9 Dec 2014 08:16:09 +0000 (00:16 -0800)]
CRM-15578 - crmMailing2 - Incorporate crmAttachments

9 years agoCRM-15578 - crmAttachment - Angular module for file attachments
Tim Otten [Tue, 9 Dec 2014 08:15:05 +0000 (00:15 -0800)]
CRM-15578 - crmAttachment - Angular module for file attachments

9 years agoCRM-15578 - crmUiVisible - Add a helper for hiding elements while preserving layout
Tim Otten [Tue, 9 Dec 2014 23:52:56 +0000 (15:52 -0800)]
CRM-15578 - crmUiVisible - Add a helper for hiding elements while preserving layout

ngShow/ngHide use "display:none" to hide elements -- which modifies layout.
That's normally appropriate, but sometimes one wants to hide things without
changing layout ("visibility:hidden").

9 years agoCRM_Core_Transaction - Doc fix
Tim Otten [Tue, 9 Dec 2014 03:03:29 +0000 (19:03 -0800)]
CRM_Core_Transaction - Doc fix

9 years agoCRM-15578 - civicrm/ajax/attachment - Add endpoint for creating attachments using...
Tim Otten [Tue, 9 Dec 2014 02:58:58 +0000 (18:58 -0800)]
CRM-15578 - civicrm/ajax/attachment - Add endpoint for creating attachments using HTTP POST (multipart)

9 years agoCRM-15578 - Attachment API - Add support for CRUD'ing files
Tim Otten [Sat, 6 Dec 2014 06:44:41 +0000 (22:44 -0800)]
CRM-15578 - Attachment API - Add support for CRUD'ing files

The File API is entirely inadequate to managing files. The Attachment API
provides a pseudo-entity which represents a record in civicrm_file combined
with a record in civicrm_entity_file as well as the underlying file content.

(See also: discussions on civicrm-api mailing list circa early Dec 2014.)

9 years agoMerge pull request #4695 from colemanw/CRM-15550
colemanw [Tue, 9 Dec 2014 21:35:42 +0000 (16:35 -0500)]
Merge pull request #4695 from colemanw/CRM-15550

CRM-15550 - Fix relationship id passed to postprocess hook

9 years agoMerge pull request #4686 from lcdservices/CRM-15698-b
Dave Greenberg [Tue, 9 Dec 2014 21:07:24 +0000 (13:07 -0800)]
Merge pull request #4686 from lcdservices/CRM-15698-b

CRM-15698 participant report price level query

9 years agoMerge pull request #4664 from aydun/CRM-15681-master
colemanw [Tue, 9 Dec 2014 19:42:34 +0000 (14:42 -0500)]
Merge pull request #4664 from aydun/CRM-15681-master

CRM-15681 Merge sub-types

9 years agoMerge pull request #4687 from eileenmcnaughton/CRM-15699-master
Eileen McNaughton [Tue, 9 Dec 2014 19:31:19 +0000 (08:31 +1300)]
Merge pull request #4687 from eileenmcnaughton/CRM-15699-master

CRM-15699 add create/edit hook for ContributionPage

9 years agoCRM-15550 - Fix relationship id passed to postprocess hook
Coleman Watts [Tue, 9 Dec 2014 19:22:00 +0000 (14:22 -0500)]
CRM-15550 - Fix relationship id passed to postprocess hook

9 years agoMerge pull request #4689 from colemanw/CRM-13611
colemanw [Tue, 9 Dec 2014 13:55:45 +0000 (08:55 -0500)]
Merge pull request #4689 from colemanw/CRM-13611

CRM-13611 - Report fixes

9 years agoMerge pull request #4688 from colemanw/CRM-15495
colemanw [Tue, 9 Dec 2014 13:53:32 +0000 (08:53 -0500)]
Merge pull request #4688 from colemanw/CRM-15495

CRM-15495 - Support complex api filters in EntityRef

9 years agoCRM-15626 fix - Relationship Create Widget Not always showing the correct available...
monishdeb [Tue, 9 Dec 2014 13:49:18 +0000 (19:19 +0530)]
CRM-15626 fix - Relationship Create Widget Not always showing the correct available relationships in select tool

https://issues.civicrm.org/jira/browse/CRM-15626

9 years agofix for issue CRM-15702 sending bulk smses to contacts without e-mail address
Jaap Jansma [Tue, 9 Dec 2014 11:15:44 +0000 (12:15 +0100)]
fix for issue CRM-15702 sending bulk smses to contacts without e-mail address

9 years agoMerge branch 'CRM-14696-v2' of https://github.com/JKingsnorth/civicrm-core into CRM...
kurund [Tue, 9 Dec 2014 10:48:45 +0000 (16:18 +0530)]
Merge branch 'CRM-14696-v2' of https://github.com/JKingsnorth/civicrm-core into CRM-14696

Conflicts:
CRM/Price/BAO/PriceField.php

----------------------------------------
* CRM-14696: Improve display for sold out price set options
  https://issues.civicrm.org/jira/browse/CRM-14696

9 years agoMerge remote-tracking branch 'upstream/master' into pledge-batchentry
kurund [Tue, 9 Dec 2014 10:29:09 +0000 (15:59 +0530)]
Merge remote-tracking branch 'upstream/master' into pledge-batchentry

Conflicts:
CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl

9 years agoMerge pull request #1 from manishmore/master
Kurund Jalmi [Tue, 9 Dec 2014 10:13:40 +0000 (15:43 +0530)]
Merge pull request #1 from manishmore/master

batch entry for pledges

9 years agoMerge pull request #4657 from monishdeb/CRM-14512
Kurund Jalmi [Tue, 9 Dec 2014 10:10:40 +0000 (15:40 +0530)]
Merge pull request #4657 from monishdeb/CRM-14512

Crm 14512

9 years agoAdditional fix for Cannot register lifetime membership for someone else [cid=0] if...
jitendrapurohit [Tue, 9 Dec 2014 09:56:36 +0000 (15:26 +0530)]
Additional fix for Cannot register lifetime membership for someone else [cid=0] if already have lifetime membership

9 years agoMerge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-09-14-48-51
kurund [Tue, 9 Dec 2014 09:23:16 +0000 (14:53 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-09-14-48-51

Conflicts:
CRM/Core/BAO/ActionSchedule.php
templates/CRM/Core/BillingBlock.tpl