colemanw [Thu, 30 Jul 2015 17:34:26 +0000 (13:34 -0400)]
Merge pull request #6361 from colemanw/CRM-14136
CRM-14136 - Don't show deleted contacts on case dashboard
Dave Greenberg [Thu, 30 Jul 2015 17:02:35 +0000 (10:02 -0700)]
Merge pull request #6357 from colemanw/bdombro-more-job-frequencies
CRM-16500 - Added more options to job frequency
colemanw [Thu, 30 Jul 2015 15:34:21 +0000 (11:34 -0400)]
Merge pull request #6362 from colemanw/CRM-14239
CRM-14239 - Fix undefined variable notice
Coleman Watts [Thu, 30 Jul 2015 15:24:34 +0000 (11:24 -0400)]
CRM-14239 - Fix undefined variable notice
Coleman Watts [Thu, 30 Jul 2015 15:16:22 +0000 (11:16 -0400)]
CRM-14136 - Don't show deleted contacts on case dashboard
Coleman Watts [Thu, 30 Jul 2015 13:32:39 +0000 (09:32 -0400)]
CRM-16500 - Style cleanup and fix missing breaks in switch
BrianDombrowski [Wed, 13 May 2015 15:41:13 +0000 (11:41 -0400)]
CRM-16500 - Added more options to job frequency to make it more useable
----------------------------------------
* CRM-16500: Add more common options to scheduled job frequency
https://issues.civicrm.org/jira/browse/CRM-16500
Eileen McNaughton [Thu, 30 Jul 2015 01:43:46 +0000 (13:43 +1200)]
Merge pull request #6323 from eileenmcnaughton/CRM-16923
CRM-16923 enotice fix,
eileenmcnaughton [Thu, 30 Jul 2015 00:04:23 +0000 (00:04 +0000)]
CRM-16923 fix passing on incorrect value for payment processor id frompaypal
colemanw [Thu, 30 Jul 2015 01:35:07 +0000 (21:35 -0400)]
Merge pull request #6353 from eileenmcnaughton/master
Master
Eileen McNaughton [Wed, 22 Jul 2015 02:38:03 +0000 (14:38 +1200)]
CRM-16882 renew my membership automatically should not show for non-auto-renew memberships
I am not convinced this is the full story on CRM-16882 - however, it makes
the symptom disappear, at least in one instance & the logic of the change
is strong - ie. when iterating through the memberships to determine
auto-renewability we should
check whether they are auto-renew
Conflicts:
CRM/Member/BAO/Membership.php
Eileen McNaughton [Wed, 29 Jul 2015 02:48:58 +0000 (14:48 +1200)]
CRM-16926 backoffice version of respecting payment_status_id
Conflicts:
CRM/Contribute/Form/Contribution.php
Eileen McNaughton [Wed, 29 Jul 2015 02:45:23 +0000 (14:45 +1200)]
enotice fix
Conflicts:
CRM/Contribute/BAO/ContributionPage.php
Eileen McNaughton [Tue, 28 Jul 2015 21:24:34 +0000 (09:24 +1200)]
enotice fix
Eileen McNaughton [Tue, 28 Jul 2015 21:21:50 +0000 (09:21 +1200)]
CRM-16926 complete recurring transactions when payment_status_id = 1,
carefully to grandfather in
Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php
eileenmcnaughton [Thu, 30 Jul 2015 00:04:23 +0000 (00:04 +0000)]
CRM-16923 fix passing on incorrect value for payment processor id frompaypal
eileenmcnaughton [Wed, 29 Jul 2015 23:58:22 +0000 (23:58 +0000)]
CRM-16923 wow fixing the loading of payment processor revealed a catalog of sins, fix BaseIPN test to be reliable about test or otherwise, update to financialType not contributionType & update loading of objects to be more reliable
eileenmcnaughton [Wed, 29 Jul 2015 23:36:35 +0000 (23:36 +0000)]
test housekeeping
Dave Greenberg [Wed, 29 Jul 2015 23:29:36 +0000 (16:29 -0700)]
Merge pull request #6352 from davecivicrm/CRM-16876a
CRM-16876 Set country names to UPPERCASE - rebasing.
eileenmcnaughton [Wed, 29 Jul 2015 23:29:15 +0000 (23:29 +0000)]
CRM-16923 enotice fix revealed A.net was passing processor_type_id as processor_id
Dave Greenberg [Wed, 29 Jul 2015 23:27:10 +0000 (16:27 -0700)]
CRM-16876 Set country names to UPPERCASE - rebasing.
----------------------------------------
* CRM-16876: Display Country in uppercase so that mailing labels comply with postal regulations
https://issues.civicrm.org/jira/browse/CRM-16876
eileenmcnaughton [Wed, 29 Jul 2015 22:55:44 +0000 (22:55 +0000)]
fix variable names
Eileen McNaughton [Wed, 29 Jul 2015 22:26:55 +0000 (10:26 +1200)]
Merge pull request #6327 from eileenmcnaughton/CRM-16914
CRM-16914 add payment_instrument_id column
Eileen McNaughton [Wed, 29 Jul 2015 09:23:38 +0000 (21:23 +1200)]
CRM-16914 add payment_instrument_id field to payment processor type, payment processor
colemanw [Wed, 29 Jul 2015 22:08:45 +0000 (18:08 -0400)]
Merge pull request #6348 from colemanw/CRM-16204-b
CRM-16204 Use EntityRef for configure event payment processors
colemanw [Wed, 29 Jul 2015 21:47:13 +0000 (17:47 -0400)]
Merge pull request #6332 from colemanw/CRM-11856
CRM-11856 - Update custom values when option values are modified
colemanw [Wed, 29 Jul 2015 20:35:35 +0000 (16:35 -0400)]
Merge pull request #6347 from colemanw/CRM-16809
CRM-16809 - Suppress form tags on billing field snippet
Coleman Watts [Wed, 6 May 2015 21:22:47 +0000 (17:22 -0400)]
CRM-16204 - Use EntityRef for configure event payment processors
Coleman Watts [Wed, 29 Jul 2015 19:23:59 +0000 (15:23 -0400)]
CRM-16809 - Suppress form tags on billing field snippet
Coleman Watts [Tue, 28 Jul 2015 15:00:46 +0000 (11:00 -0400)]
CRM-11856 - Update custom values when option values are modified
Monish Deb [Wed, 29 Jul 2015 17:16:57 +0000 (22:46 +0530)]
Merge pull request #6340 from jitendrapurohit/CRM-16752
CRM-16752 - Mispell in Province for Philippines - Bataan
Dave Greenberg [Wed, 29 Jul 2015 16:35:03 +0000 (09:35 -0700)]
Merge pull request #6314 from joannechester/patch-4
CRM-16876 Change country names to uppercase
Dave Greenberg [Wed, 29 Jul 2015 16:11:46 +0000 (09:11 -0700)]
Merge pull request #6333 from colemanw/CRM-9474
CRM-9474 - Simplify contribution page tab titles
joannechester [Wed, 29 Jul 2015 14:07:12 +0000 (00:07 +1000)]
test fix
joannechester [Wed, 29 Jul 2015 09:36:25 +0000 (21:36 +1200)]
CRM-16876 Change country name to uppercase
eileenmcnaughton [Wed, 29 Jul 2015 09:09:42 +0000 (09:09 +0000)]
CRM-16923 refine setting of enotices on dodgey setting of processor
eileenmcnaughton [Wed, 29 Jul 2015 08:59:46 +0000 (08:59 +0000)]
CRM-16923 tidyups
eileenmcnaughton [Wed, 29 Jul 2015 08:56:50 +0000 (08:56 +0000)]
CRM-16923 fix for error on unreliable 'guess' method
eileenmcnaughton [Wed, 29 Jul 2015 08:45:41 +0000 (08:45 +0000)]
CRM-16923 update comments, remove unused function observed updating
contribution page bao to facilitate payment_processor parameter
eileenmcnaughton [Wed, 29 Jul 2015 08:44:05 +0000 (08:44 +0000)]
CRM-16923 test to demonstrate point of failure
jitendrapurohit [Wed, 29 Jul 2015 08:41:58 +0000 (14:11 +0530)]
generated sql changes
jitendrapurohit [Wed, 29 Jul 2015 08:30:55 +0000 (14:00 +0530)]
CRM-16752 - Mispell in Province for Philippines - Bataan
eileenmcnaughton [Wed, 29 Jul 2015 08:18:05 +0000 (08:18 +0000)]
CRM-16923 pass payment processor in when calling completetransaction
eileenmcnaughton [Wed, 29 Jul 2015 08:05:42 +0000 (08:05 +0000)]
CRM-16923 accept payment_processor_id as a completetransaction param
Eileen McNaughton [Tue, 28 Jul 2015 21:04:40 +0000 (09:04 +1200)]
Merge pull request #6321 from eileenmcnaughton/master
CRM-16559 allow recurring contributions to go against pledges for sup…
Dave Greenberg [Tue, 28 Jul 2015 20:28:49 +0000 (13:28 -0700)]
Merge pull request #6331 from laryn/patch-4
CRM-16928: Update Authorize.net to new Akamai URL.
Eileen McNaughton [Tue, 28 Jul 2015 20:27:54 +0000 (08:27 +1200)]
Merge pull request #6324 from eileenmcnaughton/CRM-16925
CRM-16925 deprecate isEnabled fn
colemanw [Tue, 28 Jul 2015 18:09:57 +0000 (14:09 -0400)]
Merge pull request #6310 from colemanw/CRM-9084
CRM-9084 - Add field separator option to import
Coleman Watts [Tue, 28 Jul 2015 17:29:24 +0000 (13:29 -0400)]
CRM-9474 - Simplify contribution page tab titles
Laryn [Tue, 28 Jul 2015 14:47:20 +0000 (10:47 -0400)]
Update Authorize.net to new Akamai URL.
Laryn [Tue, 28 Jul 2015 14:39:16 +0000 (10:39 -0400)]
Update Authorize.net to new Akamai URL.
Eileen McNaughton [Tue, 28 Jul 2015 10:47:07 +0000 (22:47 +1200)]
CRM-16925 deprecate isEnabled fn
Eileen McNaughton [Tue, 28 Jul 2015 10:43:27 +0000 (22:43 +1200)]
whitespace fix
Eileen McNaughton [Tue, 21 Jul 2015 07:29:06 +0000 (19:29 +1200)]
CRM-16559 allow recurring contributions to go against pledges for supporting processors
Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Core/Payment.php
CRM/Core/Payment/PayPalImpl.php
Kurund Jalmi [Tue, 28 Jul 2015 04:15:02 +0000 (09:45 +0530)]
Merge pull request #6318 from davecivicrm/CRM-16130
CRM-16130 - Fix Current Employer title in Contact.xml.
Eileen McNaughton [Mon, 27 Jul 2015 23:17:36 +0000 (11:17 +1200)]
Merge pull request #6312 from eileenmcnaughton/master
Master
Dave Greenberg [Mon, 27 Jul 2015 21:45:23 +0000 (14:45 -0700)]
CRM-16130 - Fix Current Employer title in Contact.xml.
----------------------------------------
* CRM-16130: Create CRM_Core_Form::addField method
https://issues.civicrm.org/jira/browse/CRM-16130
Dave Greenberg [Mon, 27 Jul 2015 19:00:46 +0000 (12:00 -0700)]
Merge pull request #6296 from JMAConsulting/CRM-16187
Crm 16187
Coleman Watts [Mon, 27 Jul 2015 14:37:14 +0000 (10:37 -0400)]
Remove duplicate code (merge error)
Coleman Watts [Mon, 27 Jul 2015 01:49:36 +0000 (21:49 -0400)]
CRM-9084 - Add field separator option to import
Kurund Jalmi [Mon, 27 Jul 2015 06:45:26 +0000 (12:15 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-27-10-02-15
Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Core/Payment.php
CRM/Core/Payment/IATS.php
CRM/Core/Payment/PayPalImpl.php
Eileen McNaughton [Mon, 27 Jul 2015 04:34:09 +0000 (16:34 +1200)]
CRM-16919 add domain_id to cacheKey in 4.7
Eileen McNaughton [Mon, 27 Jul 2015 02:07:00 +0000 (14:07 +1200)]
CRM-16919 filter payment processor by domain
Kurund Jalmi [Mon, 27 Jul 2015 04:26:34 +0000 (09:56 +0530)]
Merge pull request #6311 from eileenmcnaughton/4.6
CRM-16919 filter payment processor by domain
Eileen McNaughton [Mon, 27 Jul 2015 02:07:00 +0000 (14:07 +1200)]
CRM-16919 filter payment processor by domain
Coleman Watts [Mon, 27 Jul 2015 01:14:26 +0000 (21:14 -0400)]
CRM-11254 - Add base class for Import/dataSource
Eileen McNaughton [Sun, 26 Jul 2015 21:00:12 +0000 (09:00 +1200)]
Merge pull request #6290 from eileenmcnaughton/CRM-16809
CRM-16809 paypal express button not always loading
colemanw [Sun, 26 Jul 2015 20:13:13 +0000 (16:13 -0400)]
Merge pull request #6305 from joannechester/patch-3
CRM-16492-Change help text for creating smart group
joannechester [Sun, 26 Jul 2015 13:07:36 +0000 (23:07 +1000)]
crm-16492-change-help-text-on-creating-smart-group
Kurund Jalmi [Sun, 26 Jul 2015 03:14:30 +0000 (08:44 +0530)]
Merge pull request #6303 from lcdservices/CRM-16916
CRM-16916 fix validation when formatting field present
Brian Shaughnessy [Sat, 25 Jul 2015 23:28:49 +0000 (19:28 -0400)]
CRM-16916 fix validation when formatting field present
colemanw [Sat, 25 Jul 2015 19:14:51 +0000 (15:14 -0400)]
Merge pull request #6300 from colemanw/CRM-16860
CRM-16860 - Upgrade code refactor/cleanup
Pradeep Nayak [Sat, 25 Jul 2015 05:20:28 +0000 (10:50 +0530)]
--CRM-16187, modified xml file for Entity financial trxn table to include Title for columns
Pradeep Nayak [Thu, 23 Jul 2015 20:13:07 +0000 (01:43 +0530)]
--CRM-16187, fixed code style
Pradeep Nayak [Thu, 23 Jul 2015 20:09:32 +0000 (01:39 +0530)]
--CRM-16187, fixed jenkin warnings
Pradeep Nayak [Thu, 23 Jul 2015 20:01:58 +0000 (01:31 +0530)]
--CRM-16187, restored deleted function
Pradeep Nayak [Thu, 23 Jul 2015 19:57:13 +0000 (01:27 +0530)]
--CRM-16187, Added create spec for financial trxn create
Pradeep Nayak [Thu, 28 May 2015 20:21:26 +0000 (01:51 +0530)]
--CRM-16187, Added warning for Code Docs
Pradeep Nayak [Thu, 28 May 2015 20:11:59 +0000 (01:41 +0530)]
--CRM-16187, added warning text in API explorer
Pradeep Nayak [Thu, 28 May 2015 20:05:45 +0000 (01:35 +0530)]
--CRM-16187, added CRUD api for entity_financial_trxn
Dave Greenberg [Fri, 24 Jul 2015 23:00:49 +0000 (16:00 -0700)]
Merge pull request #6298 from sudhabisht/CRM-16160
Fix the HTML markup / layout issue
Coleman Watts [Fri, 24 Jul 2015 15:15:51 +0000 (11:15 -0400)]
CRM-16860 - Cleanup & add base class for CRM_Upgrade_Incremental
Dave Greenberg [Fri, 24 Jul 2015 16:14:33 +0000 (09:14 -0700)]
Merge pull request #6259 from systopia/CRM-16871
Proposed changes for CRM-16871
Coleman Watts [Fri, 24 Jul 2015 02:05:41 +0000 (22:05 -0400)]
CRM-16860 - Enforce minimum upgradable version
Coleman Watts [Fri, 24 Jul 2015 01:46:36 +0000 (21:46 -0400)]
CRM-16860 - Refactor out CRM_Upgrade_Incremental_Legacy
Coleman Watts [Fri, 24 Jul 2015 01:28:37 +0000 (21:28 -0400)]
CRM-16860 - Remove upgrade code < 4.1
Sudha Bisht [Fri, 24 Jul 2015 14:08:41 +0000 (19:38 +0530)]
Fix the HTML markup / layout
Kurund Jalmi [Fri, 24 Jul 2015 10:56:59 +0000 (16:26 +0530)]
Merge pull request #5473 from aydun/CRM-16160
CRM-16160: Changes to add search by age to Advanced Search
Eileen McNaughton [Fri, 24 Jul 2015 01:05:25 +0000 (13:05 +1200)]
Merge pull request #6288 from eileenmcnaughton/CRM-16523
CRM-16523 relocate functions relating to completing contributions & s…
colemanw [Fri, 24 Jul 2015 00:42:17 +0000 (20:42 -0400)]
Merge pull request #6145 from colemanw/CRM-9386
CRM-9386 - Fix api saving inherited memberships
Dave Greenberg [Thu, 23 Jul 2015 21:23:59 +0000 (14:23 -0700)]
Merge pull request #6292 from colemanw/CRM-16872
CRM-16872 - Ensure errors are displayed from semi-ajax forms
Eileen McNaughton [Thu, 23 Jul 2015 20:46:16 +0000 (08:46 +1200)]
Merge pull request #6279 from eileenmcnaughton/d8
add d8 to candidtate - this might not be final plan, but gets setup.s…
Eileen McNaughton [Thu, 23 Jul 2015 04:50:02 +0000 (16:50 +1200)]
CRM-16524 relocate functions relating to completing contributions & sending receipts from baseIPN to ContributionBAO
These functions are not IPN specific & going off to the IPN for them has been a sore point that is worth resolved before fixing lack of hook calling
Eileen McNaughton [Thu, 23 Jul 2015 20:18:22 +0000 (08:18 +1200)]
Merge pull request #6287 from eileenmcnaughton/tests
test fix - clear static value caching
Coleman Watts [Thu, 23 Jul 2015 20:01:39 +0000 (16:01 -0400)]
Fix 'View Primary' membership button css
Coleman Watts [Sun, 5 Jul 2015 18:42:51 +0000 (14:42 -0400)]
CRM-9386 - Fix api saving inherited memberships
Coleman Watts [Thu, 23 Jul 2015 16:15:06 +0000 (12:15 -0400)]
CRM-16872 - Ensure errors are displayed from semi-ajax forms
eileenmcnaughton [Thu, 23 Jul 2015 09:36:27 +0000 (09:36 +0000)]
CRM-16809 paypal express button not always loading
The issue was that the button name was being overridden
systopia [Thu, 23 Jul 2015 09:34:30 +0000 (11:34 +0200)]
fixed style warnings
Yashodha Chaku [Thu, 23 Jul 2015 09:10:28 +0000 (14:40 +0530)]
Merge pull request #6289 from yashodha/CRM-16879
CRM-16879: Tab with table records showing duplicate data with date da…
projects / civicrm-core.git / log