Tim Otten [Tue, 7 Apr 2015 23:24:13 +0000 (16:24 -0700)]
Merge pull request #5552 from totten/master-extcache-domain
CRM-16138 - CRM_Extensions_System - Include domain_id in cache paths
kurund [Mon, 6 Apr 2015 12:38:19 +0000 (18:08 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-06-18-08-12
kurund [Mon, 6 Apr 2015 12:36:06 +0000 (18:06 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-06-18-05-56
Monish Deb [Mon, 6 Apr 2015 10:04:45 +0000 (15:34 +0530)]
Merge pull request #5568 from jitendrapurohit/webtest46fixes
optimised use of selecting date from multiselect box
Kurund Jalmi [Mon, 6 Apr 2015 07:27:49 +0000 (12:57 +0530)]
Merge pull request #5564 from eileenmcnaughton/4.6
Comment additions & fixes
jitendrapurohit [Mon, 6 Apr 2015 05:51:32 +0000 (11:21 +0530)]
optimised use of selecting date from multiselect box
colemanw [Mon, 6 Apr 2015 00:29:22 +0000 (20:29 -0400)]
Merge pull request #5563 from colemanw/jsResize
Cleanup location of summary-specific js
colemanw [Sat, 4 Apr 2015 23:54:02 +0000 (19:54 -0400)]
Merge pull request #5567 from colemanw/CRM-16236
CRM-16236 - Fix survey api to include petition activities
Coleman Watts [Sat, 4 Apr 2015 17:50:59 +0000 (13:50 -0400)]
CRM-16236 - Fix survey api to include petition activities
Eileen McNaughton [Sat, 4 Apr 2015 06:37:42 +0000 (19:37 +1300)]
phpcs required fix - return false rather than void
Eileen McNaughton [Sat, 4 Apr 2015 04:39:10 +0000 (17:39 +1300)]
Comment additions & fixes
Coleman Watts [Sat, 4 Apr 2015 02:07:54 +0000 (22:07 -0400)]
Js lint fix
Coleman Watts [Sat, 4 Apr 2015 01:22:05 +0000 (21:22 -0400)]
Cleanup location of summary-specific js
Coleman Watts [Sat, 4 Apr 2015 01:13:03 +0000 (21:13 -0400)]
Remove deprecated crmAccordions from Common.js
Coleman Watts [Sat, 4 Apr 2015 01:09:18 +0000 (21:09 -0400)]
Common.js - whitespace fixes
colemanw [Sat, 4 Apr 2015 00:57:42 +0000 (20:57 -0400)]
Merge pull request #5562 from colemanw/CRM-16233
CRM-16233 - Set default for advanced search operator
Coleman Watts [Sat, 4 Apr 2015 00:56:46 +0000 (20:56 -0400)]
CRM-16233 - Set default for advanced search operator
Eileen McNaughton [Sat, 4 Apr 2015 00:08:32 +0000 (13:08 +1300)]
Merge pull request #5554 from eileenmcnaughton/CRM-16255
CRM-16255 pass contact_id to payment processor from backoffice participa...
Eileen McNaughton [Sat, 4 Apr 2015 00:06:18 +0000 (13:06 +1300)]
Merge pull request #5556 from eileenmcnaughton/CRM-16224
CRM-16224 add getter & setter for PaymentProcessor
Eileen McNaughton [Sat, 4 Apr 2015 00:03:17 +0000 (13:03 +1300)]
Merge pull request #5555 from eileenmcnaughton/master
CRM-16226 change an instance of calling protected method to doDirectPaym...
CiviCRM [Fri, 3 Apr 2015 15:04:05 +0000 (08:04 -0700)]
Update version to 4.6.1
Kurund Jalmi [Fri, 3 Apr 2015 14:30:36 +0000 (20:00 +0530)]
Merge pull request #5558 from atif-shaikh/4.6UpgradeFix
4.6 Upgrade Error Fix
Kurund Jalmi [Fri, 3 Apr 2015 13:34:20 +0000 (19:04 +0530)]
Update CONTRIBUTORS.txt
atif-shaikh [Fri, 3 Apr 2015 13:15:40 +0000 (18:45 +0530)]
Improvement
Kurund Jalmi [Fri, 3 Apr 2015 12:29:21 +0000 (17:59 +0530)]
Merge pull request #5557 from monishdeb/4.6
CRM-16211 fix - 'Activity Subject' not filled in when creating PDF lette...
atif-shaikh [Fri, 3 Apr 2015 12:23:19 +0000 (17:53 +0530)]
4.6 Upgrade Error Fix
colemanw [Fri, 3 Apr 2015 11:58:47 +0000 (07:58 -0400)]
Merge pull request #5553 from colemanw/CRM-16164
CRM-16164 - Fix adding fields when reusing saved mapping
monishdeb [Fri, 3 Apr 2015 10:59:41 +0000 (16:29 +0530)]
CRM-16211 fix - 'Activity Subject' not filled in when creating PDF letters from template
https://issues.civicrm.org/jira/browse/CRM-16211
Eileen McNaughton [Fri, 3 Apr 2015 03:57:33 +0000 (16:57 +1300)]
comment fixes
Eileen McNaughton [Fri, 3 Apr 2015 03:52:45 +0000 (16:52 +1300)]
CRM-16255 pass contact_id to payment processor from backoffice participant form
Eileen McNaughton [Fri, 3 Apr 2015 03:51:28 +0000 (16:51 +1300)]
minor preliminary cleanup
Eileen McNaughton [Fri, 3 Apr 2015 03:44:59 +0000 (16:44 +1300)]
CRM-16224 add getter & setter for PaymentProcessor
Eileen McNaughton [Fri, 3 Apr 2015 03:34:16 +0000 (16:34 +1300)]
CRM-16226 change an instance of calling protected method to doDirectPayment
colemanw [Fri, 3 Apr 2015 01:50:47 +0000 (21:50 -0400)]
Merge pull request #5526 from mlutfy/4.6-crm6131
CRM-6131: Allow to override the dedupe rule used when submitting a form (useful for buildForm hooks).
colemanw [Fri, 3 Apr 2015 01:48:45 +0000 (21:48 -0400)]
Merge pull request #5536 from totten/4.5-httpclient
4.5
colemanw [Fri, 3 Apr 2015 01:36:07 +0000 (21:36 -0400)]
Merge pull request #5548 from rohankatkar/upgradeFix
Upgrade fix for 4.6.0 failure
Coleman Watts [Fri, 3 Apr 2015 01:34:25 +0000 (21:34 -0400)]
Fix icon for export done button
Coleman Watts [Fri, 3 Apr 2015 01:31:27 +0000 (21:31 -0400)]
CRM-16164 - Fix adding fields when reusing saved mapping
Coleman Watts [Fri, 3 Apr 2015 01:30:54 +0000 (21:30 -0400)]
Cleanup extra require
Tim Otten [Fri, 3 Apr 2015 00:09:53 +0000 (17:09 -0700)]
CRM-16138 - CRM_Extensions_System - Include domain_id in cache paths
The extension cache (returned by CRM_Extension_System::getCache) is already
keyed off extensionDir, extensionUrl, civicrm_root, and several others.
This patch adds domain_id to the list.
The patch is derived from agileware's patch from 4.4. Notably, the original
patch only influenced mapper (not the other caches).
I don't really think this patch should be necessary. Firstly, there are
already many variables factored into the cache-key for 4.6+ (CRM-15788) --
one (or more) should get tripped in "single-database, multiple-codebase"
architecture. Secondly, the extension list is not innately domain-based.
However, there are a dizzying range of variations on
multi-site/multi-domain, and I may not have a full appreciation for the one
that led to agileware's patch. And (theoertically) there's no big downside
to including domain_id as part of the cache.
Dave Greenberg [Thu, 2 Apr 2015 23:36:54 +0000 (16:36 -0700)]
Merge pull request #5551 from davecivicrm/contributors46
Update CONTRIBUTORS.txt for 4.6 stable.
Dave Greenberg [Thu, 2 Apr 2015 23:34:55 +0000 (16:34 -0700)]
Update CONTRIBUTORS.txt for 4.6 stable.
colemanw [Thu, 2 Apr 2015 23:22:59 +0000 (19:22 -0400)]
Merge pull request #5550 from civicrm/4.5
Merge branch 4.5 into 4.6
colemanw [Thu, 2 Apr 2015 21:41:27 +0000 (17:41 -0400)]
Merge pull request #5549 from colemanw/CRM-16220
CRM-16220 - Allow non-admins to get & create tags
Coleman Watts [Thu, 2 Apr 2015 15:36:31 +0000 (11:36 -0400)]
CRM-16220 - Allow non-admins to get & create tags
Coleman Watts [Thu, 2 Apr 2015 15:18:00 +0000 (11:18 -0400)]
Webtest comment fix
Kurund Jalmi [Thu, 2 Apr 2015 13:31:42 +0000 (19:01 +0530)]
Merge pull request #5544 from rohankatkar/CRM-16216
Error on submitting New Individual form using "Use another contact's address" option
Kurund Jalmi [Thu, 2 Apr 2015 13:31:16 +0000 (19:01 +0530)]
Merge pull request #5543 from atif-shaikh/CRM-16055WebtestFix
CRM-16055 and WebtestFix
Kurund Jalmi [Thu, 2 Apr 2015 13:30:48 +0000 (19:00 +0530)]
Merge pull request #5542 from atif-shaikh/WebtestFix
WebtestFix
Kurund Jalmi [Thu, 2 Apr 2015 13:30:36 +0000 (19:00 +0530)]
Merge pull request #5545 from rohankatkar/webtest_4.6
Webtest fix for mailing
Kurund Jalmi [Thu, 2 Apr 2015 13:30:24 +0000 (19:00 +0530)]
Merge pull request #5546 from jitendrapurohit/webtestfixes46
webtest fixes 46
Web Access [Thu, 2 Apr 2015 13:22:14 +0000 (18:52 +0530)]
Upgrade Fix
Web Access [Thu, 2 Apr 2015 11:11:02 +0000 (16:41 +0530)]
Webtest fix for mailing
jitendrapurohit [Thu, 2 Apr 2015 11:07:38 +0000 (16:37 +0530)]
webtest fixes 46
Web Access [Thu, 2 Apr 2015 10:29:30 +0000 (15:59 +0530)]
Fix for CRM-16216
atif-shaikh [Thu, 2 Apr 2015 09:58:09 +0000 (15:28 +0530)]
CRM-16055WebtestFix
atif-shaikh [Thu, 2 Apr 2015 09:52:32 +0000 (15:22 +0530)]
WebtestFix
Kurund Jalmi [Thu, 2 Apr 2015 08:56:59 +0000 (14:26 +0530)]
Merge pull request #5534 from davecivicrm/CRM-15197
CRM-15197 - WebTest_Member_InheritedMembershipTest fixes.
Kurund Jalmi [Thu, 2 Apr 2015 08:55:54 +0000 (14:25 +0530)]
Merge pull request #5541 from totten/4.6-webtest-rest
WebTest_Utils_RestTest - Directly manage adminApiKey
Tim Otten [Thu, 2 Apr 2015 03:26:12 +0000 (20:26 -0700)]
Merge pull request #5537 from totten/4.5-httpclient
CRM_Utils_HttpClientTest - Fix example URL
Tim Otten [Thu, 2 Apr 2015 03:11:19 +0000 (20:11 -0700)]
WebTest_Utils_RestTest - Directly manage adminApiKey
Previously, it was the responsibility of the dev on the local machine to
manuall update DB and set an API key for an example admin user. This is now
done automatically.
Tim Otten [Thu, 2 Apr 2015 03:11:09 +0000 (20:11 -0700)]
CRM-11889 - CiviSeleniumTestCase - Use browser session for rest_civicrm_api. Add webtestGetLoggedInContact & assertAPISuccess.
colemanw [Thu, 2 Apr 2015 02:00:29 +0000 (22:00 -0400)]
Merge pull request #5531 from colemanw/CRM-16208
CRM-16208 - Clarify repeating event search and fix fatal error
colemanw [Thu, 2 Apr 2015 01:59:53 +0000 (21:59 -0400)]
Merge pull request #5538 from colemanw/CRM-16214
CRM-16214 - Set default value on option_value form
colemanw [Thu, 2 Apr 2015 01:59:33 +0000 (21:59 -0400)]
Merge pull request #5540 from colemanw/icon
Fix icon path for mailing recipients widget
Coleman Watts [Thu, 2 Apr 2015 01:58:38 +0000 (21:58 -0400)]
Fix icon path for mailing recipients widget
colemanw [Thu, 2 Apr 2015 01:52:07 +0000 (21:52 -0400)]
Merge pull request #5539 from colemanw/Mailing
Mailing webtest fixes
Coleman Watts [Thu, 2 Apr 2015 01:49:32 +0000 (21:49 -0400)]
Mailing webtest fixes
colemanw [Thu, 2 Apr 2015 00:16:35 +0000 (20:16 -0400)]
Merge pull request #5535 from colemanw/CRM-16081
CRM-16081 - Fix unsubscribe error if groups are empty
Coleman Watts [Thu, 2 Apr 2015 00:09:50 +0000 (20:09 -0400)]
CRM-16214 - Set default value on option_value form
Tim Otten [Wed, 1 Apr 2015 23:48:13 +0000 (16:48 -0700)]
CRM_Utils_HttpClientTest - Fix example URL
Coleman Watts [Wed, 1 Apr 2015 23:15:28 +0000 (19:15 -0400)]
CRM-16081 - Fix unsubscribe error if groups are empty
Dave Greenberg [Wed, 1 Apr 2015 22:41:38 +0000 (15:41 -0700)]
CRM-15197 - WebTest_Member_InheritedMembershipTest fixes.
----------------------------------------
* CRM-15197: Various Webtest Fixes
https://issues.civicrm.org/jira/browse/CRM-15197
Coleman Watts [Wed, 1 Apr 2015 16:21:10 +0000 (12:21 -0400)]
Fix option handling in SyntaxConformanceTest
Kurund Jalmi [Wed, 1 Apr 2015 11:29:26 +0000 (16:59 +0530)]
Merge pull request #5504 from cividesk/CRM-14974_2-4.6
CRM-14974 Fixed php notice; array_diff does not support multidimensional...
Kurund Jalmi [Wed, 1 Apr 2015 11:11:37 +0000 (16:41 +0530)]
Merge pull request #5490 from rohankatkar/CRM-16170
Recurring Contributions always displayed in default currency.
Kurund Jalmi [Wed, 1 Apr 2015 10:36:05 +0000 (16:06 +0530)]
Merge pull request #5532 from davecivicrm/CRM-16206
CRM-16206 - Revised upgrade success message.
kurund [Wed, 1 Apr 2015 09:24:09 +0000 (14:54 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-01-14-53-53
Web Access [Wed, 1 Apr 2015 09:10:45 +0000 (14:40 +0530)]
Fix for currency format on exporting contribution detail report
Web Access [Tue, 31 Mar 2015 10:21:03 +0000 (15:51 +0530)]
Minor changes for CRM-16170
Web Access [Fri, 27 Mar 2015 13:14:05 +0000 (18:44 +0530)]
Additional changes for CRM-16170
Web Access [Thu, 26 Mar 2015 13:05:20 +0000 (18:35 +0530)]
Fix for CRM-16170
Kurund Jalmi [Wed, 1 Apr 2015 08:59:24 +0000 (14:29 +0530)]
Merge pull request #5529 from pradpnayak/CRM-13793
-- CRM-13793, removed cruft for website type id for profiles
Kurund Jalmi [Wed, 1 Apr 2015 08:45:35 +0000 (14:15 +0530)]
Merge pull request #5524 from atif-shaikh/CRM-16087
CRM-16087 - Changes in relationship status are not invoking updates to m...
Kurund Jalmi [Wed, 1 Apr 2015 08:17:16 +0000 (13:47 +0530)]
Merge pull request #5516 from monishdeb/4.6Webtests
Webtest for new AB Test Mailing
atif-shaikh [Wed, 1 Apr 2015 07:13:28 +0000 (12:43 +0530)]
CRM-16087 - Relation Api test break fix
----------------------------------------
* CRM-16087: Changes in relationship status are not invoking updates to membership status
https://issues.civicrm.org/jira/browse/CRM-16087
Dave Greenberg [Wed, 1 Apr 2015 03:22:35 +0000 (20:22 -0700)]
CRM-16206 - Revised upgrade success message.
----------------------------------------
* CRM-16206: Revised Upgrade Success Message
https://issues.civicrm.org/jira/browse/CRM-16206
Coleman Watts [Wed, 1 Apr 2015 02:10:13 +0000 (22:10 -0400)]
CRM-16208 - Clarify repeating event search and fix fatal error
Dave Greenberg [Wed, 1 Apr 2015 00:06:50 +0000 (17:06 -0700)]
Merge pull request #5530 from davecivicrm/fixGenerated
Fix bad copy of civicrm_generated.mysql.
Dave Greenberg [Tue, 31 Mar 2015 22:39:26 +0000 (15:39 -0700)]
Fix bad copy of civicrm_generated.mysql.
Dave Greenberg [Tue, 31 Mar 2015 22:25:27 +0000 (15:25 -0700)]
Merge pull request #5483 from pradpnayak/CRM-15848
-- CRM-15848, removed code to update financial_trxn table and create a n...
Dave Greenberg [Tue, 31 Mar 2015 22:08:34 +0000 (15:08 -0700)]
Merge pull request #5528 from pradpnayak/CRM-16198
Crm 16198
Dave Greenberg [Tue, 31 Mar 2015 21:54:26 +0000 (14:54 -0700)]
Merge pull request #5527 from agh1/joomlaxml-permission-desc
CRM-16201 permissions: fix processing of descriptions for Joomla
Pradeep Nayak [Tue, 31 Mar 2015 20:32:31 +0000 (02:02 +0530)]
-- CRM-13793, removed cruft for website type id for profiles
----------------------------------------
* CRM-13793: Miscellaneous code cleanups
https://issues.civicrm.org/jira/browse/CRM-13793
Pradeep Nayak [Tue, 31 Mar 2015 20:24:15 +0000 (01:54 +0530)]
-- CRM-16198, added aliaa for payment instrument in api
----------------------------------------
* CRM-16198: Financial Type search fails when searching Contributions using Search builder
https://issues.civicrm.org/jira/browse/CRM-16198
Andrew Hunt [Tue, 31 Mar 2015 20:21:51 +0000 (16:21 -0400)]
CRM-16201 permissions: fix processing of descriptions for Joomla
----------------------------------------
* CRM-16201: Permission descriptions and translation
https://issues.civicrm.org/jira/browse/CRM-16201
Dave Greenberg [Tue, 31 Mar 2015 20:13:48 +0000 (13:13 -0700)]
Merge pull request #5525 from agh1/perm-desc-2
CRM-16201 Descriptions and translation for permissions
Pradeep Nayak [Tue, 31 Mar 2015 20:05:14 +0000 (01:35 +0530)]
--CRM-16198, added blank line
Pradeep Nayak [Tue, 31 Mar 2015 20:04:11 +0000 (01:34 +0530)]
CRM-16198, removed white space
----------------------------------------
* CRM-16198: Financial Type search fails when searching Contributions using Search builder
https://issues.civicrm.org/jira/browse/CRM-16198
Pradeep Nayak [Tue, 31 Mar 2015 18:12:46 +0000 (23:42 +0530)]
--removed white space, CRM-15848
----------------------------------------
* CRM-15848: Civiaccounts inconsistent with spec when adding partial event payment
https://issues.civicrm.org/jira/browse/CRM-15848
projects / civicrm-core.git / log