civicrm-core.git
9 years agoCorrectly represent getstat action in api explorer and metadata
Coleman Watts [Tue, 24 Feb 2015 22:03:40 +0000 (17:03 -0500)]
Correctly represent getstat action in api explorer and metadata

9 years agoMerge pull request #5239 from colemanw/ApiExplorer
colemanw [Tue, 24 Feb 2015 19:54:53 +0000 (14:54 -0500)]
Merge pull request #5239 from colemanw/ApiExplorer

ApiExplorer - workaround ambiguity of = operator

9 years agoApiExplorer - workaround ambiguity of = operator
Coleman Watts [Tue, 24 Feb 2015 19:34:50 +0000 (14:34 -0500)]
ApiExplorer - workaround ambiguity of = operator

9 years agoMerge pull request #5214 from jitendrapurohit/CRM-15934changes
Kurund Jalmi [Tue, 24 Feb 2015 18:48:42 +0000 (00:18 +0530)]
Merge pull request #5214 from jitendrapurohit/CRM-15934changes

Many SMTP responses missing, resulting in a flood of Syntax bounces fix CRM-15934

9 years agoMerge pull request #5216 from atif-shaikh/CRM-15792
Kurund Jalmi [Tue, 24 Feb 2015 18:45:01 +0000 (00:15 +0530)]
Merge pull request #5216 from atif-shaikh/CRM-15792

Crm 15792

9 years agoMerge pull request #5225 from totten/master-angstz
Kurund Jalmi [Tue, 24 Feb 2015 18:42:51 +0000 (00:12 +0530)]
Merge pull request #5225 from totten/master-angstz

ngSanitize - Remove unused module

9 years agoMerge pull request #5227 from totten/master-abtest-returnurl
Dave Greenberg [Tue, 24 Feb 2015 17:24:23 +0000 (09:24 -0800)]
Merge pull request #5227 from totten/master-abtest-returnurl

CRM-15995 - When viewing details from AB test report, set return URL to the AB test's overall report.

9 years agoMerge pull request #5226 from davecivicrm/CRM-15578
Dave Greenberg [Tue, 24 Feb 2015 17:15:07 +0000 (09:15 -0800)]
Merge pull request #5226 from davecivicrm/CRM-15578

CRM-15578 - Add button styling and help message to AB Test Results. Add ...

9 years agoMailing.gettokens api - Additional improvements
Coleman Watts [Tue, 24 Feb 2015 14:54:16 +0000 (09:54 -0500)]
Mailing.gettokens api - Additional improvements

9 years agoMerge pull request #5221 from colemanw/Cleanup
colemanw [Tue, 24 Feb 2015 14:25:12 +0000 (09:25 -0500)]
Merge pull request #5221 from colemanw/Cleanup

Cleanup Mailing.gettokens api and add unit test

9 years agoMerge pull request #5232 from rohankatkar/batch9
Monish Deb [Tue, 24 Feb 2015 11:42:05 +0000 (17:12 +0530)]
Merge pull request #5232 from rohankatkar/batch9

accidental debug removal

9 years agoaccidental debug removal
Web Access [Tue, 24 Feb 2015 10:15:20 +0000 (15:45 +0530)]
accidental debug removal

9 years agoCRM-15792 typo fix
atif-shaikh [Tue, 24 Feb 2015 10:05:15 +0000 (15:35 +0530)]
CRM-15792 typo fix

----------------------------------------
* CRM-15792: Loss of data when creating / updating custom datetime fields through the API
  https://issues.civicrm.org/jira/browse/CRM-15792

9 years agoCRM-15578 - wording improvement.
Dave Greenberg [Tue, 24 Feb 2015 02:52:19 +0000 (18:52 -0800)]
CRM-15578 - wording improvement.

----------------------------------------
* CRM-15578: Implement "New Mailing" + "AB Testing" in Angular
  https://issues.civicrm.org/jira/browse/CRM-15578

9 years agoCRM-15995 - When viewing details from AB test report, set return URL to the AB test...
Tim Otten [Tue, 24 Feb 2015 02:52:00 +0000 (18:52 -0800)]
CRM-15995 - When viewing details from AB test report, set return URL to the AB test's overall report.

