jitendrapurohit [Thu, 9 Apr 2015 11:19:03 +0000 (16:49 +0530)]
webtest to verify membership dates as per the contribution receive_date
Tim Otten [Thu, 9 Apr 2015 04:43:12 +0000 (21:43 -0700)]
Merge pull request #5587 from totten/4.6-agg-cleanup
CRM-16145 - Cleanup Angular file structure
colemanw [Thu, 9 Apr 2015 00:23:43 +0000 (20:23 -0400)]
Merge pull request #5594 from colemanw/CRM-16260
CRM-16260 - Fix use of ts() within templates
Dave Greenberg [Wed, 8 Apr 2015 21:33:35 +0000 (14:33 -0700)]
Merge pull request #5588 from jitendrapurohit/CRM-16175
CRM-16175 - net amount sometimes incorrect for events involving partial payments.
Coleman Watts [Wed, 8 Apr 2015 21:29:53 +0000 (17:29 -0400)]
CRM-16260 - Fix use of ts() within templates
jitendrapurohit [Wed, 8 Apr 2015 12:53:03 +0000 (18:23 +0530)]
minor fixes
jitendrapurohit [Wed, 8 Apr 2015 06:37:11 +0000 (12:07 +0530)]
net amount sometimes incorrect for events involving partial payments.
Monish Deb [Wed, 8 Apr 2015 12:51:56 +0000 (18:21 +0530)]
Merge pull request #5584 from rohankatkar/CRM-16228
Tax INVOICE PDF randomly changes Tax Rate
Tim Otten [Wed, 8 Apr 2015 06:46:47 +0000 (23:46 -0700)]
CRM-16145 - crmMailing - Match .js and .html files for dialogs
Tim Otten [Wed, 8 Apr 2015 06:27:24 +0000 (23:27 -0700)]
Remove empty stub, crmMailing/field/README.md
Tim Otten [Wed, 8 Apr 2015 06:26:31 +0000 (23:26 -0700)]
CRM-16145 - crmMailing - Split complex directives into separate files
Tim Otten [Wed, 8 Apr 2015 06:12:56 +0000 (23:12 -0700)]
CRM-16145 - crmMailing - Split simple directives into separate files
Tim Otten [Wed, 8 Apr 2015 04:53:39 +0000 (21:53 -0700)]
CRM-16145 - crmMailing - Rename edit*html
Tim Otten [Wed, 8 Apr 2015 04:46:25 +0000 (21:46 -0700)]
CRM-16145 - crmMailing - Split controllers into separate files
Tim Otten [Wed, 8 Apr 2015 03:27:29 +0000 (20:27 -0700)]
CRM-16145 - create-pot-files - Update to match new Angular locations
Tim Otten [Wed, 8 Apr 2015 03:52:12 +0000 (20:52 -0700)]
CRM-16145 - crmUtil - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:50:51 +0000 (20:50 -0700)]
CRM-16145 - crmUi - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:43:47 +0000 (20:43 -0700)]
CRM-16145 - crmMailing- Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:36:30 +0000 (20:36 -0700)]
CRM-16145 - crmCaseType - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:32:01 +0000 (20:32 -0700)]
CRM-16145 - crmExample - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:28:26 +0000 (20:28 -0700)]
CRM-16145 - crmApp - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:15:51 +0000 (20:15 -0700)]
CRM-16145 - crmD3 - Move to ang/
Tim Otten [Wed, 8 Apr 2015 00:42:21 +0000 (17:42 -0700)]
CRM-16145 - crmAutosave - Move to ang/
Tim Otten [Wed, 8 Apr 2015 00:37:34 +0000 (17:37 -0700)]
CRM-16145 - crmAttachment - Move to ang/
Tim Otten [Wed, 8 Apr 2015 00:31:29 +0000 (17:31 -0700)]
CRM-16145 - crmMailingAB - Move CSS and services.js
Tim Otten [Wed, 8 Apr 2015 00:26:40 +0000 (17:26 -0700)]
CRM-16145 - crmMailingAB - Split directives into separate files
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
Web Access [Tue, 7 Apr 2015 14:02:16 +0000 (19:32 +0530)]
Fix for CRm-16228
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
projects / civicrm-core.git / log