Tim Otten [Wed, 8 Apr 2015 00:16:54 +0000 (17:16 -0700)]
CRM-16145 - crmMailingAB - Split controllers into separate files
Tim Otten [Wed, 8 Apr 2015 00:07:28 +0000 (17:07 -0700)]
CRM-16145 - crmMailingAB - Rename partials
Tim Otten [Wed, 8 Apr 2015 00:40:55 +0000 (17:40 -0700)]
CRM-16145 - karma.conf.js - Use ang/*
Tim Otten [Wed, 8 Apr 2015 03:11:17 +0000 (20:11 -0700)]
Merge pull request #5578 from totten/4.6-agg
CRM-16145, CRM-16246 - Aggregate AngularJS modules. De-aggregate ckeditor (fixing ckeditor with both Drupal aggregation and this aggregation).
colemanw [Wed, 8 Apr 2015 01:04:21 +0000 (21:04 -0400)]
Merge pull request #5569 from cividesk/CRM-16239-4.6
CRM-16239 total amount (money) format on backend membership form
Coleman Watts [Wed, 8 Apr 2015 00:56:18 +0000 (20:56 -0400)]
Minor js cleanup
Dave Greenberg [Wed, 8 Apr 2015 00:29:12 +0000 (17:29 -0700)]
Merge pull request #5586 from davecivicrm/CRM-16252
CRM-16252 remove calls to undefined function showRuleFields().
Tim Otten [Tue, 7 Apr 2015 23:23:25 +0000 (16:23 -0700)]
Merge pull request #5585 from totten/4.6-reqtoken-dis
CRM-16237 - crmMailing - Respect disable_mandatory_tokens_check
Dave Greenberg [Tue, 7 Apr 2015 22:52:18 +0000 (15:52 -0700)]
CRM-16252 remove calls to undefined function showRuleFields().
----------------------------------------
* CRM-16252: Remove references to unused javascript function in Configure Event : Online Registration form
https://issues.civicrm.org/jira/browse/CRM-16252
Dave Greenberg [Tue, 7 Apr 2015 21:49:45 +0000 (14:49 -0700)]
Merge pull request #5575 from totten/4.6-mail-reuse
CRM-16238 - Implement "Re-use Mailing"
Dave Greenberg [Tue, 7 Apr 2015 21:33:55 +0000 (14:33 -0700)]
Merge pull request #5582 from atif-shaikh/CRM-16055
On edit / save the main contact edit form for a contact who has an inhe...
Tim Otten [Tue, 7 Apr 2015 21:28:24 +0000 (14:28 -0700)]
CRM-16237 - crmMailing - Respect disable_mandatory_tokens_check
Tim Otten [Tue, 7 Apr 2015 21:14:56 +0000 (14:14 -0700)]
Merge pull request #5579 from totten/4.6-reqtoken
CRM-16237 - crmMailing - Restore checking of required tokens
Dave Greenberg [Tue, 7 Apr 2015 16:52:22 +0000 (09:52 -0700)]
Merge pull request #5577 from eileenmcnaughton/CRM-16245
CRM-16245 display payment processor description in back office
Kurund Jalmi [Tue, 7 Apr 2015 14:42:05 +0000 (20:12 +0530)]
Merge pull request #5583 from atif-shaikh/WebtestFix
WebtestFix
atif-shaikh [Tue, 7 Apr 2015 13:27:19 +0000 (18:57 +0530)]
WebtestFix
atif-shaikh [Tue, 7 Apr 2015 13:02:23 +0000 (18:32 +0530)]
On edit / save the main contact edit form for a contact who has an inherited membership (by relationship), their (inherited) membership is deleted and recreated
Monish Deb [Tue, 7 Apr 2015 10:50:48 +0000 (16:20 +0530)]
Merge pull request #5581 from jitendrapurohit/CRM-16241
Activity details truncated in activity report
jitendrapurohit [Tue, 7 Apr 2015 09:53:31 +0000 (15:23 +0530)]
Activity details truncated in activity report
sunil [Tue, 7 Apr 2015 07:00:18 +0000 (12:30 +0530)]
CRM-16239 changed order of the function parameters
Tim Otten [Tue, 7 Apr 2015 06:54:19 +0000 (23:54 -0700)]
CRM-16237 - crmMailing - Restore checking of required tokens
The header/footer day was optimized in beta by removing the
body_html/body_text -- but this optimization made it impossible to check for
required tokens.
Tim Otten [Tue, 7 Apr 2015 06:36:21 +0000 (23:36 -0700)]
CRM-16246 - Load ckeditor in "page-header" instead of "html-header".
html-header goes through Drupal aggregation, which breaks ckeditor.
Tim Otten [Thu, 19 Mar 2015 23:31:48 +0000 (16:31 -0700)]
CRM-16145 - Civi/Angular - Aggregate JS and CSS files
CRM-16145 aims to setup a more intuitive file structure, but the file
structure has been constrained by the functional requirement to minimize
file-requests. Aggregation frees us to split and reorg files with affecting
the number of file-requests.
Tim Otten [Thu, 19 Mar 2015 23:29:18 +0000 (16:29 -0700)]
CRM-16145 - Add CRM_Utils_File::concat()
Monish Deb [Tue, 7 Apr 2015 06:03:22 +0000 (11:33 +0530)]
Merge pull request #5570 from jitendrapurohit/CRM-16192
Line breaks in memo fields are not displayed fix
Eileen McNaughton [Tue, 7 Apr 2015 04:57:41 +0000 (16:57 +1200)]
CRM-16245 display payment processor description in back office
Dave Greenberg [Tue, 7 Apr 2015 01:45:57 +0000 (18:45 -0700)]
Merge pull request #5561 from agh1/extension-perm-desc
CRM-16230 - Permissions: handle extensions with and without descriptions
Tim Otten [Tue, 7 Apr 2015 01:37:24 +0000 (18:37 -0700)]
CRM-16238 - Implement "Re-use Mailing"
Tim Otten [Tue, 7 Apr 2015 00:47:23 +0000 (17:47 -0700)]
Merge pull request #5574 from totten/4.6-ang
CRM-16173 - Misc Angular fixes
Tim Otten [Sat, 28 Mar 2015 23:01:17 +0000 (16:01 -0700)]
crmUiDebug - Adjust to new crmUiAccordion
Tim Otten [Fri, 3 Apr 2015 09:00:56 +0000 (02:00 -0700)]
crmConfirm - Allow confirmation dialogs using Angular partials
Kurund Jalmi [Mon, 6 Apr 2015 13:41:08 +0000 (19:11 +0530)]
Merge pull request #5559 from colemanw/CRM-16209
CRM-16209 - Add strict type checking to in_array
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
jitendrapurohit [Mon, 6 Apr 2015 09:22:37 +0000 (14:52 +0530)]
Line breaks in memo fields are not displayed fix
sunil [Mon, 6 Apr 2015 08:15:04 +0000 (13:45 +0530)]
CRM-16239 total amount (money) format on backend membership form
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: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
Andrew Hunt [Fri, 3 Apr 2015 21:37:10 +0000 (17:37 -0400)]
CRM-16230 - Permissions: handle extensions with and without descriptions
----------------------------------------
* CRM-16230: Extensions providing permissions will choke
https://issues.civicrm.org/jira/browse/CRM-16230
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
Coleman Watts [Fri, 3 Apr 2015 13:24:48 +0000 (09:24 -0400)]
CRM-16209 - Add strict type checking to in_array
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
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: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
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
projects / civicrm-core.git / log