9 years agoSupport multi-valued fields in api explorer
Coleman Watts [Tue, 24 Feb 2015 02:29:45 +0000 (21:29 -0500)]
Support multi-valued fields in api explorer

9 years agoCleanup Mailing.gettokens api and add unit test
Coleman Watts [Mon, 23 Feb 2015 22:10:12 +0000 (17:10 -0500)]
Cleanup Mailing.gettokens api and add unit test

9 years agoCRM-15578 - Add button styling and help message to AB Test Results. Add title for...
Dave Greenberg [Tue, 24 Feb 2015 02:14:47 +0000 (18:14 -0800)]
CRM-15578 - Add button styling and help message to AB Test Results. Add title for recipients estimate.

----------------------------------------
* CRM-15578: Implement "New Mailing" + "AB Testing" in Angular
  https://issues.civicrm.org/jira/browse/CRM-15578

9 years agongSanitize - Remove unused module
Tim Otten [Tue, 24 Feb 2015 01:05:44 +0000 (17:05 -0800)]
ngSanitize - Remove unused module

The module is unused. Also, it was inappropriately copied into the "js/"
folder.  (External deps should go through packages or bower.json.)

9 years agoMerge pull request #5220 from totten/master-recip-grptype
Tim Otten [Tue, 24 Feb 2015 01:01:36 +0000 (17:01 -0800)]
Merge pull request #5220 from totten/master-recip-grptype

CRM-15578 - crmMailing recipients - Filter on group_type="Mailing List" instead of visibility

9 years agoMerge pull request #5219 from totten/master-abtest-style
colemanw [Mon, 23 Feb 2015 23:52:05 +0000 (18:52 -0500)]
Merge pull request #5219 from totten/master-abtest-style

CRM-15705 - crmMailingAB - Remove extra styling

9 years agoCRM-15578 - crmMailing recipients - Filter on group_type="Mailing List" instead of...
Tim Otten [Mon, 23 Feb 2015 21:52:36 +0000 (13:52 -0800)]
CRM-15578 - crmMailing recipients - Filter on group_type="Mailing List" instead of visibility

9 years agoFix icon in fatal.tpl
Coleman Watts [Mon, 23 Feb 2015 21:08:01 +0000 (16:08 -0500)]
Fix icon in fatal.tpl

9 years agoCRM-15705 - crmMailingAB - Remove extra styling
Tim Otten [Mon, 23 Feb 2015 20:22:58 +0000 (12:22 -0800)]
CRM-15705 - crmMailingAB - Remove extra styling

The "Message Template" used to have blue background and spacing in all the
UIs.  We removed that in the main crmMailing and crmMailingAB (for
subject/from testing).  This patch removes from crmMailingAB for full-email
testing.

9 years agoMerge pull request #5192 from colemanw/CRM-15988
colemanw [Mon, 23 Feb 2015 18:22:11 +0000 (13:22 -0500)]
Merge pull request #5192 from colemanw/CRM-15988

CRM-15988 - Normalize incoming api entity & action names

9 years agoCRM-15988 - Update generated examples
Coleman Watts [Mon, 23 Feb 2015 16:36:57 +0000 (11:36 -0500)]
CRM-15988 - Update generated examples

9 years agoCRM-15792 QA Fix
atif-shaikh [Mon, 23 Feb 2015 14:17:42 +0000 (19:47 +0530)]
CRM-15792 QA Fix

----------------------------------------
* CRM-15792: Loss of data when creating / updating custom datetime fields through the API
  https://issues.civicrm.org/jira/browse/CRM-15792

9 years agoCRM-15792 fix along with api test
atif-shaikh [Mon, 23 Feb 2015 14:07:45 +0000 (19:37 +0530)]
CRM-15792 fix along with api test

----------------------------------------
* CRM-15792: Loss of data when creating / updating custom datetime fields through the API
  https://issues.civicrm.org/jira/browse/CRM-15792

9 years agoFix to correctly determine the type of a datetime custom field.
Mattias Michaux [Tue, 6 Jan 2015 23:07:43 +0000 (00:07 +0100)]
Fix to correctly determine the type of a datetime custom field.

9 years agomoved upgrade part to a new file
jitendrapurohit [Mon, 23 Feb 2015 11:44:35 +0000 (17:14 +0530)]
moved upgrade part to a new file

