Tim Mallezie [Fri, 8 May 2015 16:14:08 +0000 (18:14 +0200)]
use addfield in addressForm
kurund [Mon, 4 May 2015 03:48:13 +0000 (23:48 -0400)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-03-23-41-12
Conflicts:
CRM/Report/Form/Contribute/TopDonor.php
Eileen McNaughton [Mon, 4 May 2015 02:54:27 +0000 (14:54 +1200)]
Merge pull request #5754 from eileenmcnaughton/CRM-16367
Crm 16367
Eileen McNaughton [Mon, 4 May 2015 00:35:57 +0000 (12:35 +1200)]
CRM-16367 Contribution Product schema - add titles
Now we have an API for this syntax conformance test enforces adding titles
Eileen McNaughton [Sun, 3 May 2015 20:02:25 +0000 (08:02 +1200)]
CRM-16367 phpcs fixes
Eileen McNaughton [Sun, 3 May 2015 11:53:39 +0000 (23:53 +1200)]
CRM-16367 (Backoffice Contribution Form) extract calculation of non-deductible amount
Eileen McNaughton [Sun, 3 May 2015 11:52:57 +0000 (23:52 +1200)]
CRM-16367 (Backoffice Contribution Form) further fix on premium
Eileen McNaughton [Sun, 3 May 2015 11:50:06 +0000 (23:50 +1200)]
CRM-16367 (Backoffice Contribution Form) centralisation & testing of setting premium & note
Eileen McNaughton [Sun, 3 May 2015 11:13:14 +0000 (23:13 +1200)]
CRM-16367 (Backoffice Contribution Form) consolidate premium processing to one place
Eileen McNaughton [Sun, 3 May 2015 10:05:03 +0000 (22:05 +1200)]
CRM-16367 (Backoffice contribution page) get premium code email under unit test
Eileen McNaughton [Sun, 3 May 2015 09:12:09 +0000 (21:12 +1200)]
CRM-16367 (Backoffice contribution page) get premium code under unit test
Eileen McNaughton [Sun, 3 May 2015 08:47:35 +0000 (20:47 +1200)]
CRM-16367 (Backoffice Contribution Form) remove pointless check & add comment
Eileen McNaughton [Sun, 3 May 2015 08:31:49 +0000 (20:31 +1200)]
CRM-16367 (api-contribution_product & product) add contribution product api and make active api default on product
Eileen McNaughton [Sun, 3 May 2015 04:10:03 +0000 (16:10 +1200)]
CRM-16367 (Backoffice Contribution Form) refactor set-message towards removing duplication in with credit card vs without
Eileen McNaughton [Sun, 3 May 2015 04:08:47 +0000 (16:08 +1200)]
Premium refactor, remove & from param that is not changed in processPremium
Eileen McNaughton [Sun, 3 May 2015 03:39:57 +0000 (15:39 +1200)]
CRM-16367 (Backoffice Contribution Form) move invoicing code to a separate function
Eileen McNaughton [Sun, 3 May 2015 03:28:16 +0000 (15:28 +1200)]
CRM-16367 (Contribution form refactor) rename contribution type to financial type
Eileen McNaughton [Sun, 3 May 2015 03:20:52 +0000 (15:20 +1200)]
Merge pull request #5695 from mlutfy/46-crm16359
CRM-16359: Report templates title/description translation.
Eileen McNaughton [Sun, 3 May 2015 01:23:26 +0000 (13:23 +1200)]
Merge pull request #5748 from eileenmcnaughton/CRM-16367
CRM-16367 (back office contribution form) refactor pledge update out of form
Eileen McNaughton [Sat, 2 May 2015 22:47:18 +0000 (10:47 +1200)]
Remove attempt to supress warnings on unused parameter as not sure how to get it past phpcs
Eileen McNaughton [Sat, 2 May 2015 09:03:14 +0000 (21:03 +1200)]
Merge pull request #5717 from mallezie/extra-space-eventfee-template
remove extra space, causes netbeans smarty syntax to highlight error of ...
Eileen McNaughton [Sat, 2 May 2015 04:53:18 +0000 (16:53 +1200)]
formatting fixes
Eileen McNaughton [Fri, 1 May 2015 20:23:13 +0000 (08:23 +1200)]
Merge pull request #5738 from eileenmcnaughton/CRM-16367
CRM-16367 Back office contribution form refactor - move pledge update into separate function
Kurund Jalmi [Fri, 1 May 2015 19:32:35 +0000 (15:32 -0400)]
Merge pull request #5743 from sudhabisht/PledgeIssue
Changes in Summary Report shows incorrect date for Overdue payments
Eileen McNaughton [Fri, 1 May 2015 18:17:54 +0000 (12:17 -0600)]
CRM-16367 (back office contribution form) further refactor around reducing code duplication on pledges
Eileen McNaughton [Fri, 1 May 2015 17:42:49 +0000 (11:42 -0600)]
CRM-16367 (back office contribution form) move refactored pledge update function out of contribution form to BAO
Eileen McNaughton [Fri, 1 May 2015 17:39:42 +0000 (11:39 -0600)]
CRM-16367 (back office contribution form) refactor pledge update out of contribution form to BAO
colemanw [Fri, 1 May 2015 17:35:03 +0000 (12:35 -0500)]
Merge pull request #5739 from onlyjob/license
install/index.php: replaced dead license link with the text of the license
colemanw [Fri, 1 May 2015 17:23:56 +0000 (12:23 -0500)]
Merge pull request #5746 from colemanw/CRM-16333
CRM-16333 - explodePadded should return an empty array from an empty string
Eileen McNaughton [Thu, 30 Apr 2015 21:20:30 +0000 (15:20 -0600)]
whitespace fixes
Kurund Jalmi [Thu, 30 Apr 2015 14:26:56 +0000 (08:26 -0600)]
Merge pull request #5727 from sudhabisht/4.6
Fix for contribution api filter
Coleman Watts [Thu, 30 Apr 2015 14:15:57 +0000 (08:15 -0600)]
CRM-16333 - explodePadded should return an empty array from an empty string
Monish Deb [Thu, 30 Apr 2015 13:10:15 +0000 (18:40 +0530)]
Merge pull request #5716 from jitendrapurohit/CRM-15716_4.6
fix for CRM-15716 Include missing contact fields in (constituent) report...
Sudha Bisht [Thu, 30 Apr 2015 10:09:46 +0000 (15:39 +0530)]
Changes in Report shows incorrect date for Overdue payments
Eileen McNaughton [Thu, 30 Apr 2015 03:32:57 +0000 (21:32 -0600)]
CRM-16367 (Back office contribution page) refactor pledge update into a separate function (another var)
colemanw [Thu, 30 Apr 2015 03:26:41 +0000 (21:26 -0600)]
Merge pull request #5740 from agh1/font-awesome2
CRM-16415 add Font Awesome to bower.json
Andrew Hunt [Thu, 30 Apr 2015 03:18:47 +0000 (23:18 -0400)]
CRM-16415 add Font Awesome to bower.json
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Andrew Hunt [Thu, 30 Apr 2015 03:18:47 +0000 (23:18 -0400)]
CRM-16415 add Font Awesome to bower.json
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
https://issues.civicrm.org/jira/browse/CRM-16415
Dmitry Smirnov [Thu, 30 Apr 2015 03:09:32 +0000 (13:09 +1000)]
install/index.php: replaced dead license link with the text of the license
* Original URL no longer exist. Text of the license retrieved from
archive.org:
https://web.archive.org/web/
20080701084318/http://www.silverstripe.com/licensing/
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
colemanw [Thu, 30 Apr 2015 02:54:57 +0000 (20:54 -0600)]
Merge pull request #5737 from colemanw/CRM-16423
CRM-16423 - Remove unused js files
Coleman Watts [Thu, 30 Apr 2015 02:49:07 +0000 (20:49 -0600)]
CRM-16423 - Remove unused jquery-fieldselection.js
Eileen McNaughton [Thu, 30 Apr 2015 02:48:31 +0000 (20:48 -0600)]
CRM-16367 (Back office contribution page) refactor pledge update into a separate function
Coleman Watts [Thu, 30 Apr 2015 02:45:36 +0000 (20:45 -0600)]
CRM-16423 - Remove unused crmasmselect.js
Coleman Watts [Thu, 30 Apr 2015 02:44:27 +0000 (20:44 -0600)]
CRM-16423 - Remove textarearesizer.js
Eileen McNaughton [Thu, 30 Apr 2015 02:42:07 +0000 (20:42 -0600)]
CRM-16367 (backoffice Contribution page) testability refactoring
colemanw [Thu, 30 Apr 2015 02:40:42 +0000 (20:40 -0600)]
Merge pull request #5731 from mallezie/groupcontact-addfield
use addField in CRM_Contact_Form_GroupContact CRM-16178
colemanw [Thu, 30 Apr 2015 02:40:06 +0000 (20:40 -0600)]
Merge pull request #5730 from mallezie/domain-addfield
Use addField in contact_form_domain CRM-16178
colemanw [Thu, 30 Apr 2015 02:38:43 +0000 (20:38 -0600)]
Merge pull request #5734 from samuelsov/CRM-15375
CRM-15375 - make the setup create metadata for I18n - used in the popup
Eileen McNaughton [Thu, 30 Apr 2015 02:10:48 +0000 (20:10 -0600)]
CRM-16367 refactor core_form action property out of post_process params
Coleman Watts [Thu, 30 Apr 2015 01:57:18 +0000 (19:57 -0600)]
CRM-16354 - Lookup wysiwyg by name not label
Coleman Watts [Thu, 30 Apr 2015 01:42:15 +0000 (19:42 -0600)]
CRM-16354 - Use standard crm-form css class for wysiwyg
Samuel Vanhove [Wed, 29 Apr 2015 23:17:51 +0000 (19:17 -0400)]
CRM-15375 - cleaning the code
Samuel Vanhove [Wed, 29 Apr 2015 22:44:31 +0000 (18:44 -0400)]
CRM-15375 - small mistake when concatenating the class
colemanw [Wed, 29 Apr 2015 22:08:09 +0000 (16:08 -0600)]
Merge pull request #5687 from relldoesphp/ckeditor_fix
CRM-16354 Upgrade CkEditor
Coleman Watts [Wed, 29 Apr 2015 17:41:41 +0000 (11:41 -0600)]
CRM-16354 - Upgrade code for wysiwyg changes
Coleman Watts [Wed, 29 Apr 2015 17:08:34 +0000 (11:08 -0600)]
CRM-16354 - Remove cms wysiwyg from core
Samuel Vanhove [Wed, 29 Apr 2015 21:55:59 +0000 (17:55 -0400)]
Checkstyle problem
Samuel Vanhove [Wed, 29 Apr 2015 21:52:02 +0000 (17:52 -0400)]
Wysiwyg API change + typos
Samuel Vanhove [Wed, 29 Apr 2015 21:09:12 +0000 (17:09 -0400)]
CRM-15375 - make the setup create metadata for I18n that can be used in the popup
Tim Mallezie [Wed, 29 Apr 2015 16:10:48 +0000 (18:10 +0200)]
use addField in CRM_Contact_Form_GroupContact CRM-16178
colemanw [Wed, 29 Apr 2015 16:01:31 +0000 (10:01 -0600)]
Merge pull request #5512 from mallezie/notes-addTextarea-16178
add textarea, and convert note
Tim Mallezie [Wed, 29 Apr 2015 15:52:27 +0000 (17:52 +0200)]
Use addField in contact_form_domain CRM-16178
Sudha Bisht [Wed, 29 Apr 2015 11:28:59 +0000 (16:58 +0530)]
Fix for contribution api filter
Coleman Watts [Wed, 29 Apr 2015 05:10:23 +0000 (23:10 -0600)]
CRM-16354 - Replace-plain fix
Coleman Watts [Wed, 29 Apr 2015 04:47:56 +0000 (22:47 -0600)]
CRM-16354 - Migrate forms to new wysiwyg code
Coleman Watts [Wed, 29 Apr 2015 04:29:50 +0000 (22:29 -0600)]
CRM-16354 - Remove old wysiwyg code
colemanw [Wed, 29 Apr 2015 02:28:04 +0000 (20:28 -0600)]
Merge pull request #5723 from civicrm/4.6
Merge branch 4.6 into master
Kurund Jalmi [Tue, 28 Apr 2015 23:52:23 +0000 (17:52 -0600)]
Update version.xml
Kurund Jalmi [Tue, 28 Apr 2015 23:19:24 +0000 (17:19 -0600)]
Merge pull request #5647 from kurund/CRM-15629
CRM-15629, during exten/ipn calls we don't bootstrap hence some constants ...
Tyrell Cook [Tue, 28 Apr 2015 22:46:30 +0000 (18:46 -0400)]
remove wysiwyg options on upgrade
Tyrell Cook [Tue, 28 Apr 2015 22:44:41 +0000 (18:44 -0400)]
removed other editors on install
Monish Deb [Tue, 28 Apr 2015 13:09:51 +0000 (18:39 +0530)]
Merge pull request #5708 from atif-shaikh/CRM-16319
CRM-16319 - CiviEvent Registration Invoice Fatal Error
Monish Deb [Tue, 28 Apr 2015 13:08:03 +0000 (18:38 +0530)]
Merge pull request #5677 from atif-shaikh/CRM-16300Regression
CRM-16300 fixed regression which caused webtest to break
Monish Deb [Tue, 28 Apr 2015 13:07:57 +0000 (18:37 +0530)]
Merge pull request #5711 from jitendrapurohit/CRM-16300QA
Set message after updating Relationship
jitendrapurohit [Tue, 28 Apr 2015 11:17:49 +0000 (16:47 +0530)]
field fix for contact_type and contact_subtype
Tim Mallezie [Tue, 28 Apr 2015 10:24:49 +0000 (12:24 +0200)]
remove extra space, causes netbeans smarty syntax to highlight error of missing closed if tag
Monish Deb [Tue, 28 Apr 2015 09:39:27 +0000 (15:09 +0530)]
Merge pull request #5709 from pratikshad/16068
CRM-16068 Fix-Tab with table date field shows wrong date format
jitendrapurohit [Tue, 28 Apr 2015 08:28:19 +0000 (13:58 +0530)]
fix for CRM-15716 Include missing contact fields in (constituent) reports in 4.6.3 version
pratikshad [Tue, 28 Apr 2015 07:23:59 +0000 (12:53 +0530)]
typo fix
pratikshad [Mon, 27 Apr 2015 09:30:50 +0000 (15:00 +0530)]
CRM-16068 Fix-Tab with table date field shows wrong date format
----------------------------------------
* CRM-16068: Tab with table date field shows wrong date format
https://issues.civicrm.org/jira/browse/CRM-16068
Monish Deb [Tue, 28 Apr 2015 07:09:08 +0000 (12:39 +0530)]
Merge pull request #5710 from pratikshad/16304
CRM-16304 fix-Incorrect FinancialTrxn dates for Backoffice Event Registr...
Coleman Watts [Tue, 28 Apr 2015 04:50:30 +0000 (22:50 -0600)]
CRM-16354 - wysiwyg code cleanup
Tyrell Cook [Mon, 27 Apr 2015 20:56:06 +0000 (16:56 -0400)]
CRM-16354 fixed issue with angular
Dave Greenberg [Mon, 27 Apr 2015 18:08:29 +0000 (12:08 -0600)]
Merge pull request #5713 from eileenmcnaughton/4.6
CRM-16245 follow up fix on recurring processors not displaying
Eileen McNaughton [Mon, 27 Apr 2015 16:07:34 +0000 (10:07 -0600)]
CRM-16245 follow up fix on recurring processors not displaying
Kurund Jalmi [Mon, 27 Apr 2015 15:53:48 +0000 (09:53 -0600)]
Merge pull request #5707 from jitendrapurohit/CRM-15716
CRM-15716, fix for issues found during QA
jitendrapurohit [Mon, 27 Apr 2015 13:34:40 +0000 (19:04 +0530)]
api test fixes
jitendrapurohit [Mon, 27 Apr 2015 13:30:45 +0000 (19:00 +0530)]
api test fix
jitendrapurohit [Mon, 27 Apr 2015 11:49:39 +0000 (17:19 +0530)]
Set message after updating Relationship
atif-shaikh [Mon, 27 Apr 2015 10:44:03 +0000 (16:14 +0530)]
CRM-16319 - Code Sniffer Warning Fix
----------------------------------------
* CRM-16319: CiviEvent Registration Invoice Fatal Error
https://issues.civicrm.org/jira/browse/CRM-16319
Monish Deb [Mon, 27 Apr 2015 10:30:22 +0000 (16:00 +0530)]
Merge pull request #5671 from jitendrapurohit/CRM-15357
CRM-15357 fix Event 'delete participant' batch operation can show incorr...
Monish Deb [Mon, 27 Apr 2015 10:28:30 +0000 (15:58 +0530)]
Merge pull request #5663 from kenwest/CRM-16324-1
CRM-16324 Scheduled jobs won't accept zero-valued parameters
pratikshad [Mon, 27 Apr 2015 09:18:44 +0000 (14:48 +0530)]
CRM-16304 fix-Incorrect FinancialTrxn dates for Backoffice Event Registration
----------------------------------------
* CRM-16304: Incorrect FinancialTrxn dates for Backoffice Event Registration
https://issues.civicrm.org/jira/browse/CRM-16304
atif-shaikh [Mon, 27 Apr 2015 08:18:38 +0000 (13:48 +0530)]
CRM-16319 - CiviEvent Registration Invoice Fatal Error
https://issues.civicrm.org/jira/browse/CRM-16319
jitendrapurohit [Mon, 27 Apr 2015 07:11:57 +0000 (12:41 +0530)]
warning fixes
jitendrapurohit [Mon, 27 Apr 2015 06:11:54 +0000 (11:41 +0530)]
QA fixes
magnolia61 [Mon, 9 Mar 2015 10:06:29 +0000 (11:06 +0100)]
fields added to contact, contribute and event forms
Middle name, birth date, gender, contact (sub)type added to fields,
sorting and filters
colemanw [Sun, 26 Apr 2015 22:12:59 +0000 (16:12 -0600)]
Merge pull request #5698 from colemanw/sigfig
Move CRM.sigfig into CRM.utils
Tyrell Cook [Sun, 26 Apr 2015 20:59:02 +0000 (16:59 -0400)]
CRM-16354 make sure init once
Tyrell Cook [Sun, 26 Apr 2015 20:56:37 +0000 (16:56 -0400)]
CRM-16354 more style changes
projects / civicrm-core.git / log