colemanw [Tue, 30 Dec 2014 15:52:03 +0000 (10:52 -0500)]
Merge pull request #4806 from civicrm/4.5
Merge branch 4.5 into master
colemanw [Tue, 30 Dec 2014 15:42:54 +0000 (10:42 -0500)]
Merge pull request #4805 from colemanw/CRM-15766
CRM-15766 - Fix settings form wrongly adding everything to config
Coleman Watts [Tue, 30 Dec 2014 15:12:36 +0000 (10:12 -0500)]
CRM-15766 - Fix settings form wrongly adding everything to config
Monish Deb [Tue, 30 Dec 2014 12:35:52 +0000 (18:05 +0530)]
Merge pull request #4790 from mattrenner/CRM-15763
CRM-15763 - Payment Express has deprecated SSLv3
Yashodha Chaku [Tue, 30 Dec 2014 07:56:23 +0000 (13:26 +0530)]
Merge pull request #4800 from jitendrapurohit/CRM-15765upgradechanges
upgrade changes for CRM-15765
Monish Deb [Tue, 30 Dec 2014 07:11:53 +0000 (12:41 +0530)]
Merge pull request #4801 from rohankatkar/Webtests
Webtests fix for Reports
jitendrapurohit [Tue, 30 Dec 2014 06:55:52 +0000 (12:25 +0530)]
upgrade changes for CRM-15765
Rohan Katkar [Tue, 30 Dec 2014 06:55:42 +0000 (12:25 +0530)]
Webtests fix for Reports
Yashodha Chaku [Tue, 30 Dec 2014 06:27:28 +0000 (11:57 +0530)]
Merge pull request #4794 from civicrm/CRM-15740
CRM-15740 : increase size for url
Yashodha Chaku [Tue, 30 Dec 2014 05:33:29 +0000 (11:03 +0530)]
Merge pull request #4793 from jsnyder83/master
Added missing Indonesian provinces and revised outdated names
Yashodha Chaku [Tue, 30 Dec 2014 02:24:39 +0000 (07:54 +0530)]
Merge pull request #4796 from jitendrapurohit/webtest4.6
webtest fixes 4.6
colemanw [Tue, 30 Dec 2014 01:57:01 +0000 (20:57 -0500)]
Merge pull request #4758 from colemanw/CRM-13672
CRM-13672 - Add alerts for security releases
Coleman Watts [Wed, 24 Dec 2014 01:00:46 +0000 (20:00 -0500)]
CRM-13672 - Add unit test coverage for CRM_Utils_VersionCheck
Coleman Watts [Tue, 23 Dec 2014 00:48:34 +0000 (19:48 -0500)]
CRM-13672 - Run regen to add new settings to schema
Coleman Watts [Sat, 20 Dec 2014 19:47:04 +0000 (14:47 -0500)]
CRM-13672 - Add option to suppress current update alerts
Coleman Watts [Sat, 20 Dec 2014 02:54:28 +0000 (21:54 -0500)]
CRM-13672 - Add alerts for security releases
Support the new json output from latest.civicrm.org and display security alerts.
Also adds finer-grained control over how version alerts are displayed.
Coleman Watts [Fri, 19 Dec 2014 19:17:11 +0000 (14:17 -0500)]
Code/comment cleanup
kurund [Mon, 29 Dec 2014 19:13:42 +0000 (00:43 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-30-00-43-32
Tim Otten [Mon, 29 Dec 2014 16:43:02 +0000 (10:43 -0600)]
Merge pull request #4789 from totten/master-test-tx
tests/phpunit/api/v3 - Call useTransaction() where easy. Remove pointless get_info()/construct().
Tim Otten [Mon, 29 Dec 2014 16:41:22 +0000 (10:41 -0600)]
Merge pull request #4797 from totten/master-cs
Code style
Tim Otten [Mon, 29 Dec 2014 15:24:15 +0000 (07:24 -0800)]
Civi/API - Code style
Tim Otten [Mon, 29 Dec 2014 02:49:16 +0000 (18:49 -0800)]
CRM/Extension - Code style
jsnyder83 [Mon, 29 Dec 2014 13:54:41 +0000 (20:54 +0700)]
deleted duplicate lines from failed sync issue
jsnyder83 [Mon, 29 Dec 2014 13:31:03 +0000 (20:31 +0700)]
Merge remote-tracking branch 'origin/master'
Conflicts:
xml/templates/civicrm_state_province.tpl
jsnyder83 [Mon, 29 Dec 2014 13:28:18 +0000 (20:28 +0700)]
fixed syntax error on line 3918, (missing comma)
jitendrapurohit [Mon, 29 Dec 2014 13:27:42 +0000 (18:57 +0530)]
webtest fixes 4.6
yashodha [Mon, 29 Dec 2014 12:52:43 +0000 (18:22 +0530)]
CRM-15740 : increase size for url
----------------------------------------
* CRM-15740: Really long URLs cause SQL issue in a trackable mass mail
https://issues.civicrm.org/jira/browse/CRM-15740
jsnyder83 [Mon, 29 Dec 2014 11:36:24 +0000 (18:36 +0700)]
Update civicrm_state_province.tpl
correcting Indonesian province abbreviations, adding Kalimantan Utara
jsnyder83 [Mon, 29 Dec 2014 11:30:55 +0000 (18:30 +0700)]
Updating Indonesian Provinces - added Kalimantan Utara, updated abbreviations for a few incorrect entries
Monish Deb [Mon, 29 Dec 2014 10:42:59 +0000 (16:12 +0530)]
Merge pull request #4785 from jitendrapurohit/CRM-15735
CRM-15735 Update payment status for pay-later membership renewal ignores...
Monish Deb [Mon, 29 Dec 2014 10:41:47 +0000 (16:11 +0530)]
Merge pull request #4726 from atif-shaikh/CRM-5039
CRM-5039 - Events don't always limit registrations to "max participants"...
jsnyder83 [Mon, 29 Dec 2014 06:55:55 +0000 (13:55 +0700)]
Added missing Indonesian provinces and revised outdated names
Yashodha Chaku [Mon, 29 Dec 2014 06:36:21 +0000 (12:06 +0530)]
Merge pull request #4779 from pradpnayak/CRM-15758
--CRM-15758, added code to invoke pre and post hook
Tim Otten [Mon, 29 Dec 2014 02:25:09 +0000 (18:25 -0800)]
CRM/Queue - Code style
Matt Renner [Sun, 28 Dec 2014 08:09:07 +0000 (21:09 +1300)]
CRM-15763 - Payment Express has deprecated SSLv3
Payment Express (DPS) no longer supports SSLv3 (3), so suggest this is adjusted to default (0) which will allow curl to auto-negotiate to use a compatible version of TLS
Kurund Jalmi [Sat, 27 Dec 2014 18:04:33 +0000 (23:34 +0530)]
Merge pull request #4788 from kurund/generated-data
fixed generated data
kurund [Sat, 27 Dec 2014 13:54:54 +0000 (19:24 +0530)]
fixed generated data
Kurund Jalmi [Fri, 26 Dec 2014 14:50:02 +0000 (20:20 +0530)]
Merge pull request #4787 from rohankatkar/Webtests
Webtest fix
Yashodha Chaku [Fri, 26 Dec 2014 14:33:16 +0000 (20:03 +0530)]
Merge pull request #4786 from rohankatkar/CRM_15757
CRM-15757 Notices fix
Rohan Katkar [Fri, 26 Dec 2014 13:35:00 +0000 (19:05 +0530)]
Webtest fix
Rohan Katkar [Fri, 26 Dec 2014 13:03:17 +0000 (18:33 +0530)]
CRM-15757 Notices fix
jitendrapurohit [Fri, 26 Dec 2014 11:37:55 +0000 (17:07 +0530)]
CRM-15735 Update payment status for pay-later membership renewal ignores Received date
Yashodha Chaku [Fri, 26 Dec 2014 10:58:24 +0000 (16:28 +0530)]
Merge pull request #4783 from pradpnayak/CRM-15760
-- changed size to 255 from 64 for civicrm_action_schedule.entity_value,...
Monish Deb [Fri, 26 Dec 2014 07:13:13 +0000 (12:43 +0530)]
Merge pull request #4784 from atif-shaikh/CRM-15718
CRM-15718 - Bulk sms: Check for do not send sms instead of is opt out
atif-shaikh [Fri, 26 Dec 2014 05:42:32 +0000 (11:12 +0530)]
CRM-15718 - Bulk sms: Check for do not send sms instead of is opt out
https://issues.civicrm.org/jira/browse/CRM-15718
Kurund Jalmi [Fri, 26 Dec 2014 05:03:59 +0000 (10:33 +0530)]
Merge pull request #4771 from pratikshad/CRM-15409
CRM-15409 fix issue of printpdf button on popup and spelling mistecks of...
Pradeep Nayak [Thu, 25 Dec 2014 09:06:03 +0000 (14:36 +0530)]
-- changed size to 255 from 64 for civicrm_action_schedule.entity_value, CRM-15760
----------------------------------------
* CRM-15760: Change size of civicrm_action_schedule.entity_value to 255 from 64
https://issues.civicrm.org/jira/browse/CRM-15760
Yashodha Chaku [Wed, 24 Dec 2014 13:05:49 +0000 (18:35 +0530)]
Merge pull request #4781 from civicrm/CRM-15732
CRM-15732 : fix looking up deleted 'On behalf' orgs
Monish Deb [Wed, 24 Dec 2014 12:09:25 +0000 (17:39 +0530)]
Merge pull request #4782 from atif-shaikh/CRM-15754
Crm 15754
atif-shaikh [Wed, 24 Dec 2014 11:55:59 +0000 (17:25 +0530)]
CRM-15754 - Custom participant statuses print their ID in event confirmation email
https://issues.civicrm.org/jira/browse/CRM-15754
JKingsnorth [Tue, 23 Dec 2014 10:46:16 +0000 (10:46 +0000)]
CRM-15754 Use participant status label
yashodha [Wed, 24 Dec 2014 09:12:57 +0000 (14:42 +0530)]
CRM-15732 : fix looking up deleted 'On behalf' orgs
----------------------------------------
* CRM-15732: Donations with an On Behalf Of an organization profile dedupes with contacts in the trash
https://issues.civicrm.org/jira/browse/CRM-15732
pratikshad [Wed, 24 Dec 2014 06:09:01 +0000 (11:39 +0530)]
CRM-15409 Changes into membership.tpl file and regenerated mysql file
----------------------------------------
* CRM-15409: Add Sales Tax and Invoicing support
https://issues.civicrm.org/jira/browse/CRM-15409
Pradeep Nayak [Tue, 23 Dec 2014 22:23:11 +0000 (03:53 +0530)]
--CRM-15758, added code to invoke pre and post hook
Kurund Jalmi [Tue, 23 Dec 2014 19:28:57 +0000 (00:58 +0530)]
Merge pull request #4772 from jitendrapurohit/CRM-15750
Fix for CRM-15750 advanced search using relationship and smart group pro...
Kurund Jalmi [Tue, 23 Dec 2014 19:27:59 +0000 (00:57 +0530)]
Merge pull request #4773 from civicrm/version-fix
fix version in header
Kurund Jalmi [Tue, 23 Dec 2014 19:27:33 +0000 (00:57 +0530)]
Merge pull request #4776 from webaccess/master
Webtests fixes for CRM-15701
Kurund Jalmi [Tue, 23 Dec 2014 19:20:45 +0000 (00:50 +0530)]
Merge pull request #4777 from civicrm/revert-4766-CRM-15714
Revert "CRM-15714 CiviContribute convert validateCreditCard to validateP...
Kurund Jalmi [Tue, 23 Dec 2014 19:20:33 +0000 (00:50 +0530)]
Revert "CRM-15714 CiviContribute convert validateCreditCard to validatePaymentInstrument"
Kurund Jalmi [Tue, 23 Dec 2014 14:42:09 +0000 (20:12 +0530)]
Merge pull request #4 from manishmore/CRM-15701-QA-fixes
Webtests fixes for CRM-15701 fix
moremanish [Tue, 23 Dec 2014 14:37:30 +0000 (20:07 +0530)]
Webtests fixes for CRM-15701 fix
Monish Deb [Tue, 23 Dec 2014 13:53:15 +0000 (19:23 +0530)]
Merge pull request #4774 from rohankatkar/Webtests
Fix for webtests
Monish Deb [Tue, 23 Dec 2014 13:49:59 +0000 (19:19 +0530)]
Merge pull request #4775 from jitendrapurohit/CRM-15743
comment for CRM 15743
jitendrapurohit [Tue, 23 Dec 2014 13:48:47 +0000 (19:18 +0530)]
CRM-15743 comment
jitendrapurohit [Tue, 23 Dec 2014 13:30:54 +0000 (19:00 +0530)]
added comment for CRM-15743 modification
Rohan Katkar [Tue, 23 Dec 2014 13:24:28 +0000 (18:54 +0530)]
Fix for webtests
jitendrapurohit [Tue, 23 Dec 2014 13:15:56 +0000 (18:45 +0530)]
Fix for CRM-15750 advanced search using relationship and smart group produces backtrace
yashodha [Tue, 23 Dec 2014 13:13:11 +0000 (18:43 +0530)]
fix version in header
pratikshad [Tue, 23 Dec 2014 12:58:36 +0000 (18:28 +0530)]
CRM-15409 fix issue of printpdf button on popup and spelling mistecks of invoice template and also added new feature into offline membership page to show totaltaxamount with their tax term
----------------------------------------
* CRM-15409: Add Sales Tax and Invoicing support
https://issues.civicrm.org/jira/browse/CRM-15409
Monish Deb [Tue, 23 Dec 2014 11:38:45 +0000 (17:08 +0530)]
Merge pull request #4764 from rohankatkar/CRM-15615
Fix for CRM-15615
Kurund Jalmi [Tue, 23 Dec 2014 09:50:12 +0000 (15:20 +0530)]
Merge pull request #4768 from rohankatkar/CRM-10331Fix
Fix for CRM-10331 group_id parameter ignored in API for GroupContact
Kurund Jalmi [Tue, 23 Dec 2014 09:42:27 +0000 (15:12 +0530)]
Merge pull request #4766 from adixon/CRM-15714
CRM-15714 CiviContribute convert validateCreditCard to validatePaymentInstrument
Rohan Katkar [Tue, 23 Dec 2014 06:38:39 +0000 (12:08 +0530)]
Fix for CRM-10331 group_id parameter ignored in API for GroupContact
Monish Deb [Tue, 23 Dec 2014 05:42:26 +0000 (11:12 +0530)]
Merge pull request #4737 from eileenmcnaughton/master
CRM-14246 - event on behalf - alter function that assigns events to cope...
Yashodha Chaku [Tue, 23 Dec 2014 04:56:40 +0000 (10:26 +0530)]
Merge pull request #4762 from yashodha/CRM-15744
CRM-15744- fix wrong event link for pcp on dashboard
Dave Greenberg [Tue, 23 Dec 2014 00:59:11 +0000 (16:59 -0800)]
Merge pull request #4761 from atif-shaikh/CRM-15743
CRM-15743 - Online contributions: Pay Later flag is not being passed to ...
Tim Otten [Mon, 22 Dec 2014 23:05:37 +0000 (15:05 -0800)]
api_v3_ActivityTypeTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:37 +0000 (15:05 -0800)]
api_v3_APIWrapperTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:37 +0000 (15:05 -0800)]
api_v3_APITest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:37 +0000 (15:05 -0800)]
api_v3_APIStandardsTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:37 +0000 (15:05 -0800)]
api_v3_CampaignTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:37 +0000 (15:05 -0800)]
api_v3_ContactTypeTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_CustomSearchTest - useTransaction()
Dave Greenberg [Mon, 22 Dec 2014 23:22:40 +0000 (15:22 -0800)]
Merge pull request #4763 from jitendrapurohit/CRM-15557-Fix
CRM-15557 fix
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_EmailTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_DomainTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_LocBlockTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_MailingGroupTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_MailSettingsTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_OptionGroupTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_OptionValueTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_ReportTemplateTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 22:38:13 +0000 (14:38 -0800)]
api_v3_TagTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 23:05:38 +0000 (15:05 -0800)]
api_v3_UtilsTest - useTransaction()
Tim Otten [Mon, 22 Dec 2014 22:30:00 +0000 (14:30 -0800)]
tests/ - Remove pointless __construct() functions
Tim Otten [Mon, 22 Dec 2014 22:26:48 +0000 (14:26 -0800)]
tests/ - Remove get_info()
I believe that get_info() originated circa Civi v2 when tests were written
with SimpleTest. In PHPUnit, these functions serve no purpose and have
been created inconsistently.
Tim Otten [Mon, 22 Dec 2014 21:51:53 +0000 (13:51 -0800)]
api_v3_ActivityContactTest - Change quickCleanup() to useTransaction()
Tim Otten [Mon, 22 Dec 2014 21:51:41 +0000 (13:51 -0800)]
api_v3_ActionScheduleTest - Change quickCleanup() to useTransaction()
Tim Otten [Mon, 22 Dec 2014 21:44:17 +0000 (14:44 -0700)]
api_v3_BatchTest - Change quickCleanup() to useTransaction()
Tim Otten [Mon, 22 Dec 2014 21:37:42 +0000 (13:37 -0800)]
api_v3_ContributionRecurTest - Change quickCleanup() to useTransaction()
projects / civicrm-core.git / log