9 years agosmarty error fix
jitendrapurohit [Mon, 23 Feb 2015 10:31:33 +0000 (16:01 +0530)]
smarty error fix

9 years ago(CRM-15934) ensure new updates are properly escaped
Jaka Kranjc [Tue, 17 Feb 2015 21:51:23 +0000 (22:51 +0100)]
(CRM-15934) ensure new updates are properly escaped

iow doubly escaped

9 years agofixed regression from 16e3341209f0
Jaka Kranjc [Tue, 17 Feb 2015 21:41:28 +0000 (22:41 +0100)]
fixed regression from 16e3341209f0

9 years agoCRM-15934: more spam patterns
Jaka Kranjc [Sun, 8 Feb 2015 20:38:55 +0000 (21:38 +0100)]
CRM-15934: more spam patterns

for reponses:
5.7.0 Local Policy Violation
5.7.1 Message rejected as spam by Content Filtering.
Client host [IP] blocked using
automatic messages are not accepted by this group
automatically-generated messages are not accepted by this group
550 Denied by policy
Our system has detected that this message
     550-5.7.1 is likely unsolicited mail
End-of-data rejected: Blocked - Your IP [IP] has no corresponding reverse (PTR) address
Sporočila ni bilo mogoče dostaviti zaradi varnostnega pravilnika

9 years agoCRM-15934: a few international Invalid patterns
Jaka Kranjc [Sat, 7 Feb 2015 14:48:22 +0000 (15:48 +0100)]
CRM-15934: a few international Invalid patterns

Italian, Spanish, Slovenian

9 years agoCRM-15934: added a trickier Invalid pattern
Jaka Kranjc [Sat, 7 Feb 2015 14:12:44 +0000 (15:12 +0100)]
CRM-15934: added a trickier Invalid pattern

lots of responses start with "Recipient address rejected" and then provide
a concrete error on which we can categorize. A bunch of them only provide the
email's domain instead of the error, eg.:
Recipient address rejected: planet.si

9 years agoCRM-15934: added more Invalid patterns
Jaka Kranjc [Sat, 7 Feb 2015 14:05:54 +0000 (15:05 +0100)]
CRM-15934: added more Invalid patterns

for responses:
5.1.0 Address rejected
550 <di> recipient rejected
550 Recipient denied
Recipient not found
delivery denied:
     no valid recipient or authentication missing
Message rejected (no valid recipients)
550 Address invalid
Recipient address rejected: address unknown
Recipient address rejected: address invalid
no mailbox by that name is currently available
RESOLVER.ADR.RecipNotFound; not found
Unknown address error
The e-mail address you entered couldn't be found
The email address you specified couldn't be found or is invalid
The recipient's e-mail address was not found
There is no one at this address
Delivery is not allowed to this address
5.2.0 RESOLVER.FWD.NotFound; misconfigured forwarding address
This account is not allowed
Address '<email>' not known here.

9 years agoCRM-15934: more host patterns
Jaka Kranjc [Sat, 7 Feb 2015 11:08:33 +0000 (12:08 +0100)]
CRM-15934: more host patterns

for responses:
The server is not responding. The server may be down or you may be experiencing network problems.
This mail server requires authentication when attempting to send to a non-local e-mail address
SMTP authentication is required
550 authentication required

9 years agoCRM-15934: more relay patterns
Jaka Kranjc [Sat, 7 Feb 2015 10:42:32 +0000 (11:42 +0100)]
CRM-15934: more relay patterns

for responses:
550 unrouteable address
550 Relay denied for
sorry, relaying denied from your location
Relaying denied. Proper authentication required.
We don't handle mail for
we do not relay
is currently not permitted to
     550 relay through this server
Rejected by next-hop MTA
     on relaying, from MTA(smtp:[127.0.0.1]:10025): 530 5.7.0 Must issue a
     STARTTLS command first (in reply to end of DATA command)

9 years agoCRM-15934: more loop patterns
Jaka Kranjc [Sat, 7 Feb 2015 10:04:42 +0000 (11:04 +0100)]
CRM-15934: more loop patterns

for responses like:
mail forwarding loop for
Mail-Loop
Too many recursive forwards

9 years agoCRM-15934: more inactive patterns
Jaka Kranjc [Sat, 7 Feb 2015 09:52:53 +0000 (10:52 +0100)]
CRM-15934: more inactive patterns

