Eileen McNaughton [Tue, 12 May 2015 05:44:18 +0000 (17:44 +1200)]
Fix to formRule refactor
Eileen McNaughton [Tue, 12 May 2015 05:23:04 +0000 (17:23 +1200)]
update MembershipForm test to be less clobbery
Conflicts:
tests/phpunit/CRM/Member/Form/MembershipTest.php
Eileen McNaughton [Tue, 12 May 2015 02:38:11 +0000 (14:38 +1200)]
phpcs fixes
Eileen McNaughton [Tue, 12 May 2015 02:15:28 +0000 (14:15 +1200)]
CRM-16368 partial commit of Lola's refactoring (PR has gone stale :-()
Eileen McNaughton [Sun, 10 May 2015 09:48:11 +0000 (21:48 +1200)]
CRM-16357 rename processContribution to processFormContribution to make it easier to change signature (since name is same as other function)
Eileen McNaughton [Sun, 10 May 2015 09:44:39 +0000 (21:44 +1200)]
CRM-16357 towards passing pledge id from calling function & extracting on the form it thethe form
Eileen McNaughton [Sun, 10 May 2015 07:45:54 +0000 (19:45 +1200)]
Merge pull request #5782 from eileenmcnaughton/master
CRM-16417 stop removing failed payments
Eileen McNaughton [Sun, 10 May 2015 03:52:33 +0000 (15:52 +1200)]
Merge pull request #5764 from eileenmcnaughton/FinancialItemApi
CRM-16543 add finanical item api
Eileen McNaughton [Sat, 9 May 2015 21:35:07 +0000 (09:35 +1200)]
whitespace
Eileen McNaughton [Sat, 9 May 2015 09:04:27 +0000 (21:04 +1200)]
whitespace
Eileen McNaughton [Sat, 2 May 2015 23:35:09 +0000 (11:35 +1200)]
Disable failing timestamp test in the 4.6 series
Per CRM-16204 we should allow this properly in 4.7
Monish Deb [Fri, 8 May 2015 18:18:21 +0000 (23:48 +0530)]
Merge pull request #5799 from monishdeb/CRM-13596
Crm 13596
Kurund Jalmi [Fri, 8 May 2015 14:53:35 +0000 (10:53 -0400)]
Merge pull request #5783 from mallezie/crm-16473
CRM-16473-empty display en sort_name_format get filled in with default values
monishdeb [Fri, 8 May 2015 13:01:58 +0000 (18:31 +0530)]
format fixes
Andrew West [Wed, 6 May 2015 12:48:51 +0000 (13:48 +0100)]
CRM-13596
fix for contact subtypes being overwritten
Kurund Jalmi [Fri, 8 May 2015 04:52:56 +0000 (00:52 -0400)]
Merge pull request #5786 from mallezie/crm-16283-duplicaterelationcheck
Crm 16283 duplicaterelationcheck
colemanw [Thu, 7 May 2015 17:36:57 +0000 (13:36 -0400)]
Merge pull request #5788 from colemanw/AJAX
AJAX cleanup & remove unused functions
Coleman Watts [Thu, 7 May 2015 14:20:23 +0000 (10:20 -0400)]
AJAX cleanup & remove unused functions
Tim Mallezie [Thu, 7 May 2015 10:15:16 +0000 (12:15 +0200)]
empty is valid value for display and sort_name_format
colemanw [Thu, 7 May 2015 01:54:31 +0000 (21:54 -0400)]
Merge pull request #5720 from josephlacey/datatables-update
Datatables update
colemanw [Thu, 7 May 2015 01:43:15 +0000 (21:43 -0400)]
Merge pull request #5777 from colemanw/CRM-16204
CRM-16204 - Add entityRef support for PaymentProcessor api
Coleman Watts [Wed, 6 May 2015 21:07:52 +0000 (17:07 -0400)]
CRM-16204 - Fix incorrect label on PaymentProcessor pseudoconstant
Coleman Watts [Wed, 6 May 2015 21:07:01 +0000 (17:07 -0400)]
CRM-16204 - Add entityRef support for PaymentProcessor api
Kurund Jalmi [Wed, 6 May 2015 16:03:46 +0000 (12:03 -0400)]
Merge pull request #5771 from sudhabisht/C16386
Fix for contribution time
Sudha Bisht [Wed, 6 May 2015 09:16:09 +0000 (14:46 +0530)]
Fix for contribution time
Kurund Jalmi [Wed, 6 May 2015 04:42:59 +0000 (00:42 -0400)]
Merge pull request #5768 from eileenmcnaughton/lola
CRM-16386 - Minor code cleanup: Undefined and unused variables.
Lola Slade [Sun, 26 Apr 2015 19:50:06 +0000 (13:50 -0600)]
CRM-16386 - Minor code cleanup: Undefined and unused variables.
Eileen McNaughton [Tue, 5 May 2015 08:10:10 +0000 (20:10 +1200)]
Enotice fix
Eileen McNaughton [Tue, 5 May 2015 05:47:11 +0000 (17:47 +1200)]
CRM-16417, CRM-16357, CRM-14011 (Contribution Page) was working on keeping failed transactions but cross-il
between tickets is high & the solution for one seems to be the solution for all
Eileen McNaughton [Tue, 5 May 2015 03:57:46 +0000 (15:57 +1200)]
CRM-16543 add finanical item api
Kurund Jalmi [Tue, 5 May 2015 03:18:28 +0000 (23:18 -0400)]
Merge pull request #5759 from rohankatkar/CRM-16438
Fix for CRM-16438 participantListCount report filter by event_start_date fails
Kurund Jalmi [Tue, 5 May 2015 03:17:16 +0000 (23:17 -0400)]
Merge pull request #5760 from sudhabisht/SMSissue
Fix for sms action
Eileen McNaughton [Tue, 5 May 2015 02:10:54 +0000 (14:10 +1200)]
Merge pull request #5750 from onlyjob/spell
multiple spelling corrections
Eileen McNaughton [Tue, 5 May 2015 01:01:19 +0000 (13:01 +1200)]
Merge pull request #5756 from eileenmcnaughton/master
Master
Eileen McNaughton [Mon, 4 May 2015 20:49:42 +0000 (08:49 +1200)]
whitespace only
Eileen McNaughton [Mon, 4 May 2015 20:43:51 +0000 (08:43 +1200)]
whitespace fixes
Eileen McNaughton [Mon, 4 May 2015 20:41:50 +0000 (08:41 +1200)]
CRM-16357 Contribution form it turns out this bit of code does nothing & custom field management is elsewhere
Sudha Bisht [Mon, 4 May 2015 13:11:40 +0000 (18:41 +0530)]
Fix for sms action
Web Access [Mon, 4 May 2015 12:36:09 +0000 (18:06 +0530)]
Fix for CRM-16438 participantListCount report filter by event_start_date fails
Eileen McNaughton [Mon, 4 May 2015 12:15:38 +0000 (00:15 +1200)]
CRM-16357 Contribution form - moving towards extracting form variables earlier in the process
Eileen McNaughton [Mon, 4 May 2015 12:14:17 +0000 (00:14 +1200)]
CRM-16357 Contribution form - moving towards extracting form variables earlier in the process
Eileen McNaughton [Mon, 4 May 2015 11:56:50 +0000 (23:56 +1200)]
CRM-16357 Contribution form - put calculateion of nondeductible amount into separate function for clarity
Eileen McNaughton [Mon, 4 May 2015 11:38:11 +0000 (23:38 +1200)]
CRM-16357 (Back office contribution page) don't take ignored parameter as a reference
Eileen McNaughton [Mon, 4 May 2015 11:37:28 +0000 (23:37 +1200)]
CRM-16357 (Back office contribution page) - it turns out the 3 lines here generate a parameter to pass to a function that ignore it, skip
Eileen McNaughton [Mon, 4 May 2015 09:28:28 +0000 (21:28 +1200)]
CRM-16357 (Backoffice contribution Form) reducing dependence on in processCreditCard
Eileen McNaughton [Mon, 4 May 2015 09:08:36 +0000 (21:08 +1200)]
CRM-16357 (Backoffice contribution Form) remove assumptions about type, declaration of fields is the way to go
Eileen McNaughton [Mon, 4 May 2015 08:57:10 +0000 (20:57 +1200)]
CRM-16357 (Backoffice contribution Form) enotice fix
Eileen McNaughton [Mon, 4 May 2015 08:51:41 +0000 (20:51 +1200)]
CRM-16357 (Backoffice contribution Form) enotice fix on contribution_status_id & fix on expiry date
Eileen McNaughton [Mon, 4 May 2015 08:18:01 +0000 (20:18 +1200)]
CRM-16357 (Backoffice contribution Form) minor refactors
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
Dmitry Smirnov [Sun, 3 May 2015 04:19:24 +0000 (14:19 +1000)]
Corrections as per colemanw's review.
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 ...
Dmitry Smirnov [Sat, 2 May 2015 06:00:57 +0000 (16:00 +1000)]
codespell: remaining files
Dmitry Smirnov [Sat, 2 May 2015 05:48:32 +0000 (15:48 +1000)]
codespell: CRM/*
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
Coleman Watts [Fri, 1 May 2015 19:13:11 +0000 (15:13 -0400)]
Code style fix
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
Joseph Lacey [Thu, 30 Apr 2015 19:16:05 +0000 (13:16 -0600)]
Style clean up caught by Jenkins
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
Joseph Lacey [Thu, 30 Apr 2015 02:54:26 +0000 (20:54 -0600)]
CRM-16353 - One more Contact DataTable refactor
----------------------------------------
* CRM-16353: Upgrade datatables integration to use v2 api
https://issues.civicrm.org/jira/browse/CRM-16353
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
Joseph Lacey [Thu, 30 Apr 2015 02:43:10 +0000 (20:43 -0600)]
CRM-16353 - Mailing DataTables refactoring
----------------------------------------
* CRM-16353: Upgrade datatables integration to use v2 api
https://issues.civicrm.org/jira/browse/CRM-16353
Joseph Lacey [Thu, 30 Apr 2015 02:42:11 +0000 (20:42 -0600)]
CRM-16353 - Remaining Contact DataTables refactoring, in addition to initial refactoring
----------------------------------------
* CRM-16353: Upgrade datatables integration to use v2 api
https://issues.civicrm.org/jira/browse/CRM-16353
projects / civicrm-core.git / log