Tim Otten [Wed, 30 Apr 2014 19:50:49 +0000 (12:50 -0700)]
CRM-14499 - ImageFile - Fix photo URL validation on WP
----------------------------------------
* CRM-14499: Upgrade to 4.4.5 causes contact photos to be unviewable
https://issues.civicrm.org/jira/browse/CRM-14499
Margaret Epps [Wed, 30 Apr 2014 01:47:36 +0000 (21:47 -0400)]
Redid indentation in CRM/Upgrade/Incremental/php/FourFour.php
Maggie [Tue, 29 Apr 2014 19:06:08 +0000 (15:06 -0400)]
CRM-14499: Update FourFour upgrade script and changes image urls to improve security but allow access
Maggie [Tue, 29 Apr 2014 16:44:52 +0000 (12:44 -0400)]
Rewrote system CRM_Utils_System::download to take optional disposition argument
Eileen McNaughton [Tue, 29 Apr 2014 01:07:30 +0000 (18:07 -0700)]
Merge pull request #3010 from eileenmcnaughton/CRM-14559
CRM-14559 fix invalid html
Eileen McNaughton [Tue, 29 Apr 2014 00:56:51 +0000 (17:56 -0700)]
CRM-14559 fix invalid html
Eileen McNaughton [Sun, 27 Apr 2014 23:10:18 +0000 (16:10 -0700)]
Merge pull request #2966 from eileenmcnaughton/patch-2
E-Notice fix
Eileen McNaughton [Sun, 27 Apr 2014 23:08:51 +0000 (16:08 -0700)]
Fix spaces on previous
Kurund Jalmi [Tue, 22 Apr 2014 22:08:34 +0000 (15:08 -0700)]
Merge pull request #2929 from kurund/CRM-14463
typo fixes, CRM-14463
kurund [Tue, 22 Apr 2014 22:07:10 +0000 (15:07 -0700)]
typo fixes, CRM-14463
----------------------------------------
* CRM-14463: Custom address fields can't search by location type
https://issues.civicrm.org/jira/browse/CRM-14463
colemanw [Tue, 22 Apr 2014 03:21:24 +0000 (20:21 -0700)]
Merge pull request #2925 from eileenmcnaughton/CRM-14501
CRM-14501 add contact to cache key to deal with inconsistent permissioning
Eileen McNaughton [Tue, 22 Apr 2014 00:02:30 +0000 (12:02 +1200)]
CRM-14501 add contact to cache key to deal with inconsistent permissioning
Eileen McNaughton [Tue, 22 Apr 2014 00:06:33 +0000 (12:06 +1200)]
remove trailing whitespace
CiviCRM [Fri, 18 Apr 2014 01:14:52 +0000 (18:14 -0700)]
Update version to 4.4.6
Kurund Jalmi [Thu, 17 Apr 2014 18:07:33 +0000 (11:07 -0700)]
Merge pull request #2888 from eileenmcnaughton/patch-3
E-notice fix
Kurund Jalmi [Thu, 17 Apr 2014 18:07:15 +0000 (11:07 -0700)]
Merge pull request #2901 from eileenmcnaughton/E-notice
enotices when enabling logging on fields that don't (yet) exist in the l...
Kurund Jalmi [Thu, 17 Apr 2014 18:06:23 +0000 (11:06 -0700)]
Merge pull request #2910 from eileenmcnaughton/enotice2
eNotice fix
Eileen McNaughton [Thu, 17 Apr 2014 09:32:55 +0000 (21:32 +1200)]
eNotice fix
Tim Otten [Thu, 17 Apr 2014 06:47:25 +0000 (23:47 -0700)]
Merge pull request #2908 from totten/4.4-restrict-customDir
customFileUploadDir - Restrict remote access
Tim Otten [Thu, 17 Apr 2014 00:23:50 +0000 (17:23 -0700)]
customFileUploadDir - Restrict remote access
Kurund Jalmi [Wed, 16 Apr 2014 22:17:07 +0000 (15:17 -0700)]
Merge pull request #2886 from colemanw/4.4
CRM-14463 - Fix custom address fields to support location type
Tim Otten [Wed, 16 Apr 2014 19:11:44 +0000 (12:11 -0700)]
Merge pull request #2907 from totten/4.4-date-const
CRM-14446 - s/magic value/constant/
Tim Otten [Wed, 16 Apr 2014 19:10:40 +0000 (12:10 -0700)]
CRM-14446 - s/magic value/constant/
Tim Otten [Wed, 16 Apr 2014 19:08:03 +0000 (12:08 -0700)]
Merge pull request #2860 from eileenmcnaughton/CRM-14446
CRM-14446 contact.get api tests + fix on date filters
Tim Otten [Wed, 16 Apr 2014 19:06:07 +0000 (12:06 -0700)]
Merge pull request #2882 from totten/4.4-module-payproc
CRM-14396 - CRM_Core_Payment::handlePaymentMethod
Dave Greenberg [Wed, 16 Apr 2014 02:16:05 +0000 (19:16 -0700)]
Merge pull request #2902 from kurund/CRM-14429
code clean / fixes CRM-14429
kurund [Wed, 16 Apr 2014 02:11:40 +0000 (19:11 -0700)]
code clean / fixes CRM-14429
----------------------------------------
* CRM-14429: Contact import fails silently on lookup of custom field option values by label
https://issues.civicrm.org/jira/browse/CRM-14429
Eileen McNaughton [Wed, 16 Apr 2014 01:35:23 +0000 (13:35 +1200)]
enotices when enabling logging on fields that don't (yet) exist in the log tables
Dave Greenberg [Tue, 15 Apr 2014 23:40:02 +0000 (16:40 -0700)]
Merge pull request #2899 from davecivicrm/CRM-14191
CRM-14191 - fix notice in FourFour.php upgrade.
Dave Greenberg [Tue, 15 Apr 2014 23:37:32 +0000 (16:37 -0700)]
CRM-14191 - fix notice in FourFour.php upgrade.
----------------------------------------
* CRM-14191:
https://issues.civicrm.org/jira/browse/CRM-14191
Dave Greenberg [Tue, 15 Apr 2014 23:27:01 +0000 (16:27 -0700)]
Merge pull request #2897 from pradpnayak/CRM-14191
-- removed hardcoded values, added sql upgrade script to handle civicrm_...
Dave Greenberg [Tue, 15 Apr 2014 21:35:28 +0000 (14:35 -0700)]
Merge pull request #2898 from davecivicrm/CRM-14467
CRM-14467 - remove extra double-quote which messes up case_id in change ...
Dave Greenberg [Tue, 15 Apr 2014 21:34:06 +0000 (14:34 -0700)]
CRM-14467 - remove extra double-quote which messes up case_id in change status URL.
----------------------------------------
* CRM-14467:
https://issues.civicrm.org/jira/browse/CRM-14467
Pradeep Nayak [Tue, 15 Apr 2014 21:25:34 +0000 (02:55 +0530)]
-- removed hardcoded values and handled reopened status. CRM-14191
----------------------------------------
* CRM-14191:
https://issues.civicrm.org/jira/browse/CRM-14191
Pradeep Nayak [Tue, 15 Apr 2014 19:10:52 +0000 (00:40 +0530)]
-- removed hardcoded values, added sql upgrade script to handle civicrm_batch.status_id, CRM-14191
----------------------------------------
* CRM-14191: There are 3 options with value=0 in option group "batch_status"
https://issues.civicrm.org/jira/browse/CRM-14191
dlobo [Tue, 15 Apr 2014 14:15:49 +0000 (07:15 -0700)]
Merge pull request #2786 from ar-jan/CRM-13946
CRM-13946: Backport PR #2185: set default database connection to UTF-8
Eileen McNaughton [Mon, 14 Apr 2014 03:36:30 +0000 (15:36 +1200)]
E-notice fix
Coleman Watts [Sun, 13 Apr 2014 23:28:35 +0000 (19:28 -0400)]
CRM-14463 - Fix custom address fields to support location type
dlobo [Fri, 11 Apr 2014 23:46:51 +0000 (16:46 -0700)]
Merge pull request #2869 from kurund/CRM-14438
CRM-14438 and CRM-13996 fix to populate prev/next cache when sorting in ...
Tim Otten [Fri, 11 Apr 2014 23:15:31 +0000 (16:15 -0700)]
Merge pull request #2883 from totten/4.4-lazy-session
CRM-14356 - CRM_Core_Session - Handle Drupal's lazy sessions
Tim Otten [Fri, 11 Apr 2014 22:59:30 +0000 (15:59 -0700)]
CRM-14356 - CRM_Core_Session - Guard against unset value
Tim Otten [Fri, 11 Apr 2014 22:22:01 +0000 (15:22 -0700)]
CRM-14356 - CRM_Core_Session - Handle Drupal's lazy sessions
This is Ken's original patch from
http://forum.civicrm.org/index.php/topic,31800.msg136249.html
Tim Otten [Fri, 11 Apr 2014 21:54:33 +0000 (14:54 -0700)]
CRM-14396 - CRM_Core_Payment::handlePaymentMethod - Don't leak $paymentClass
across iterations of while()
Tim Otten [Fri, 11 Apr 2014 21:48:47 +0000 (14:48 -0700)]
CRM-14396 - CRM_Core_Payment::handlePaymentMethod - Fix 'not found' error
There are two ways to locate handler class -- one via isExtensionKey() and
one via "CRM_Core_{$className}". Prior to this patch, the error would arise
even if a class was located via "CRM_Core_{$className}".
Dave Greenberg [Thu, 10 Apr 2014 20:38:44 +0000 (13:38 -0700)]
Merge pull request #2875 from davecivicrm/CRM-14451
CRM-14451 - remove undefined / un-used variable.
Dave Greenberg [Thu, 10 Apr 2014 20:37:16 +0000 (13:37 -0700)]
CRM-14451 - remove undefined / un-used variable.
----------------------------------------
* CRM-14451:
https://issues.civicrm.org/jira/browse/CRM-14451
Dave Greenberg [Thu, 10 Apr 2014 19:41:30 +0000 (12:41 -0700)]
Merge pull request #2870 from kurund/CRM-14352
fixes for duplicate relationship error, CRM-14352
dlobo [Thu, 10 Apr 2014 17:33:11 +0000 (10:33 -0700)]
Merge pull request #2858 from totten/4.4-wp-breadcrumb-cacheclear
CRM-14439 - Fix WP breadcrumbs by forcibly pre-computing them with "wp-admin/admin.php"
dlobo [Thu, 10 Apr 2014 17:32:35 +0000 (10:32 -0700)]
Merge pull request #2859 from totten/4.4-wp-breadcrumb-forceBackend
CRM-14439 - Fix WP breadcrumbs by setting forceBackend=1 and consistently respecting that option
dlobo [Thu, 10 Apr 2014 17:26:39 +0000 (10:26 -0700)]
Merge pull request #2833 from lcdservices/CRM-14208b
CRM-14208 additional includes for J3.2.1+
kurund [Thu, 10 Apr 2014 04:31:36 +0000 (21:31 -0700)]
fixes for duplicate relationship error, CRM-14352
----------------------------------------
* CRM-14352: Fatal error: Relationship already exists when contact with duplicate relationships registers for an event
https://issues.civicrm.org/jira/browse/CRM-14352
Eileen McNaughton [Thu, 10 Apr 2014 01:09:46 +0000 (13:09 +1200)]
eNotice fix
kurund [Wed, 9 Apr 2014 21:45:51 +0000 (14:45 -0700)]
CRM-14438 and CRM-13996 fix to populate prev/next cache when sorting in advanced search using profile search view
----------------------------------------
* CRM-14438: Can't select contact records from custom search profile when sorted by Current Employer
https://issues.civicrm.org/jira/browse/CRM-14438
* CRM-13996: Advanced Search; Sorting of Results displayed in a custom profile fails and Advanced Search must be reset
https://issues.civicrm.org/jira/browse/CRM-13996
Dave Greenberg [Wed, 9 Apr 2014 20:36:57 +0000 (13:36 -0700)]
Merge pull request #2867 from davecivicrm/CRM-14450
CRM-14450 - fix notice on additional participants form.
Dave Greenberg [Wed, 9 Apr 2014 20:34:57 +0000 (13:34 -0700)]
CRM-14450 - fix notice on additional participants form.
----------------------------------------
* CRM-14450:
https://issues.civicrm.org/jira/browse/CRM-14450
Kurund Jalmi [Wed, 9 Apr 2014 19:07:51 +0000 (12:07 -0700)]
Merge pull request #2866 from davecivicrm/CRM-14442
CRM-14442 - prevent presence of Direct Debit (payment_type=2) payment pr...
Dave Greenberg [Wed, 9 Apr 2014 19:05:27 +0000 (12:05 -0700)]
CRM-14442 - prevent presence of Direct Debit (payment_type=2) payment processors from breaking the back-office Submit Credit Card Contribution form.
----------------------------------------
* CRM-14442:
https://issues.civicrm.org/jira/browse/CRM-14442
Eileen McNaughton [Wed, 9 Apr 2014 05:22:43 +0000 (17:22 +1200)]
CRM-14446 contact api.getfields declare birth_date & deceased_date high low filters so they will accept strtotime strings
----------------------------------------
* CRM-14446:
https://issues.civicrm.org/jira/browse/CRM-14446
Eileen [Wed, 9 Apr 2014 03:57:51 +0000 (03:57 +0000)]
CRM-14446 contact.get api tests + fix on date filters
----------------------------------------
* CRM-14446: Contact.get api - birth_date & deceased_date fixes
https://issues.civicrm.org/jira/browse/CRM-14446
Kurund Jalmi [Wed, 9 Apr 2014 04:04:14 +0000 (21:04 -0700)]
Merge pull request #2843 from kurund/CRM-14427
CRM-14427
Tim Otten [Wed, 9 Apr 2014 03:03:40 +0000 (20:03 -0700)]
CRM_Utils_System_WordPress::url - Simplify deep if/else/string-concatenation. Fix forceBackend.
Tim Otten [Wed, 9 Apr 2014 00:41:18 +0000 (17:41 -0700)]
CRM_Utils_System_WordPress::url - Change code-branch for case "!isset($path)&&!isset($query)"
Tim Otten [Tue, 8 Apr 2014 23:46:10 +0000 (16:46 -0700)]
CRM_Utils_System_WordPress::url - Change code-branch for caes "isset($path)&&isset($query)"
In the other usages of $script and $base, there's a decision to use $script XOR $base as the effective
base-URL. However, in this branch, the values are concatenated to form the effective base-URL -- which
shouldn't produce a valid base-URL. (Note: In this context, we're evaluating conditons of isset($path) and
isset($query) which should have no bearing on the validity of $script or $base as a base-URL.)
Brian Shaughnessy [Wed, 9 Apr 2014 01:34:08 +0000 (21:34 -0400)]
CRM-14208 move joomlaBase outside of condition clause
Dave Greenberg [Wed, 9 Apr 2014 01:05:59 +0000 (18:05 -0700)]
Merge pull request #2835 from lcdservices/CRM-14334
CRM-14334 merge records: allow empty value to overwrite existing value
Tim Otten [Tue, 8 Apr 2014 23:23:00 +0000 (16:23 -0700)]
CRM-14439 - CRM_Core_Invoke::rebuildMenuAndCaches - Change order
Currently, CRM_Core_Menu::store() truncates "civicrm_menu" and then refills
it; then, CRM_Core_Config::clearCaches (by-way-of clearDBCache) truncates
"civicrm_menu" without refilling. This seems pointless. (For CRM-14439,
this has the effect of producing an empty menu table after running setup.sh
-- so the table is eventually filled at some uncontrolled future point.)
The evident intent of "rebuildMenuAndCaches" is to truncate and then refill
the table, so this patch does that.
----------------------------------------
* CRM-14439: WP demo - Access denied when visiting breadcrumb links from field listing
https://issues.civicrm.org/jira/browse/CRM-14439
Tim Otten [Tue, 8 Apr 2014 23:21:32 +0000 (16:21 -0700)]
CRM-14439 - CRM_Core_Menu - For breadcrumbs, set forceBackend=1
----------------------------------------
* CRM-14439: WP demo - Access denied when visiting breadcrumb links from field listing
https://issues.civicrm.org/jira/browse/CRM-14439
Dave Greenberg [Tue, 8 Apr 2014 20:20:16 +0000 (13:20 -0700)]
Merge pull request #2855 from mlutfy/4.4-crm14444
CRM-14444: templates/CRM/Report/Form/Layout/Table.tpl: right-align report cells that are T_FLOAT.
Mathieu Lutfy [Tue, 8 Apr 2014 19:57:54 +0000 (15:57 -0400)]
CRM-14444: templates/CRM/Report/Form/Layout/Table.tpl: right-align report cells that are T_FLOAT.
dlobo [Tue, 8 Apr 2014 19:15:45 +0000 (12:15 -0700)]
Merge pull request #2854 from dlobo/CRM-14390
CRM-14390 - Inherit CMS language don't work in WordPress
Donald A. Lobo [Tue, 8 Apr 2014 19:14:16 +0000 (12:14 -0700)]
CRM-14390 - Inherit CMS language don't work in WordPress
https://issues.civicrm.org/jira/browse/CRM-14390
Kurund Jalmi [Tue, 8 Apr 2014 17:20:29 +0000 (10:20 -0700)]
Merge pull request #2851 from kurund/CRM-14393
fixes for CRM-14393
kurund [Tue, 8 Apr 2014 17:19:35 +0000 (10:19 -0700)]
fixes for CRM-14393
----------------------------------------
* CRM-14393: State not showing in advanced search
https://issues.civicrm.org/jira/browse/CRM-14393
Dave Greenberg [Tue, 8 Apr 2014 16:50:28 +0000 (09:50 -0700)]
Merge pull request #2848 from eileenmcnaughton/CRM-14389
CRM-14389 membership api - add test for fix + alter to 'correct fix'
Eileen [Tue, 8 Apr 2014 12:17:34 +0000 (12:17 +0000)]
CRM-14389 membership api - add test for fix
----------------------------------------
* CRM-14389: Get memberships api ignores membership_type_id if contact_id is present
https://issues.civicrm.org/jira/browse/CRM-14389
Tim Otten [Tue, 8 Apr 2014 05:11:11 +0000 (22:11 -0700)]
Merge pull request #2844 from totten/4.4-handlePaymentNotification
CRM-14396 - add module extension support to handlePaymentNotification
Eileen McNaughton [Thu, 27 Mar 2014 00:38:14 +0000 (13:38 +1300)]
CRM-14396 - add module extension support to handlePaymentNotification
kurund [Tue, 8 Apr 2014 00:43:27 +0000 (17:43 -0700)]
notice fixes
kurund [Tue, 8 Apr 2014 00:14:16 +0000 (17:14 -0700)]
fix for CRM-14427
----------------------------------------
* CRM-14427: PCP account creation fails if contact already exists
https://issues.civicrm.org/jira/browse/CRM-14427
kurund [Mon, 7 Apr 2014 23:19:50 +0000 (16:19 -0700)]
notice fixes
Kurund Jalmi [Mon, 7 Apr 2014 22:30:10 +0000 (15:30 -0700)]
Merge pull request #2840 from kurund/git-hook-fixes
commit hook fixes
kurund [Mon, 7 Apr 2014 22:26:11 +0000 (15:26 -0700)]
commit hook fixes
colemanw [Mon, 7 Apr 2014 22:13:29 +0000 (18:13 -0400)]
Merge pull request #2838 from eileenmcnaughton/CRM-14419
Crm 14220 & CRM-14419 api enotice fix & extra param + e-notice
dlobo [Mon, 7 Apr 2014 21:16:33 +0000 (14:16 -0700)]
Merge pull request #2743 from eileenmcnaughton/CRM-14319-mini-fix
CRM-14319 - alter job api to not limit scheduled reminders
Eileen McNaughton [Mon, 7 Apr 2014 05:49:42 +0000 (17:49 +1200)]
E-notice fix, next_sched_contribution
Field was renamed to reflect in built handling around suffix '_date' but this instance missed
Eileen McNaughton [Thu, 3 Apr 2014 10:39:21 +0000 (23:39 +1300)]
CRM-14420 - api contribution.completetransaction should accept 'trxn_id' as a param
Eileen McNaughton [Thu, 3 Apr 2014 08:13:06 +0000 (21:13 +1300)]
CRM-14419 - e-notice on activity.getcount when contact_id is not passed in
dlobo [Mon, 7 Apr 2014 21:02:01 +0000 (14:02 -0700)]
Merge pull request #2805 from rnao/CRM-14389
CRM-14389 - CiviMember API - Fixes a membership get API regression that ...
Brian Shaughnessy [Mon, 7 Apr 2014 19:11:49 +0000 (15:11 -0400)]
CRM-14334 merge records: allow empty value to overwrite existing value
Brian Shaughnessy [Mon, 7 Apr 2014 14:31:53 +0000 (10:31 -0400)]
CRM-14208 additional includes for J3.2.1+
Tim Otten [Fri, 4 Apr 2014 07:48:17 +0000 (00:48 -0700)]
Merge pull request #2820 from totten/4.4-tz-opt
CRM-14423 - CiviUnitTestCase - Only run env checks, not security checks, during unit-tests.
Tim Otten [Fri, 4 Apr 2014 07:39:03 +0000 (00:39 -0700)]
CRM-14423 - CiviUnitTestCase - Only run env checks, not security checks, during unit-tests.
The security checks are more I/O intensive.
Tim Otten [Fri, 4 Apr 2014 07:08:17 +0000 (00:08 -0700)]
Merge pull request #2819 from totten/4.4-tz-alert
CRM-14423 - Alert admins/developers if env is misconfigured
Tim Otten [Fri, 4 Apr 2014 05:16:10 +0000 (22:16 -0700)]
CRM-14423 - Run env checks before executing tests
Tim Otten [Fri, 4 Apr 2014 04:37:58 +0000 (21:37 -0700)]
CRM-14423 - CRM_Utils_Check_Env - Add check for other environmental configuration issues
Tim Otten [Fri, 4 Apr 2014 04:36:48 +0000 (21:36 -0700)]
CRM-14423 - Extract class CRM_Utils_Check from CRM_Utils_Check_Security
colemanw [Thu, 3 Apr 2014 19:34:35 +0000 (15:34 -0400)]
Merge pull request #2812 from eileenmcnaughton/CRM-14220
Crm 14220 & CRM-14419 api enotice fix & extra param
Dave Greenberg [Thu, 3 Apr 2014 17:26:25 +0000 (10:26 -0700)]
Merge pull request #2810 from pratik-joshi/crm-14379-fix
CRM-14379
Eileen McNaughton [Thu, 3 Apr 2014 08:13:06 +0000 (21:13 +1300)]
CRM-14419 - e-notice on activity.getcount when contact_id is not passed in
Eileen McNaughton [Thu, 3 Apr 2014 10:39:21 +0000 (23:39 +1300)]
CRM-14420 - api contribution.completetransaction should accept 'trxn_id' as a param
projects / civicrm-core.git / log