Dave Greenberg [Fri, 27 Feb 2015 00:06:54 +0000 (16:06 -0800)]
Merge pull request #5265 from davecivicrm/CRM-16018
CRM-16018 - Increase column size for membership_block.membership_types t...
Dave Greenberg [Thu, 26 Feb 2015 22:20:12 +0000 (14:20 -0800)]
CRM-16018 - Increase column size for membership_block.membership_types to 1024 to avoid fatal error when large number of membership types.
----------------------------------------
* CRM-16018: DB error when >20 membership types are created
https://issues.civicrm.org/jira/browse/CRM-16018
colemanw [Thu, 26 Feb 2015 21:43:56 +0000 (16:43 -0500)]
Merge pull request #5263 from samuelsov/CRM-15947
Add hook_civicrm_pre / hook_civicrm_post for Campaign
colemanw [Thu, 26 Feb 2015 19:59:43 +0000 (14:59 -0500)]
Merge pull request #5264 from colemanw/CRM-15988
CRM-15988 - Test fixes
samuelsov [Thu, 26 Feb 2015 19:41:17 +0000 (14:41 -0500)]
Fix non standard syntax
samuelsov [Thu, 26 Feb 2015 19:32:31 +0000 (14:32 -0500)]
Fix non standard syntax
Kurund Jalmi [Thu, 26 Feb 2015 18:54:46 +0000 (00:24 +0530)]
Merge pull request #5106 from cividesk/CRM-14974-4.6
Fix for CRM-14974
Coleman Watts [Thu, 26 Feb 2015 17:53:12 +0000 (12:53 -0500)]
CRM-15988 - Test fixes
Monish Deb [Thu, 26 Feb 2015 14:27:12 +0000 (19:57 +0530)]
Merge pull request #5262 from pratikshad/FixedWebtest5
Fixed broken webtest
samuelsov [Thu, 26 Feb 2015 14:11:03 +0000 (09:11 -0500)]
Add hook_civicrm_pre / hook_civicrm_post for Campaign
pratikshad [Thu, 26 Feb 2015 13:09:39 +0000 (18:39 +0530)]
Fixed broken webtest
Tim Otten [Thu, 26 Feb 2015 01:07:42 +0000 (17:07 -0800)]
Merge pull request #5256 from totten/master-composer-lock
composer.lock - Re-add to git
Dave Greenberg [Thu, 26 Feb 2015 01:04:29 +0000 (17:04 -0800)]
Merge pull request #5258 from davecivicrm/CRM-14678
CRM-14678 - includes adding conditional on $contactID not defined and fi...
Dave Greenberg [Thu, 26 Feb 2015 00:28:14 +0000 (16:28 -0800)]
Merge pull request #5204 from monishdeb/CRM-15986
CRM-15986 fix - Fields attached to different entities in JS profile crea...
Dave Greenberg [Thu, 26 Feb 2015 00:00:49 +0000 (16:00 -0800)]
CRM-14678 - includes adding conditional on $contactID not defined and fixes a warning in copyPriceSet due to invalid pass by reference.
----------------------------------------
* CRM-14678: Add "Not you, or want to join/contribute for a different person?" text to contribution pages
https://issues.civicrm.org/jira/browse/CRM-14678
Dave Greenberg [Wed, 25 Feb 2015 23:37:22 +0000 (15:37 -0800)]
CRM-14678 - includes adding conditional on $contactID not defined and fixes a warning in copyPriceSet due to invalid pass by reference.
----------------------------------------
* CRM-14678: Add "Not you, or want to join/contribute for a different person?" text to contribution pages
https://issues.civicrm.org/jira/browse/CRM-14678
Tim Otten [Wed, 25 Feb 2015 22:33:53 +0000 (14:33 -0800)]
Merge branch 'mlutfy-CRM-13584'
Tim Otten [Wed, 25 Feb 2015 22:33:20 +0000 (14:33 -0800)]
install/index.php - Fix warning
Tim Otten [Wed, 25 Feb 2015 22:33:09 +0000 (14:33 -0800)]
Merge branch 'CRM-13584' of https://github.com/mlutfy/civicrm-core into mlutfy-CRM-13584
Dave Greenberg [Wed, 25 Feb 2015 21:48:27 +0000 (13:48 -0800)]
Merge pull request #5233 from monishdeb/CRM-16004
CRM-16004 fixes
Tim Otten [Wed, 25 Feb 2015 21:42:18 +0000 (13:42 -0800)]
composer.lock - Re-add to git
There's some discussion about this on https://github.com/totten/civicrm-core/commit/
6ad46a832b6e3969927014a00d3f303a21828782
colemanw [Wed, 25 Feb 2015 20:52:32 +0000 (15:52 -0500)]
Merge pull request #5254 from colemanw/Profile
Profile api - remove unused code
Coleman Watts [Wed, 25 Feb 2015 19:20:29 +0000 (14:20 -0500)]
Profile api - remove unused code
monishdeb [Wed, 25 Feb 2015 14:24:08 +0000 (19:54 +0530)]
formatting changes
monishdeb [Wed, 25 Feb 2015 14:21:52 +0000 (19:51 +0530)]
formatting changes
Coleman Watts [Wed, 25 Feb 2015 14:21:01 +0000 (09:21 -0500)]
API Explorer minor fix
monishdeb [Wed, 25 Feb 2015 14:20:29 +0000 (19:50 +0530)]
optimization changes
Coleman Watts [Wed, 25 Feb 2015 14:12:20 +0000 (09:12 -0500)]
API Explorer minor fixes
monishdeb [Wed, 25 Feb 2015 13:53:51 +0000 (19:23 +0530)]
minor changes
monishdeb [Wed, 25 Feb 2015 13:22:36 +0000 (18:52 +0530)]
QA fixes
CiviCRM [Wed, 25 Feb 2015 11:14:15 +0000 (03:14 -0800)]
Update version to 4.6.beta2
Kurund Jalmi [Wed, 25 Feb 2015 10:02:08 +0000 (15:32 +0530)]
Merge pull request #5248 from davecivicrm/CRM-15578a
CRM-15578 - suppress hidden groups from Recipients selector.
Monish Deb [Wed, 25 Feb 2015 09:28:45 +0000 (14:58 +0530)]
Merge pull request #5251 from monishdeb/CRM-16001
CRM-16001 fix - Advanced Search by contribution status throws FATAL erro...
Kurund Jalmi [Wed, 25 Feb 2015 08:06:06 +0000 (13:36 +0530)]
Merge pull request #5250 from jitendrapurohit/CRM-15934update
update with `pattern` instead of `id` for CRM-15934
monishdeb [Wed, 25 Feb 2015 05:45:51 +0000 (11:15 +0530)]
Undo CRM-16001 changes
----------------------------------------
* CRM-16001: Advanced Search by contribution status throws FATAL error
https://issues.civicrm.org/jira/browse/CRM-16001
monishdeb [Tue, 24 Feb 2015 11:38:34 +0000 (17:08 +0530)]
CRM-16004 and CRM-16001 fixes
----------------------------------------
* CRM-16004: Participant search link broken on "force" search
https://issues.civicrm.org/jira/browse/CRM-16004
* CRM-16001: Advanced Search by contribution status throws FATAL error
https://issues.civicrm.org/jira/browse/CRM-16001
Kurund Jalmi [Wed, 25 Feb 2015 06:12:08 +0000 (11:42 +0530)]
Merge pull request #5247 from totten/master-dompdf
Use and configure the dompdf provided by composer.
kurund [Wed, 25 Feb 2015 05:59:58 +0000 (11:29 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-25-11-27-40
Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php
monishdeb [Wed, 25 Feb 2015 05:58:56 +0000 (11:28 +0530)]
CRM-16001 fix - Advanced Search by contribution status throws FATAL error
https://issues.civicrm.org/jira/browse/CRM-16001
Kurund Jalmi [Wed, 25 Feb 2015 05:52:08 +0000 (11:22 +0530)]
Merge pull request #5234 from pratikshad/FixedWebtest4
Fixed broken webtest for Event and Gerneric
Kurund Jalmi [Wed, 25 Feb 2015 05:49:35 +0000 (11:19 +0530)]
Merge pull request #5241 from kurund/CRM-15934
fixed generated data for CRM-15934
jitendrapurohit [Wed, 25 Feb 2015 05:32:21 +0000 (11:02 +0530)]
PR update for CRM-15934
colemanw [Wed, 25 Feb 2015 03:04:42 +0000 (22:04 -0500)]
Merge pull request #5242 from colemanw/getstat
Correctly represent getstat action in api explorer and metadata
Coleman Watts [Wed, 25 Feb 2015 03:03:47 +0000 (22:03 -0500)]
Improve api explorer formatting
Coleman Watts [Wed, 25 Feb 2015 02:20:57 +0000 (21:20 -0500)]
Api explorer code tidy - use _.includes method
Dave Greenberg [Wed, 25 Feb 2015 02:09:47 +0000 (18:09 -0800)]
Merge pull request #5236 from kurund/CRM-15993
CRM-15993, added CiviCRM BN code support for PayPal Standard
Dave Greenberg [Wed, 25 Feb 2015 01:48:49 +0000 (17:48 -0800)]
CRM-15578 - suppress hidden groups from Recipients selector.
----------------------------------------
* CRM-15578: Implement "New Mailing" + "AB Testing" in Angular
https://issues.civicrm.org/jira/browse/CRM-15578
Tim Otten [Wed, 25 Feb 2015 01:37:07 +0000 (17:37 -0800)]
CRM-16005 - Use and configure the dompdf provided by composer.
Tim Otten [Wed, 25 Feb 2015 01:26:08 +0000 (17:26 -0800)]
Merge remote-tracking branch 'origin/4.5' into 4.5-master-2015-02-24-17-24-05
Conflicts:
CRM/Batch/Form/Entry.php
CRM/Utils/PDF/Utils.php
Tim Otten [Wed, 25 Feb 2015 01:09:15 +0000 (17:09 -0800)]
Merge pull request #5243 from totten/4.5-dompdf
Use and configure the dompdf provided by composer.
Dave Greenberg [Tue, 24 Feb 2015 23:48:01 +0000 (15:48 -0800)]
Merge pull request #5240 from colemanw/CRM-16002
CRM-16002 - Add is_hidden to default pseudoconstant filters
Dave Greenberg [Tue, 24 Feb 2015 23:38:59 +0000 (15:38 -0800)]
Merge pull request #5237 from totten/master-civimail-forum
CRM-15578 - Filter message templates on is_active=>1
Tim Otten [Tue, 24 Feb 2015 21:52:03 +0000 (13:52 -0800)]
CRM-16005 - Use and configure the dompdf provided by composer.
Coleman Watts [Tue, 24 Feb 2015 22:03:40 +0000 (17:03 -0500)]
Correctly represent getstat action in api explorer and metadata
kurund [Tue, 24 Feb 2015 20:44:08 +0000 (02:14 +0530)]
fixed generated data for CRM-15934
----------------------------------------
* CRM-15934: Many SMTP responses missing, resulting in a flood of Syntax bounces
https://issues.civicrm.org/jira/browse/CRM-15934
Coleman Watts [Tue, 24 Feb 2015 20:43:32 +0000 (15:43 -0500)]
CRM-16002 - Add is_hidden to default pseudoconstant filters
colemanw [Tue, 24 Feb 2015 19:54:53 +0000 (14:54 -0500)]
Merge pull request #5239 from colemanw/ApiExplorer
ApiExplorer - workaround ambiguity of = operator
Coleman Watts [Tue, 24 Feb 2015 19:34:50 +0000 (14:34 -0500)]
ApiExplorer - workaround ambiguity of = operator
kurund [Tue, 24 Feb 2015 19:09:43 +0000 (00:39 +0530)]
CRM-15993, also handle recurring paypal express
----------------------------------------
* CRM-15993: Add CiviCRM BN code to all PayPal methods for partner program tracking
https://issues.civicrm.org/jira/browse/CRM-15993
Tim Otten [Tue, 24 Feb 2015 18:50:20 +0000 (10:50 -0800)]
CRM_Mailing_Info - Remove dead code
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
Tim Otten [Tue, 24 Feb 2015 18:47:59 +0000 (10:47 -0800)]
CRM-15578 - Filter message templates on is_active=>1
Kurund Jalmi [Tue, 24 Feb 2015 18:45:01 +0000 (00:15 +0530)]
Merge pull request #5216 from atif-shaikh/CRM-15792
Crm 15792
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
kurund [Tue, 24 Feb 2015 18:36:36 +0000 (00:06 +0530)]
CRM-15993, added CiviCRM BN code support for PayPal Standard
----------------------------------------
* CRM-15993: Add CiviCRM BN code to all PayPal methods for partner program tracking
https://issues.civicrm.org/jira/browse/CRM-15993
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.
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 ...
kurund [Tue, 24 Feb 2015 14:59:57 +0000 (20:29 +0530)]
CRM-15993, added CiviCRM BN code and notice fixes
----------------------------------------
* CRM-15993: Add CiviCRM BN code to all PayPal methods for partner program tracking
https://issues.civicrm.org/jira/browse/CRM-15993
Coleman Watts [Tue, 24 Feb 2015 14:54:16 +0000 (09:54 -0500)]
Mailing.gettokens api - Additional improvements
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
Monish Deb [Tue, 24 Feb 2015 11:42:05 +0000 (17:12 +0530)]
Merge pull request #5232 from rohankatkar/batch9
accidental debug removal
Web Access [Tue, 24 Feb 2015 10:15:20 +0000 (15:45 +0530)]
accidental debug removal
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
Monish Deb [Tue, 24 Feb 2015 09:49:43 +0000 (15:19 +0530)]
Merge pull request #5215 from pratikshad/CRM15916-4.5
CRM-15916 Fixed issue of membership renewal on batch data entry
pratikshad [Tue, 24 Feb 2015 08:59:23 +0000 (18:59 +1000)]
Fixed broken webtest for Event and Gerneric
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
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.
Coleman Watts [Tue, 24 Feb 2015 02:29:45 +0000 (21:29 -0500)]
Support multi-valued fields in api explorer
Coleman Watts [Mon, 23 Feb 2015 22:10:12 +0000 (17:10 -0500)]
Cleanup Mailing.gettokens api and add unit test
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
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.)
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
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
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
Mathieu Lutfy [Mon, 23 Feb 2015 21:20:32 +0000 (16:20 -0500)]
CRM-13584: remove the set_include_path() from the installer, since ClassLoader takes care of that.
Coleman Watts [Mon, 23 Feb 2015 21:08:01 +0000 (16:08 -0500)]
Fix icon in fatal.tpl
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.
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
Coleman Watts [Mon, 23 Feb 2015 16:36:57 +0000 (11:36 -0500)]
CRM-15988 - Update generated examples
Mathieu Lutfy [Mon, 23 Feb 2015 17:53:31 +0000 (12:53 -0500)]
CRM-13584: code style fix, and isset() fix.
Mathieu Lutfy [Mon, 23 Feb 2015 16:17:14 +0000 (11:17 -0500)]
CRM-13584: installer localisation: added more ts() calls, minor tweaks.
Mathieu Lutfy [Mon, 23 Feb 2015 15:54:00 +0000 (10:54 -0500)]
install/index.php: set civicrm_default_error_scope to NULL so that if there is an SQL error during install, it gets print_r(), instead of using Smarty templates to display an error (Smarty will not yet have been initialized).
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
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
Mattias Michaux [Tue, 6 Jan 2015 23:07:43 +0000 (00:07 +0100)]
Fix to correctly determine the type of a datetime custom field.
jitendrapurohit [Mon, 23 Feb 2015 11:44:35 +0000 (17:14 +0530)]
moved upgrade part to a new file
jitendrapurohit [Mon, 23 Feb 2015 10:31:33 +0000 (16:01 +0530)]
smarty error fix
Jaka Kranjc [Tue, 17 Feb 2015 21:51:23 +0000 (22:51 +0100)]
(CRM-15934) ensure new updates are properly escaped
iow doubly escaped
Jaka Kranjc [Tue, 17 Feb 2015 21:41:28 +0000 (22:41 +0100)]
fixed regression from
16e3341209f0
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
projects / civicrm-core.git / log