Tim Otten [Fri, 13 Feb 2015 17:22:24 +0000 (09:22 -0800)]
crmMailing - Tweak style on msg template button
Monish Deb [Fri, 13 Feb 2015 13:20:13 +0000 (18:50 +0530)]
Merge pull request #5161 from monishdeb/master
CRM-15964 fix - Tabbed custom data for contact subtypes don't save
monishdeb [Fri, 13 Feb 2015 11:36:41 +0000 (17:06 +0530)]
CRM-15964 fix - Tabbed custom data for contact subtypes don't save
https://issues.civicrm.org/jira/browse/CRM-15964
Yashodha Chaku [Fri, 13 Feb 2015 10:57:50 +0000 (16:27 +0530)]
Merge pull request #5160 from yashodha/CRM-15963
CRM-15963: fix event title filter
yashodha [Fri, 13 Feb 2015 07:43:16 +0000 (13:13 +0530)]
CRM-15963: fix event title filter
----------------------------------------
* CRM-15963: Event_title can't be filtered with the search builder
https://issues.civicrm.org/jira/browse/CRM-15963
yashodha [Fri, 13 Feb 2015 07:09:55 +0000 (12:39 +0530)]
CRM-15963: fix event title filter
----------------------------------------
* CRM-15963: Event_title can't be filtered with the search builder
https://issues.civicrm.org/jira/browse/CRM-15963
Dave Greenberg [Fri, 13 Feb 2015 03:18:12 +0000 (19:18 -0800)]
Merge pull request #5146 from eileenmcnaughton/CRM-15955
CRM-15955 move credit card block to close to the top of the back office form
Dave Greenberg [Fri, 13 Feb 2015 02:48:40 +0000 (18:48 -0800)]
Merge pull request #5156 from totten/master-replyto-track
CRM-15856 - "Reply-To" and "Track Replies" are mutually exclusive. Tweak missing tokens.
Tim Otten [Fri, 13 Feb 2015 00:24:56 +0000 (16:24 -0800)]
crmMailingAB - Don't set a default "name"
Tim Otten [Fri, 13 Feb 2015 00:20:28 +0000 (16:20 -0800)]
CRM-15856 - Tweak style for required-tokens error.
Tim Otten [Thu, 12 Feb 2015 23:23:50 +0000 (15:23 -0800)]
crmMailing - Skip token dropdown when tabbing
Tim Otten [Thu, 12 Feb 2015 23:14:58 +0000 (15:14 -0800)]
CRM-15856 - crmMailing - Display a warning inline if required tokens are missing
When you first fill in the body, we produce a popup on-blur to mention the
missing tokens. However, when you edit an existing mailing, there is no
blur at first, and it's not clear what's wrong (unless you focus and blur
the problematic field). This makes the problem more obvious.
Tim Otten [Thu, 12 Feb 2015 23:14:28 +0000 (15:14 -0800)]
crmMailing - Expand "Plain Text" if any text has been set.
Tim Otten [Thu, 12 Feb 2015 22:26:52 +0000 (14:26 -0800)]
Cleanup
Tim Otten [Thu, 12 Feb 2015 22:14:37 +0000 (14:14 -0800)]
CRM-15856 - crmMailingAB - Disable "Reply-To" when testing diff "From" addrs
The issue here is that "Reply-To" is linked with "Track Replies", and the
validation+warnings get a bit messy when there are two values of "Reply-To"
and one value of "Track Replies". The whole thing is an edge-case that's
merely "nice to have", so I'm disabling it for now. If someone really wants
it, they can figure out how to make the validation+warnings work well.
Tim Otten [Thu, 12 Feb 2015 22:07:06 +0000 (14:07 -0800)]
CRM-15856 - crmMailingAB - "Reply-To" and "Track Replies" are mutually exclusive
Tim Otten [Thu, 12 Feb 2015 21:47:12 +0000 (13:47 -0800)]
CRM-15856 - crmMailing - "Reply-To" and "Track Replies" are mutually exclusive
Dave Greenberg [Thu, 12 Feb 2015 21:31:00 +0000 (13:31 -0800)]
Merge pull request #5154 from mallezie/CRM-15966
add context all, to get all relations of contact in ajax call
Tim Otten [Thu, 12 Feb 2015 21:05:28 +0000 (13:05 -0800)]
Merge pull request #5147 from totten/master-abtest-btn
CRM-15856 - crmMailing - Require recipients and mailing tokens. Fixes for AB test.
colemanw [Thu, 12 Feb 2015 21:01:09 +0000 (16:01 -0500)]
Merge pull request #5155 from colemanw/bower
Add force flag to bower install
Coleman Watts [Thu, 12 Feb 2015 20:58:10 +0000 (15:58 -0500)]
Add force flag to bower install
Tim Otten [Thu, 12 Feb 2015 19:45:55 +0000 (11:45 -0800)]
CRM-15856 - Required tokens - Display rich dialog
Tim Otten [Thu, 12 Feb 2015 19:41:19 +0000 (11:41 -0800)]
crmUiAlert - Add wrapper for embedding Angular content in an alert.
Tim Otten [Thu, 12 Feb 2015 16:53:38 +0000 (08:53 -0800)]
crmMailingToken - Use $broadcast to link insertions and their targets
Tim Otten [Thu, 12 Feb 2015 15:44:58 +0000 (07:44 -0800)]
crmMailingMgr - Fix saving of blank footer_id/header_id
Tim Otten [Thu, 12 Feb 2015 14:32:17 +0000 (06:32 -0800)]
Cleanup style
Tim Otten [Thu, 12 Feb 2015 00:54:43 +0000 (16:54 -0800)]
angular-crm-ui.js = Remove extraneous $()
Tim Otten [Thu, 12 Feb 2015 00:32:46 +0000 (16:32 -0800)]
CRM-15856 - Enforce required tokens in UI
Tim Otten [Thu, 12 Feb 2015 00:30:46 +0000 (16:30 -0800)]
CRM-15856 - Export list of required tokens to UI
Tim Otten [Thu, 12 Feb 2015 00:31:53 +0000 (16:31 -0800)]
CRM-15856 - crmMailingRecipients - Respect ngRequired
Tim Otten [Thu, 12 Feb 2015 00:30:06 +0000 (16:30 -0800)]
crmUiRichtext - Add support for ngBlur.
Tim Otten [Wed, 11 Feb 2015 21:47:54 +0000 (13:47 -0800)]
CRM-15856 - crmMailingRecipients - Use ngModel. Merge mailing.groups and mailing.mailings under mailing.recipients
Tim Otten [Wed, 11 Feb 2015 21:03:29 +0000 (13:03 -0800)]
CRM-15855 - crmMailingAB
* Fix duplicate autosave
* Fix "Submit Mailing" button
Tim Mallezie [Thu, 12 Feb 2015 17:56:18 +0000 (18:56 +0100)]
code style
Tim Mallezie [Thu, 12 Feb 2015 15:06:09 +0000 (16:06 +0100)]
resolved merge conflict
Tim Mallezie [Thu, 12 Feb 2015 14:55:29 +0000 (15:55 +0100)]
add context all, to get all relations of contact in ajax call
Kurund Jalmi [Thu, 12 Feb 2015 10:54:15 +0000 (16:24 +0530)]
Merge pull request #5022 from atif-shaikh/CRM-5039SoldOut
CRM-5039 - Sold out price options modifications
atif-shaikh [Thu, 12 Feb 2015 09:46:20 +0000 (15:16 +0530)]
CRM-5039 Test Build Fixes Continued
----------------------------------------
* CRM-5039: Events don't always limit registrations to "max participants" setting
https://issues.civicrm.org/jira/browse/CRM-5039
atif-shaikh [Thu, 12 Feb 2015 08:00:34 +0000 (13:30 +0530)]
CRM-5039-Testbuild Fixes
atif-shaikh [Wed, 28 Jan 2015 14:52:13 +0000 (20:22 +0530)]
QA Fix
atif-shaikh [Wed, 28 Jan 2015 14:34:48 +0000 (20:04 +0530)]
CRM-5039 - Sold out price options modifications
----------------------------------------
* CRM-5039: Events don't always limit registrations to "max participants" setting
https://issues.civicrm.org/jira/browse/CRM-5039
Eileen McNaughton [Thu, 12 Feb 2015 07:11:26 +0000 (20:11 +1300)]
Merge pull request #5148 from eileenmcnaughton/master
some comment fixes
Eileen McNaughton [Thu, 12 Feb 2015 05:40:26 +0000 (18:40 +1300)]
CRM-15960 fix for net_amount being wiped:
Eileen McNaughton [Thu, 12 Feb 2015 05:40:10 +0000 (18:40 +1300)]
CRM-15960 test
Eileen McNaughton [Thu, 12 Feb 2015 05:39:35 +0000 (18:39 +1300)]
preliminary tidy up
Eileen McNaughton [Thu, 12 Feb 2015 04:30:00 +0000 (17:30 +1300)]
some comment fixes
colemanw [Thu, 12 Feb 2015 03:25:03 +0000 (22:25 -0500)]
Merge pull request #5145 from agh1/case-insensitive-headers
CRM-15956 - Reports / Smarty: section headers should be case-insensitive
Eileen McNaughton [Thu, 12 Feb 2015 00:54:11 +0000 (13:54 +1300)]
Merge pull request #5143 from eileenmcnaughton/CRM-15954
CRM-15954 set backoffice defaults for credit card to every one month …
Andrew Hunt [Wed, 11 Feb 2015 23:04:07 +0000 (18:04 -0500)]
CRM-15956 - Reports / Smarty: section headers should be case-insensitive
because MySQL ORDER BY is
Dave Greenberg [Wed, 11 Feb 2015 22:28:57 +0000 (14:28 -0800)]
Merge pull request #5142 from eileenmcnaughton/master
Preliminary phpcs cleanup
Eileen McNaughton [Wed, 11 Feb 2015 22:20:33 +0000 (11:20 +1300)]
CRM-15955 move credit card block to close to the top of the back office contribution form
Eileen McNaughton [Wed, 11 Feb 2015 22:19:58 +0000 (11:19 +1300)]
comment fixes only
Eileen McNaughton [Wed, 11 Feb 2015 21:44:09 +0000 (10:44 +1300)]
CRM-15954 set backoffice defaults for credit card to every one month
NB I tested this with non-credit card & setting the defaults for fields that are not relevant
or don't exist doesn't seem to matter, so I didn't see the need to 'if ' them
Eileen McNaughton [Wed, 11 Feb 2015 21:42:01 +0000 (10:42 +1300)]
more comment tidy-ups, preliminary space + cap
Eileen McNaughton [Wed, 11 Feb 2015 21:29:17 +0000 (10:29 +1300)]
more comment tidy-ups, preliminary space + cap
Eileen McNaughton [Wed, 11 Feb 2015 21:28:40 +0000 (10:28 +1300)]
reduce unnecessary variable passing (config & session objects)
I've also marked the fn as protected as my grepping showed it wasn't called
from elsewhere
Eileen McNaughton [Wed, 11 Feb 2015 21:22:12 +0000 (10:22 +1300)]
Further phpcs & comment clean up
Eileen McNaughton [Wed, 11 Feb 2015 21:11:46 +0000 (10:11 +1300)]
Preliminary phpcs cleanup
Tim Otten [Wed, 11 Feb 2015 21:02:50 +0000 (13:02 -0800)]
Merge pull request #5130 from totten/master-mailing-misc2
CRM-15856 - Mailing API - Enforce required mail-merge tokens.
Tim Otten [Wed, 11 Feb 2015 16:53:40 +0000 (08:53 -0800)]
Merge pull request #5135 from totten/master-abtest-fixes
CRM-15856, CRM-15578 - Misc crmMailing* UI fixes
Tim Otten [Tue, 10 Feb 2015 12:50:46 +0000 (04:50 -0800)]
Add Civi\Core\Resolver::call() helper
Tim Otten [Tue, 10 Feb 2015 12:47:22 +0000 (04:47 -0800)]
CRM-15856 - Mailing BAO - Only validate tokens when calling through API
The test suite relies on CRM_Mailing_BAO_Spool to log test messages -- which
(surprisingly, bizarrely) puts them in civicrm_mailing; thus, enforcing
required tokens broke lots of test cases that have nothing to do with
CiviMail.
Tim Otten [Mon, 9 Feb 2015 20:41:27 +0000 (12:41 -0800)]
CRM-15856 - Mailing API - Enforce required mail-merge tokens.
Tim Otten [Mon, 9 Feb 2015 20:21:21 +0000 (12:21 -0800)]
CRM-15578 - Respect setting "dedupe_email_default"
Monish Deb [Wed, 11 Feb 2015 14:32:35 +0000 (20:02 +0530)]
Merge pull request #5140 from pratikshad/CRM-15924
CRM-15924 Fixed issue to allow more criteria rows than template does in ...
Yashodha Chaku [Wed, 11 Feb 2015 12:11:31 +0000 (17:41 +0530)]
Merge pull request #5141 from yashodha/version-fix
version fix
yashodha [Wed, 11 Feb 2015 10:41:13 +0000 (16:11 +0530)]
version fix
Monish Deb [Wed, 11 Feb 2015 06:06:38 +0000 (11:36 +0530)]
Merge pull request #5139 from monishdeb/master
CRM-15946 fix - Upgrade to 4.6 alpha fails on 'Add and update reference_...
monishdeb [Wed, 11 Feb 2015 06:04:24 +0000 (11:34 +0530)]
CRM-15946 fix - Upgrade to 4.6 alpha fails on 'Add and update reference_date column for Schedule Reminders'
https://issues.civicrm.org/jira/browse/CRM-15946
pratikshad [Wed, 11 Feb 2015 05:42:38 +0000 (15:42 +1000)]
CRM-15924 Fixed issue to allow more criteria rows than template does in report
----------------------------------------
* CRM-15924: Report form allows more criteria rows than template does
https://issues.civicrm.org/jira/browse/CRM-15924
colemanw [Wed, 11 Feb 2015 03:12:40 +0000 (22:12 -0500)]
Merge pull request #5137 from colemanw/style
Common.js lint fixes
colemanw [Wed, 11 Feb 2015 03:12:24 +0000 (22:12 -0500)]
Merge pull request #5138 from colemanw/CRM-15949
CRM-15949 - Fix check for duplicate options and set defalt values
Coleman Watts [Wed, 11 Feb 2015 03:04:59 +0000 (22:04 -0500)]
CRM-15949 - Fix check for duplicate options and set defalt values
----------------------------------------
* CRM-15949: Don't allow the same value for different custom field options
https://issues.civicrm.org/jira/browse/CRM-15949
Coleman Watts [Wed, 11 Feb 2015 02:29:25 +0000 (21:29 -0500)]
Common.js lint fixes
Coleman Watts [Wed, 11 Feb 2015 01:40:56 +0000 (20:40 -0500)]
Style fixes
Coleman Watts [Wed, 11 Feb 2015 01:32:20 +0000 (20:32 -0500)]
Remove unused styles
Tim Otten [Wed, 11 Feb 2015 00:19:02 +0000 (16:19 -0800)]
CRM-15578 - crmMailingRecipients - Fix sporadically missing options
Tim Otten [Wed, 11 Feb 2015 00:02:22 +0000 (16:02 -0800)]
crmMailingAB - Normalize styling of "Template"
Tim Otten [Wed, 11 Feb 2015 00:00:53 +0000 (16:00 -0800)]
CRM-15856 - crmMailingAB - Update date-time widgets
Coleman Watts [Tue, 10 Feb 2015 21:39:44 +0000 (16:39 -0500)]
css cleanup
colemanw [Tue, 10 Feb 2015 14:25:46 +0000 (09:25 -0500)]
Merge pull request #5101 from agh1/context-abbrev
CRM-15919 Address getoptions alternative: "abbreviate" context
colemanw [Tue, 10 Feb 2015 14:23:45 +0000 (09:23 -0500)]
Merge pull request #5132 from colemanw/css
Move contact-summary css into its own file
colemanw [Tue, 10 Feb 2015 14:22:59 +0000 (09:22 -0500)]
Merge pull request #5127 from monishdeb/CRM-14114
CRM-14114 fix - Online recurring contribution page does not translate re...
Coleman Watts [Tue, 10 Feb 2015 14:14:45 +0000 (09:14 -0500)]
Move contact-summary css into its own file
colemanw [Tue, 10 Feb 2015 12:34:19 +0000 (07:34 -0500)]
Merge pull request #5131 from colemanw/enableDisable
Remove unused enableDisable function/hook
Tim Otten [Tue, 10 Feb 2015 11:44:28 +0000 (03:44 -0800)]
Merge pull request #5128 from totten/master-attachment-api
Attachment API, DynamicFKAuthorization - Support for custom fields and contacts
Coleman Watts [Tue, 10 Feb 2015 03:06:31 +0000 (22:06 -0500)]
Remove unused css file
Coleman Watts [Tue, 10 Feb 2015 02:52:42 +0000 (21:52 -0500)]
Remove unused enableDisable function/hook
Dave Greenberg [Tue, 10 Feb 2015 02:41:24 +0000 (18:41 -0800)]
Merge pull request #5112 from totten/master-include-case
CRM-15931 - Fixes for civicrm_mailing_group.group_type
Tim Otten [Tue, 10 Feb 2015 01:26:57 +0000 (17:26 -0800)]
Attachment.get API - Update test to reflect that entity_id is now required
colemanw [Mon, 9 Feb 2015 22:28:18 +0000 (17:28 -0500)]
Merge pull request #5129 from colemanw/api
API Fixes
Coleman Watts [Mon, 9 Feb 2015 22:00:42 +0000 (17:00 -0500)]
Api explorer style fixes
Coleman Watts [Mon, 9 Feb 2015 21:00:11 +0000 (16:00 -0500)]
Add deprecation notice to generated examples
Tim Otten [Mon, 9 Feb 2015 20:44:30 +0000 (12:44 -0800)]
DynamicFKAuthorization - Fix for PHP 5.3
Tim Otten [Mon, 9 Feb 2015 20:10:40 +0000 (12:10 -0800)]
DynamicFKAuthorization - Sanitize with convertStringToCamel() instead of strtolower()
Dave Greenberg [Mon, 9 Feb 2015 18:51:42 +0000 (10:51 -0800)]
Merge pull request #5097 from PalanteJon/CRM-15917
CRM-15917 - CiviReport - remove override of standard orderBy function; a...
Tim Otten [Mon, 9 Feb 2015 17:51:28 +0000 (09:51 -0800)]
Attachment API, DynamicFKAuthorization - Support for custom fields and contacts.
This commit makes the entity_id a required field. This restricts search
abilities but allows support for ACL'd entities (e.g. contacts).
Tim Otten [Mon, 9 Feb 2015 15:13:23 +0000 (07:13 -0800)]
CRM_Core_DAO_AllCore_Tables - Add get() which returns full metadata.
(Using the same format has hook_entityTypes)
Tim Otten [Mon, 9 Feb 2015 13:22:05 +0000 (05:22 -0800)]
DynamicFKAuthorization - Security checks should not be case-sensitive.
Tim Otten [Mon, 9 Feb 2015 13:21:18 +0000 (05:21 -0800)]
DynamicFKAuthorization - Add comment
projects / civicrm-core.git / log