Coleman Watts [Sat, 1 Aug 2015 14:32:32 +0000 (10:32 -0400)]
CRM_Utils_REST cleanup
colemanw [Sat, 1 Aug 2015 11:59:32 +0000 (07:59 -0400)]
Merge pull request #6370 from colemanw/CRM-13104
CRM-13104 - Remove obsolete hook_civicrm_validate
Coleman Watts [Sat, 1 Aug 2015 01:40:20 +0000 (21:40 -0400)]
CRM-13104 - Remove obsolete hook_civicrm_validate
colemanw [Thu, 30 Jul 2015 19:38:51 +0000 (15:38 -0400)]
Merge pull request #6358 from colemanw/CRM-16940
CRM-16940 - Deprecated php < 5.5
Kurund Jalmi [Thu, 30 Jul 2015 18:09:08 +0000 (23:39 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-30-23-34-40
Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/BAO/ContributionPage.php
CRM/Contribute/Form/Contribution.php
CRM/Member/BAO/Membership.php
Dave Greenberg [Thu, 30 Jul 2015 17:57:52 +0000 (10:57 -0700)]
Merge pull request #6345 from pradpnayak/CRM-15187
--CRM-15187, Added warning message when membership type is changed
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
Coleman Watts [Thu, 30 Jul 2015 17:16:19 +0000 (13:16 -0400)]
Improve upgrade screen style
Coleman Watts [Thu, 30 Jul 2015 12:12:51 +0000 (08:12 -0400)]
CRM-16940 - Add php deprecation warning
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
Kurund Jalmi [Thu, 30 Jul 2015 13:48:37 +0000 (19:18 +0530)]
Merge pull request #6355 from jitendrapurohit/CRM-16915addfixes
Additional fixes for CRM-16915
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
jitendrapurohit [Thu, 30 Jul 2015 08:55:37 +0000 (14:25 +0530)]
additional fixes for CRM-16915
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
Tim Otten [Thu, 30 Jul 2015 00:00:44 +0000 (17:00 -0700)]
Merge pull request #6334 from totten/4.6-bower-afu
bower.json - Harden angular-file-upload version.
Dave Greenberg [Wed, 29 Jul 2015 23:59:02 +0000 (16:59 -0700)]
Merge pull request #6278 from eileenmcnaughton/CRM-16882
CRM-16882 renew my membership automatically should not show for non-auto-renew memberships
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 21:44:39 +0000 (17:44 -0400)]
Merge pull request #6344 from colemanw/CRM-16930
CRM-16930 - custom case fields on print report
colemanw [Wed, 29 Jul 2015 21:20:04 +0000 (17:20 -0400)]
Merge pull request #6351 from colemanw/CRM-16645
CRM-16645 - Fix param name collision with wp
Coleman Watts [Wed, 29 Jul 2015 21:15:09 +0000 (17:15 -0400)]
CRM-16645 - Fix param name collision with wp
----------------------------------------
* CRM-16645: PCP Credit Dropdown Hard-coded to 10 results, no 'load more'
https://issues.civicrm.org/jira/browse/CRM-16645
Eileen McNaughton [Wed, 29 Jul 2015 20:36:53 +0000 (08:36 +1200)]
Merge pull request #6326 from eileenmcnaughton/CRM-16926
CRM-16926 complete recurring transactions when payment_status_id = 1,…
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
colemanw [Wed, 29 Jul 2015 19:08:29 +0000 (15:08 -0400)]
Merge pull request #6346 from colemanw/icon
Add missing button icon
Coleman Watts [Wed, 29 Jul 2015 19:06:23 +0000 (15:06 -0400)]
Add missing button icon
Coleman Watts [Wed, 29 Jul 2015 17:54:23 +0000 (13:54 -0400)]
CRM-16930 - Use custom group label instead of generic 'Case Custom Data'
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:37:27 +0000 (09:37 -0700)]
Merge pull request #6336 from jitendrapurohit/CRM-16915refinements
Minor Fix for CRM-16915
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
Jamie McClelland [Wed, 29 Jul 2015 16:22:53 +0000 (12:22 -0400)]
CRM-16930 - enable custom case fields on case report.
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
Monish Deb [Wed, 29 Jul 2015 06:05:25 +0000 (11:35 +0530)]
Merge pull request #6320 from monishdeb/4.6
CRM-16922 fix
jitendrapurohit [Wed, 29 Jul 2015 05:01:22 +0000 (10:31 +0530)]
Minor Fix for CRM-16915
Eileen McNaughton [Wed, 29 Jul 2015 02:48:58 +0000 (14:48 +1200)]
CRM-16926 backoffice version of respecting payment_status_id
Eileen McNaughton [Wed, 29 Jul 2015 02:45:23 +0000 (14:45 +1200)]
enotice fix
Tim Otten [Wed, 29 Jul 2015 00:27:40 +0000 (17:27 -0700)]
Merge pull request #6319 from totten/4.6-composer-cxn
CRM-16917 - composer.json - Update civicrm-cxn-rpc
Tim Otten [Wed, 29 Jul 2015 00:22:37 +0000 (17:22 -0700)]
bower.json - Harden angular-file-upload version.
v1.1.7 introduced a breaking change to the file names, so we need to be
more cautious with this package.
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
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
Dave Greenberg [Tue, 28 Jul 2015 20:15:20 +0000 (13:15 -0700)]
Merge pull request #6330 from jitendrapurohit/CRM-16915
CRM-16915 - Filter Profile selector in Configure Event - Registration…
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.
jitendrapurohit [Tue, 28 Jul 2015 13:34:43 +0000 (19:04 +0530)]
CRM-16915 - Filter Profile selector in Configure Event - Registration tab for non-admin users
colemanw [Tue, 28 Jul 2015 13:33:01 +0000 (09:33 -0400)]
Merge pull request #6329 from colemanw/CRM-16903
CRM-16903 - add icons for translation on profile edition
samuelsov [Thu, 23 Jul 2015 19:13:02 +0000 (15:13 -0400)]
CRM-16903 - add icons for translation on profile edition
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
Eileen McNaughton [Tue, 28 Jul 2015 04:23:16 +0000 (16:23 +1200)]
CRM-16922 broken smart groups from participant_status_id
monishdeb [Tue, 28 Jul 2015 07:14:23 +0000 (12:44 +0530)]
CRM-16922 fix - Broken smart groups due to CRM-16858
https://issues.civicrm.org/jira/browse/CRM-16922
Monish Deb [Tue, 28 Jul 2015 06:18:18 +0000 (11:48 +0530)]
Merge pull request #6299 from monishdeb/4.6
CRM-16909 fix - "Find Pledges" search filters on "status" are not wor…
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.
Tim Otten [Tue, 28 Jul 2015 02:22:35 +0000 (19:22 -0700)]
CRM-16917 - composer.json - Update civicrm-cxn-rpc
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:10:20 +0000 (12:10 -0700)]
Merge pull request #6302 from colemanw/CRM-16908
CRM-16908 - Improve disabled buttons in mailing UI
Dave Greenberg [Mon, 27 Jul 2015 19:00:46 +0000 (12:00 -0700)]
Merge pull request #6296 from JMAConsulting/CRM-16187
Crm 16187
Pradeep Nayak [Mon, 27 Jul 2015 18:12:28 +0000 (23:42 +0530)]
--CRM-15187, Added warning message when membership type is changed
monishdeb [Mon, 27 Jul 2015 15:58:04 +0000 (21:28 +0530)]
minor fix for custom Select Field
monishdeb [Fri, 24 Jul 2015 14:42:26 +0000 (20:12 +0530)]
CRM-16909 fix - "Find Pledges" search filters on "status" are not working
https://issues.civicrm.org/jira/browse/CRM-16909
colemanw [Mon, 27 Jul 2015 15:28:31 +0000 (11:28 -0400)]
Merge pull request #6301 from colemanw/CRM-16905
CRM-16905 - Sort by count cannot be done with sql
projects / civicrm-core.git / log