for responses:
The email account that you tried to reach is disabled (gmail)
5.2.1 (not accepting messages)
550 User banned

9 years agoCRM-15934: more quota patterns
Jaka Kranjc [Sat, 7 Feb 2015 08:39:28 +0000 (09:39 +0100)]
CRM-15934: more quota patterns

For responses:
Sorry, this user has overdrawn their diskspace quota
user overdrawn his diskspace quota
mail action aborted: exceeded storage allocation
QuotaExceeded
message could not be delivered because the user's mailfolder is full
The recipients inbox is full
recipient doesn't have enough disk space left for it
Mailbox is over the limit
The account is running out of disk space

9 years agoMerge pull request #5209 from davecivicrm/CRM-15958
Dave Greenberg [Mon, 23 Feb 2015 01:51:25 +0000 (17:51 -0800)]
Merge pull request #5209 from davecivicrm/CRM-15958

CRM-15958 - Fix problem where financial_trxn.trxn_id is not being saved ...

9 years agoMerge pull request #5210 from eileenmcnaughton/CRM-15996
Eileen McNaughton [Sat, 21 Feb 2015 20:44:49 +0000 (09:44 +1300)]
Merge pull request #5210 from eileenmcnaughton/CRM-15996

CRM-15966 add repeattransaction api + test making sure line items created

9 years agoCRM-15996 add long comment to completeTransaction explaining the overload
Eileen McNaughton [Sat, 21 Feb 2015 20:21:25 +0000 (09:21 +1300)]
CRM-15996 add long comment to completeTransaction explaining the overload

9 years agotest formatting tidy-up
Eileen McNaughton [Sat, 21 Feb 2015 19:35:15 +0000 (08:35 +1300)]
test formatting tidy-up

9 years agoCRM-15966 add repeattransaction api + test making sure line items created
Eileen McNaughton [Sat, 21 Feb 2015 19:27:52 +0000 (08:27 +1300)]
CRM-15966 add repeattransaction api + test making sure line items created

Conflicts:
tests/phpunit/api/v3/ContributionTest.php

9 years agoCRM-15996 add repeattransaction api & fix baseipn to create line items
Eileen McNaughton [Sat, 21 Feb 2015 17:39:38 +0000 (06:39 +1300)]
CRM-15996 add repeattransaction api & fix baseipn to create line items
Note that there appears to be an issue with the contribution_recur
object not being loaded. But, this seems a better place to fix it
as it is a more direct way of determining if it is a
recurring contribution

9 years agoMerge pull request #5207 from davecivicrm/CMR-14578
Dave Greenberg [Sat, 21 Feb 2015 16:40:10 +0000 (08:40 -0800)]
Merge pull request #5207 from davecivicrm/CMR-14578

CRM-14578 - Provide direct menu access for date preferences screen.

9 years agoCRM-15958 - Fix problem where financial_trxn.trxn_id is not being saved on contributi...
Dave Greenberg [Sat, 21 Feb 2015 02:04:49 +0000 (18:04 -0800)]
CRM-15958 - Fix problem where financial_trxn.trxn_id is not being saved on contribution update.

----------------------------------------
* CRM-15958: Updating a contribution to completed with a new trxn_id writes unjoinable finanical_trxn record
  https://issues.civicrm.org/jira/browse/CRM-15958

9 years agoCRM-14578 - Add upgrade logic and incorporate FK fix for location_type_id
Dave Greenberg [Sat, 21 Feb 2015 01:42:26 +0000 (17:42 -0800)]
CRM-14578 - Add upgrade logic and incorporate FK fix for location_type_id

----------------------------------------
* CRM-14578: Relocate Advanced Date Input Settings to Customize data and screens menu
  https://issues.civicrm.org/jira/browse/CRM-14578

9 years agoCRM-14578 - Provide direct menu access for date preferences screen.
Dave Greenberg [Fri, 20 Feb 2015 23:10:33 +0000 (15:10 -0800)]
CRM-14578 - Provide direct menu access for date preferences screen.

----------------------------------------
* CRM-14578: Relocate Advanced Date Input Settings to Customize data and screens menu
  https://issues.civicrm.org/jira/browse/CRM-14578

