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
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 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
Tim Otten [Mon, 9 Feb 2015 17:52:50 +0000 (09:52 -0800)]
Merge pull request #5121 from totten/master-mailing-dflt
CRM-15578, CRM-15855 - Autosave AB test. Server-generated defaults.
colemanw [Mon, 9 Feb 2015 16:18:25 +0000 (11:18 -0500)]
Merge pull request #5119 from colemanw/CRM-15789
CRM-15789 - Button cleanup
Coleman Watts [Mon, 9 Feb 2015 15:24:52 +0000 (10:24 -0500)]
CheckStyle cleanup
Tim Otten [Mon, 9 Feb 2015 14:19:31 +0000 (06:19 -0800)]
Merge pull request #5118 from totten/master-mgdent-test
CRM_Core_ManagedEntitiesTest - Fix compat w/drupal-demo. Use transactions.
Tim Otten [Mon, 9 Feb 2015 11:24:43 +0000 (03:24 -0800)]
CRM-15578 - Mailing API - Refine permissions
Tim Otten [Mon, 9 Feb 2015 00:03:14 +0000 (16:03 -0800)]
Mailing.create API - Remove default value 'api.mailing_job.create'=>1
When scheduling a blast, one creates a duplicate job by default (once via
API chaining and once via BAO). This removes the API chaining one as well
as work-aronds which had been necessary to disable it.
http://forum.civicrm.org/index.php?topic=35567.new;topicseen#new
Yashodha Chaku [Mon, 9 Feb 2015 13:04:05 +0000 (18:34 +0530)]
Merge pull request #5126 from yashodha/CRM-15940
CRM-15940: fix error message for missing report template
monishdeb [Mon, 9 Feb 2015 12:40:10 +0000 (18:10 +0530)]
CRM-14114 fix - Online recurring contribution page does not translate recurring unit
https://issues.civicrm.org/jira/browse/CRM-14114
yashodha [Mon, 9 Feb 2015 11:35:14 +0000 (17:05 +0530)]
CRM-15940: fix error message for missing report template
----------------------------------------
* CRM-15940: Report gives white screen rather than sensible error if report instance is invalid
https://issues.civicrm.org/jira/browse/CRM-15940
Tim Otten [Sun, 8 Feb 2015 23:40:48 +0000 (15:40 -0800)]
CRM-15578 - Use server-provided defaults for new mailings.
Tim Otten [Sun, 8 Feb 2015 23:38:46 +0000 (15:38 -0800)]
CRM-15578 - Mailing.setting.php - Cleanup track_civimail_replies
It appears that the description was copy/pasted without proper adjustments.
Tim Otten [Fri, 6 Feb 2015 19:31:15 +0000 (11:31 -0800)]
CRM-15578 - Mailing.create API - Set defaults that match UX
Tim Otten [Fri, 6 Feb 2015 20:03:42 +0000 (12:03 -0800)]
CRM-15855 - crmMailingAB - Use auto-save and blocked-button behaviors
Tim Otten [Fri, 6 Feb 2015 19:58:23 +0000 (11:58 -0800)]
crmMailing/edit-wizard.html - Typo
Tim Otten [Fri, 6 Feb 2015 19:57:39 +0000 (11:57 -0800)]
CRM-15855 - crmAutosave - Bump up default interval (3s=>5s)
Kurund Jalmi [Mon, 9 Feb 2015 07:39:54 +0000 (13:09 +0530)]
Merge pull request #5120 from eileenmcnaughton/CRM-15938
CRM-15938 e-notice fix
kurund [Mon, 9 Feb 2015 06:30:00 +0000 (12:00 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-09-11-44-07
Conflicts:
CRM/Contribute/BAO/ContributionPage.php
Eileen McNaughton [Sun, 8 Feb 2015 23:34:29 +0000 (12:34 +1300)]
CRM-15938 e-notice fix
Eileen McNaughton [Sun, 8 Feb 2015 23:31:13 +0000 (12:31 +1300)]
preliminary tidy up of report instance class & other uncommitted tidyups
Eileen McNaughton [Sun, 8 Feb 2015 23:30:13 +0000 (12:30 +1300)]
CRM-15938 preliminary tidy up
Coleman Watts [Sun, 8 Feb 2015 23:10:16 +0000 (18:10 -0500)]
CRM-15789 - Improve disabled button handling
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
Tim Otten [Sun, 8 Feb 2015 22:50:13 +0000 (14:50 -0800)]
CRM_Core_ManagedEntitiesTest - Fix compat w/drupal-demo. Use transactions.
Tim Otten [Sun, 8 Feb 2015 22:34:27 +0000 (14:34 -0800)]
Merge pull request #5117 from totten/master-crm-alltests
Fix fatal errors which break CRM_AllTests.
Tim Otten [Sun, 8 Feb 2015 22:29:40 +0000 (14:29 -0800)]
Merge pull request #5046 from totten/master-resolver
CRM-15578 - Add Civi\Core\Resolver. Fix loading of Angular content after updating components.
Tim Otten [Sun, 8 Feb 2015 22:27:06 +0000 (14:27 -0800)]
Fix fatal errors which break CRM_AllTests.
Coleman Watts [Sun, 8 Feb 2015 17:01:48 +0000 (12:01 -0500)]
CRM-15789 - Button cleanup
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
Jon goldberg [Sun, 8 Feb 2015 05:10:20 +0000 (00:10 -0500)]
civilint fixes
colemanw [Sat, 7 Feb 2015 23:47:04 +0000 (18:47 -0500)]
Merge pull request #5113 from colemanw/Fix
Fix crmEditable conversion of plain text to html and vice-versa
Coleman Watts [Sat, 7 Feb 2015 23:08:19 +0000 (18:08 -0500)]
jquery.crmeditable.js - fix jshint warnings
Coleman Watts [Sat, 7 Feb 2015 22:49:39 +0000 (17:49 -0500)]
Fix crmEditable conversion of plain text to html and vice-versa
Tim Otten [Sat, 7 Feb 2015 14:35:26 +0000 (06:35 -0800)]
CRM-15931 - civicrm_mailing_group.group_type - Cleanup inconsistent data
Monish Deb [Sat, 7 Feb 2015 14:10:28 +0000 (19:40 +0530)]
Merge pull request #5107 from rohankatkar/4.6_webtest
Fix for Dates selection from datepicker in webtests
projects / civicrm-core.git / log