9 years agoCRM-15988 - Mass cleanup of api entity names to CamelCase
Coleman Watts [Fri, 20 Feb 2015 03:00:08 +0000 (22:00 -0500)]
CRM-15988 - Mass cleanup of api entity names to CamelCase

9 years agoMerge pull request #5202 from totten/master-civimail-task
Tim Otten [Fri, 20 Feb 2015 20:17:44 +0000 (12:17 -0800)]
Merge pull request #5202 from totten/master-civimail-task

CRM-15801 - CiviMail - Change "Schedule/Send Mailing" task to use Angular UI

9 years agoMerge pull request #5206 from jmcclelland/mailing-location-type-default-null
Tim Otten [Fri, 20 Feb 2015 20:11:23 +0000 (12:11 -0800)]
Merge pull request #5206 from jmcclelland/mailing-location-type-default-null

Mailing location type default null

9 years agoCRM-15361 - foreign key constraint for location type id
CiviCRM Dev User [Fri, 20 Feb 2015 18:14:40 +0000 (13:14 -0500)]
CRM-15361 - foreign key constraint for location type id

9 years agoCRM-15361 - fixing un-related white space problem.
CiviCRM Dev User [Fri, 20 Feb 2015 17:31:13 +0000 (12:31 -0500)]
CRM-15361 - fixing un-related white space problem.

9 years agoMerge pull request #5201 from davecivicrm/CRM-15834
Dave Greenberg [Fri, 20 Feb 2015 17:26:27 +0000 (09:26 -0800)]
Merge pull request #5201 from davecivicrm/CRM-15834

Crm 15834

9 years agoCRM-15801 - crmMailing - Display the "Unsubscribe tracking group" field
Tim Otten [Fri, 20 Feb 2015 04:28:36 +0000 (20:28 -0800)]
CRM-15801 - crmMailing - Display the "Unsubscribe tracking group" field

But only if the recipient list includes a hidden-group /
search-result-group.

9 years agoCRM-15801 - crmMailing - Special formatting for recipients based on searches.
Tim Otten [Fri, 20 Feb 2015 03:50:31 +0000 (19:50 -0800)]
CRM-15801 - crmMailing - Special formatting for recipients based on searches.

9 years agoCRM-15801 - CiviMail - Change "Schedule/Send Mailing" task to use Angular UI.
Tim Otten [Fri, 20 Feb 2015 02:25:57 +0000 (18:25 -0800)]
CRM-15801 - CiviMail - Change "Schedule/Send Mailing" task to use Angular UI.

9 years agoMerge pull request #5197 from totten/master-abtest-unify
Dave Greenberg [Fri, 20 Feb 2015 02:47:24 +0000 (18:47 -0800)]
Merge pull request #5197 from totten/master-abtest-unify

CRM-15995 - crmMailingAB - Unify send and report screens. Cleanup report screen.

9 years agoCRM-15834 - spacing fix
Dave Greenberg [Fri, 20 Feb 2015 02:27:30 +0000 (18:27 -0800)]
CRM-15834 - spacing fix

----------------------------------------
* CRM-15834: Allow end dates of auto-renew memberships to be edited
  https://issues.civicrm.org/jira/browse/CRM-15834

9 years agoCRM-15834 - allow override of auto-renew membership end dates
Dave Greenberg [Fri, 20 Feb 2015 02:24:45 +0000 (18:24 -0800)]
CRM-15834 - allow override of auto-renew membership end dates

----------------------------------------
* CRM-15834: Allow end dates of auto-renew memberships to be edited
  https://issues.civicrm.org/jira/browse/CRM-15834

9 years agoCRM-15996 preliminary tidy up
Eileen McNaughton [Fri, 20 Feb 2015 00:41:26 +0000 (13:41 +1300)]
CRM-15996 preliminary tidy up

9 years agoUpdate Payment.php
Dave Greenberg [Fri, 20 Feb 2015 00:04:02 +0000 (16:04 -0800)]
Update Payment.php

Remove extraneous "$processorInstance = " on line 592.

9 years agoMerge pull request #5187 from mallezie/CRM-15982
Dave Greenberg [Thu, 19 Feb 2015 23:34:38 +0000 (15:34 -0800)]
Merge pull request #5187 from mallezie/CRM-15982

add relationshiptype filter to ajax getcontactrelationships call

9 years agocrmMailingAB - report.html - Disable broken graphs.
Tim Otten [Thu, 19 Feb 2015 23:00:34 +0000 (15:00 -0800)]
crmMailingAB - report.html - Disable broken graphs.

9 years agocrmMailingAB - report.html - Fix reload after submitting final
Tim Otten [Thu, 19 Feb 2015 22:59:04 +0000 (14:59 -0800)]
crmMailingAB - report.html - Fix reload after submitting final

9 years agocrmMailingAB - report.html - Display placeholder column for the final mailing
Tim Otten [Thu, 19 Feb 2015 22:43:45 +0000 (14:43 -0800)]
crmMailingAB - report.html - Display placeholder column for the final mailing

This provides some continuity between the appearance during testing and
after testing. It also emphasizes that there's a gap -- that the user
has not yet made a choice.

9 years agocrmMailingAB - report.html - Padding between sections of the table
Tim Otten [Thu, 19 Feb 2015 22:34:37 +0000 (14:34 -0800)]
crmMailingAB - report.html - Padding between sections of the table

9 years agocrmMailingAB - report.html - Display job info
Tim Otten [Thu, 19 Feb 2015 22:29:29 +0000 (14:29 -0800)]
crmMailingAB - report.html - Display job info

9 years agoCRM-15979 - crmMailingAB - More symmetry between edit and report modes.
Tim Otten [Thu, 19 Feb 2015 22:15:13 +0000 (14:15 -0800)]
CRM-15979 - crmMailingAB - More symmetry between edit and report modes.

The top level file is "main.html" which includes either "edit.html" or
"report.html" depending on whether the test has been submitted.

9 years agocrmMailingAB - report.html - Only link to contact search if user has permission
Tim Otten [Thu, 19 Feb 2015 05:42:52 +0000 (21:42 -0800)]
crmMailingAB - report.html - Only link to contact search if user has permission

9 years agoCRM_Core_Resources - Add API to export permission info
Tim Otten [Thu, 19 Feb 2015 05:37:20 +0000 (21:37 -0800)]
CRM_Core_Resources - Add API to export permission info

9 years agocrmMailingAB - report.html - Include all the major sections from review.html as rows
Tim Otten [Thu, 19 Feb 2015 05:18:20 +0000 (21:18 -0800)]
crmMailingAB - report.html - Include all the major sections from review.html as rows

9 years agocrmMailingAB - report.html - Loop over mailings
Tim Otten [Thu, 19 Feb 2015 04:08:53 +0000 (20:08 -0800)]
crmMailingAB - report.html - Loop over mailings

9 years agocrmMailingAB - Use CSS file
Tim Otten [Thu, 19 Feb 2015 03:54:56 +0000 (19:54 -0800)]
crmMailingAB - Use CSS file

9 years agocrmMailingAB - Hyperlinks for stats. Get stats in a batch.
Tim Otten [Thu, 19 Feb 2015 03:00:49 +0000 (19:00 -0800)]
crmMailingAB - Hyperlinks for stats. Get stats in a batch.

9 years agocrmMailingAB - After submitting, stay on the report screen. Don't redirect to listing.
Tim Otten [Thu, 19 Feb 2015 02:50:58 +0000 (18:50 -0800)]
crmMailingAB - After submitting, stay on the report screen. Don't redirect to listing.

9 years agocrmMailingAB - Suspend autosave while submitting. Reload after submission.
Tim Otten [Thu, 19 Feb 2015 02:49:01 +0000 (18:49 -0800)]
crmMailingAB - Suspend autosave while submitting. Reload after submission.

9 years agocrmMailing, crmMailingAB - Use CrmAutosaveCtrl
Tim Otten [Wed, 18 Feb 2015 19:54:24 +0000 (11:54 -0800)]
crmMailing, crmMailingAB - Use CrmAutosaveCtrl

9 years agocrmAutosave - Rewrite as service/class instead of directive. Expose internal API.
Tim Otten [Wed, 18 Feb 2015 19:52:30 +0000 (11:52 -0800)]
crmAutosave - Rewrite as service/class instead of directive. Expose internal API.

9 years agoCRM-15979 - crmMailingAB - Merge the compose and report URLs
Tim Otten [Wed, 18 Feb 2015 18:15:27 +0000 (10:15 -0800)]
CRM-15979 - crmMailingAB - Merge the compose and report URLs

9 years agoCRM-15988 - Cleanup internal use of entity names
Coleman Watts [Thu, 19 Feb 2015 20:02:05 +0000 (15:02 -0500)]
CRM-15988 - Cleanup internal use of entity names

9 years agoMerge pull request #5196 from totten/master-wizard-ts
Dave Greenberg [Thu, 19 Feb 2015 19:49:34 +0000 (11:49 -0800)]
Merge pull request #5196 from totten/master-wizard-ts

CRM-15705 - crmUiWizard - Label and translate previous/next buttons

9 years agoCRM-15705 - crmUiWizard - Label and translate previous/next buttons
Tim Otten [Thu, 19 Feb 2015 18:23:11 +0000 (10:23 -0800)]
CRM-15705 - crmUiWizard - Label and translate previous/next buttons

9 years agoCRM-15988 - Fix inconsistent handling of api entity names
Coleman Watts [Thu, 19 Feb 2015 15:48:43 +0000 (10:48 -0500)]
CRM-15988 - Fix inconsistent handling of api entity names

9 years agoCRM-15988 - Normalize incoming api entity & action names
Coleman Watts [Wed, 18 Feb 2015 14:52:20 +0000 (09:52 -0500)]
CRM-15988 - Normalize incoming api entity & action names

9 years agoMerge pull request #5193 from totten/master-civimail-footer
Dave Greenberg [Wed, 18 Feb 2015 19:47:37 +0000 (11:47 -0800)]
Merge pull request #5193 from totten/master-civimail-footer

CRM-15578 - Mailing API - Fix bug with resaving mailings

9 years agoCRM-15578 - Mailing API - Fix bug with resaving mailings
Tim Otten [Wed, 18 Feb 2015 18:03:26 +0000 (10:03 -0800)]
CRM-15578 - Mailing API - Fix bug with resaving mailings

The bug manifested as failure to validate the required tokens. When
submitting (resaving with scheduled_date, etal), the BAO's create() function
incorrectly applied defaults and overwrote the value of footer_id (among
others) -- which subsequently caused checkSendable() to fail.

9 years agoMerge pull request #5191 from pratikshad/FixedWebtest3
Kurund Jalmi [Wed, 18 Feb 2015 16:36:36 +0000 (22:06 +0530)]
Merge pull request #5191 from pratikshad/FixedWebtest3

Fixed webtest for member and contact

9 years agoMerge pull request #5190 from JKingsnorth/CRM-15985
colemanw [Wed, 18 Feb 2015 15:40:55 +0000 (10:40 -0500)]
Merge pull request #5190 from JKingsnorth/CRM-15985

CRM-15985 Update debugging page text

9 years agoMerge pull request #5180 from monishdeb/master
colemanw [Wed, 18 Feb 2015 15:14:16 +0000 (10:14 -0500)]
Merge pull request #5180 from monishdeb/master

CRM-15889 fix - Relationship enable/disable through API & the UI - does ...

9 years agoUpdate debugging page text
JKingsnorth [Wed, 18 Feb 2015 09:39:55 +0000 (09:39 +0000)]
Update debugging page text

9 years agoFixed webtest for member and contact
pratikshad [Wed, 18 Feb 2015 09:17:20 +0000 (19:17 +1000)]
Fixed webtest for member and contact

9 years agoUpdate version to 4.6.beta1
CiviCRM [Wed, 18 Feb 2015 08:09:59 +0000 (00:09 -0800)]
Update version to 4.6.beta1

9 years agoMerge pull request #5184 from totten/master-abtest-list
Tim Otten [Wed, 18 Feb 2015 04:46:56 +0000 (20:46 -0800)]
Merge pull request #5184 from totten/master-abtest-list

CRM-15970 - crmMailingAB - Sort & filter. Cleanup metadata.

9 years agoRegen sql/civicrm_generated.mysql
Tim Otten [Wed, 18 Feb 2015 01:28:00 +0000 (17:28 -0800)]
Regen sql/civicrm_generated.mysql

9 years agoCRM-15970 - crmMailingAB - Use new testing_criteria and winner_criteria fields
Tim Otten [Wed, 18 Feb 2015 01:30:09 +0000 (17:30 -0800)]
CRM-15970 - crmMailingAB - Use new testing_criteria and winner_criteria fields