Yashodha Chaku [Fri, 12 Sep 2014 13:17:05 +0000 (18:47 +0530)]
Merge pull request #4099 from atif-shaikh/CRM-15240
CRM-15240
colemanw [Fri, 12 Sep 2014 01:57:37 +0000 (21:57 -0400)]
Merge pull request #4105 from colemanw/CRM-15286
CRM-15286 - Set correct payment instrument in api contribution.transact
Coleman Watts [Fri, 12 Sep 2014 01:44:16 +0000 (21:44 -0400)]
CRM-15286 - Set correct payment instrument in api contribution.transact
atif-shaikh [Thu, 11 Sep 2014 13:57:35 +0000 (19:27 +0530)]
CRM-15240
Kurund Jalmi [Tue, 9 Sep 2014 10:22:14 +0000 (15:52 +0530)]
Merge pull request #4076 from totten/4.4-redact-version
CRM-15248 - footer.tpl - For front-end users, redact point-release.
Tim Otten [Tue, 9 Sep 2014 10:11:57 +0000 (03:11 -0700)]
CRM-15248 - Tweak formatting
Kurund Jalmi [Tue, 9 Sep 2014 06:34:14 +0000 (12:04 +0530)]
Merge pull request #4078 from totten/4.4-ajax-validate
CRM-15247 - AJAX Fixups
Tim Otten [Tue, 9 Sep 2014 04:20:44 +0000 (21:20 -0700)]
CRM-15248 - footer.tpl - For front-end users, redact point-release.
On one hand, giving a precise version can help attackers match their targets
with exploits. On the other hand, giving some kind of version indication is
useful for support and marketing. This PR attempts to balance the interests
by giving a precise version ("Powered by CiviCRM 4.4.6") to users with
permission "access CiviCRM" while giving a coarse-version ("Powered by
CiviCRM 4.4") to anyone else.
Tim Otten [Sat, 6 Sep 2014 06:47:51 +0000 (23:47 -0700)]
CRM-15247 - CRM_Contact_Page_AJAX::autocomplete - Require a token
Tim Otten [Sat, 6 Sep 2014 06:11:23 +0000 (23:11 -0700)]
CRM-15247 - CRM_Contact_Page_AJAX::checkUserName - Require a token before checking username
The use-case for this function: when a new constituent signs up for a user
account, we give advice on whether the username is available.
Unfortunately, attackers can use that functionality to scan the list of
usernames. There's no protection from a motivated attacker (except to
disable new signups).
This patch aims to mitigate the problem in two ways:
- For sites which don't allow user signups, the scanning won't work (b/c
attackers can't obtain a token).
- For sites which do allow signups, scanning requires more work
(to obtain & refresh tokens).
Tim Otten [Sat, 6 Sep 2014 05:03:00 +0000 (22:03 -0700)]
CRM-15247 - CRM_Contact_Page_AJAX::getContactEmail - Validate inputs
Tim Otten [Sat, 6 Sep 2014 01:13:57 +0000 (18:13 -0700)]
Merge pull request #4062 from totten/4.4-setupsh-dbport
(Backport) Added support for non-default MySQL host and port.
Peter Haight [Thu, 2 Jan 2014 00:10:21 +0000 (16:10 -0800)]
Added support for non-default MySQL host and port.
When I run tests over the MySQL RAM server, I'm usually running the MySQL RAM
server on a different port and I need this script in order to get that all
working in civicrm-project.
Eileen McNaughton [Thu, 4 Sep 2014 01:50:56 +0000 (13:50 +1200)]
Merge pull request #4035 from eileenmcnaughton/CRM-14824
CRM-14824 fix intemittant bug on priceset processing
Eileen McNaughton [Thu, 4 Sep 2014 01:45:31 +0000 (13:45 +1200)]
Merge pull request #4019 from eileenmcnaughton/CRM-14877
ACL's not working correctly for select all options in export, CRM-14877
Dave Greenberg [Wed, 3 Sep 2014 17:49:36 +0000 (10:49 -0700)]
Merge pull request #4033 from totten/4.4-admin-forcebackend
CRM-14973 - CRM_Core_Menu::buildAdminLinks - Force backend URLs
Eileen McNaughton [Mon, 9 Jun 2014 14:10:19 +0000 (02:10 +1200)]
CRM-14824 fix intemittant bug on priceset processing
Tim Otten [Wed, 3 Sep 2014 04:39:47 +0000 (21:39 -0700)]
CRM-14973 - CRM_Core_Menu::buildAdminLinks - Force backend URLs
----------------------------------------
* CRM-14973: Administration console does not work in WordPress
https://issues.civicrm.org/jira/browse/CRM-14973
Dave Greenberg [Tue, 2 Sep 2014 23:43:48 +0000 (16:43 -0700)]
Merge pull request #4018 from eileenmcnaughton/tidy-ups
test tidy up - put expected & actual in correct order
Dave Greenberg [Tue, 2 Sep 2014 20:34:09 +0000 (13:34 -0700)]
Merge pull request #4020 from monishdeb/CRM-15103
CRM-15103 fix - Priceset for memberships on contribution-page not working
Coleman Watts [Mon, 1 Sep 2014 21:58:52 +0000 (22:58 +0100)]
Fix undefined index warning
Conflicts:
CRM/Grant/BAO/Grant.php
monishdeb [Tue, 2 Sep 2014 07:56:57 +0000 (13:26 +0530)]
indentation fix
monishdeb [Tue, 2 Sep 2014 07:56:08 +0000 (13:26 +0530)]
Additional fix
monishdeb [Tue, 2 Sep 2014 07:39:09 +0000 (13:09 +0530)]
CRM-15103 fix - Priceset for memberships on contribution-page not working
https://issues.civicrm.org/jira/browse/CRM-15103
kurund [Sat, 5 Jul 2014 13:28:32 +0000 (18:58 +0530)]
ACL's not working correctly for select all options in export, CRM-14877
----------------------------------------
* CRM-14877: users bypass ACLs when exporting
https://issues.civicrm.org/jira/browse/CRM-14877
Eileen McNaughton [Tue, 2 Sep 2014 01:57:23 +0000 (13:57 +1200)]
test tidy up - put expected & actual in correct order
colemanw [Mon, 1 Sep 2014 15:49:14 +0000 (16:49 +0100)]
Merge pull request #4009 from eileenmcnaughton/CRM-15210
CRM-15210 fix fatal on merge exports of non primary addresses
colemanw [Mon, 1 Sep 2014 15:46:11 +0000 (16:46 +0100)]
Merge pull request #4011 from eileenmcnaughton/CRM-15213
CRM-15213 fix spelling of renewal
colemanw [Mon, 1 Sep 2014 13:42:37 +0000 (14:42 +0100)]
Merge pull request #4013 from colemanw/CRM-15215
CRM-15215 - Fix api address validation
Coleman Watts [Mon, 1 Sep 2014 12:50:06 +0000 (13:50 +0100)]
CRM-15215 - Fix api address validation
Eileen McNaughton [Mon, 1 Sep 2014 04:21:31 +0000 (16:21 +1200)]
CRM-15213 fix spelling of renewal
Eileen McNaughton [Mon, 1 Sep 2014 02:18:11 +0000 (14:18 +1200)]
CRM-15210 fix fatal on merge exports of non primary addresses
The relationship check is preventing the fields from being transformed
to the correct field names in contacts not-to-be-merged
The possibility of the object not existing is adequately handled further down in the
function. The check was added during svn-days but after 4.2.4
I no longer seem to be able to access what commit introduced it
Dave Greenberg [Sat, 30 Aug 2014 17:18:57 +0000 (10:18 -0700)]
Merge pull request #3883 from eileenmcnaughton/CRM-14398
CRM-14398 fix campaign in exports
Eileen McNaughton [Fri, 29 Aug 2014 04:55:11 +0000 (16:55 +1200)]
CRM-14398 ... export issues
Tim Otten [Thu, 28 Aug 2014 05:20:56 +0000 (22:20 -0700)]
Merge pull request #3979 from eileenmcnaughton/CRM-15196
CRM-15196 mysql 5.6 is too strict on altering columns which have fks
Tim Otten [Thu, 28 Aug 2014 00:42:03 +0000 (17:42 -0700)]
Merge pull request #3975 from totten/4.4-win-check
CRM-15163 - CRM_Utils_Check_Security - Windows support
Eileen McNaughton [Wed, 27 Aug 2014 23:37:49 +0000 (11:37 +1200)]
CRM-15196 mysql 5.6 is too strict on altering columns which have fks
Tim Otten [Wed, 27 Aug 2014 22:13:17 +0000 (15:13 -0700)]
CRM-15163 - CRM_Utils_Check_Security - Windows support
On Windows-PHP setups, paths may have a mix of back-slashes and
forward-slashes. For this security check, we'll normalize to
forward-slashses to simplify the path manipulation.
Eileen McNaughton [Mon, 25 Aug 2014 12:22:58 +0000 (00:22 +1200)]
CRM-14398 supplementary fix campaign in exports
Kurund Jalmi [Sun, 24 Aug 2014 13:38:11 +0000 (19:08 +0530)]
Merge pull request #3920 from kurund/CRM-15133
fixes for CRM-15133
kurund [Sun, 24 Aug 2014 13:36:35 +0000 (19:06 +0530)]
fixes for CRM-15133
----------------------------------------
* CRM-15133: Do not display upgrade reminder in footer if versionAlert is false
https://issues.civicrm.org/jira/browse/CRM-15133
Kurund Jalmi [Sun, 24 Aug 2014 13:28:00 +0000 (18:58 +0530)]
Merge pull request #3919 from kurund/CRM-12772
fixed wrong merge forward, CRM-12772
kurund [Sun, 24 Aug 2014 13:26:47 +0000 (18:56 +0530)]
fixed merge forward, CRM-12772
----------------------------------------
* CRM-12772: Member Report (Detail) locks in DB with large membership/contribution sets
https://issues.civicrm.org/jira/browse/CRM-12772
Dave Greenberg [Fri, 22 Aug 2014 01:01:17 +0000 (18:01 -0700)]
Merge pull request #3837 from eileenmcnaughton/CRM-15113
CRM-15113 don't redirect to server killing screen after marking dedupe
Dave Greenberg [Wed, 20 Aug 2014 23:46:30 +0000 (16:46 -0700)]
Merge pull request #3877 from eileenmcnaughton/CRM-15148
Crm 15148
Eileen McNaughton [Wed, 20 Aug 2014 22:19:04 +0000 (10:19 +1200)]
CRM-15148 make core ACL test incomplete as the security fix for CRM-14877 is not in 4.4
Eileen McNaughton [Wed, 20 Aug 2014 04:14:00 +0000 (16:14 +1200)]
CRM-14398 fix campaign in exports
Eileen McNaughton [Tue, 19 Aug 2014 23:42:41 +0000 (11:42 +1200)]
CRM-15148 fix api to pass check_permissions
this results in core acls but NOT hook acls being applied IF check_permissions=1
prior to this patch core acls but NOT hook acls were applied even if check_permissions =0
Eileen McNaughton [Tue, 19 Aug 2014 23:40:57 +0000 (11:40 +1200)]
CRM-15148 add tests to check impact of ACLs on contributions
testEntitiesGetCoreACLLimitingHookNoCheck fails without the commit to the api file
(next commit)
reinstate deleted functions
Eileen McNaughton [Fri, 31 Jan 2014 05:10:04 +0000 (18:10 +1300)]
ACL Core, add a way for unit tests to flush in-function cache
Eileen McNaughton [Fri, 31 Jan 2014 05:15:54 +0000 (18:15 +1300)]
test fix Only variables should be assigned by reference
/var/www/drupal/sites/default/modules/civicrm/civicrm-core/CRM/ACL/BAO/ACL.php:541
Eileen McNaughton [Fri, 31 Jan 2014 05:21:09 +0000 (18:21 +1300)]
Add function to set up an ACL for a test
Dave Greenberg [Tue, 19 Aug 2014 17:32:43 +0000 (10:32 -0700)]
Merge pull request #3873 from jitendrapurohit/CRM-15096
CRM-15096
Jitendra Purohit [Tue, 19 Aug 2014 07:25:03 +0000 (12:55 +0530)]
CRM-15096
Yashodha Chaku [Mon, 18 Aug 2014 12:19:22 +0000 (17:49 +0530)]
Merge pull request #3867 from yashodha/4.4.CRM-15073
CRM-15073 : fix overwrite of subtype for onbehalf org
Yashodha Chaku [Mon, 18 Aug 2014 12:17:26 +0000 (17:47 +0530)]
Merge pull request #3866 from yashodha/4.4
CRM-15090: fix name when adding dashlet
CiviCRM [Mon, 18 Aug 2014 04:09:11 +0000 (09:39 +0530)]
CRM-15073 : fix overwrite of subtype for onbehalf org
CiviCRM [Mon, 18 Aug 2014 03:16:53 +0000 (08:46 +0530)]
CRM-15090: fix name when adding dashlet
Dave Greenberg [Thu, 14 Aug 2014 23:32:19 +0000 (16:32 -0700)]
Merge pull request #3831 from eileenmcnaughton/CRM-15105
Crm 15105
Eileen McNaughton [Wed, 13 Aug 2014 23:19:28 +0000 (11:19 +1200)]
CRM-15113 - adding a refresh where the redirect would otherwise be causes the user to wind up back on the search page and to get the alert
Eileen McNaughton [Wed, 13 Aug 2014 23:18:17 +0000 (11:18 +1200)]
CRM-15113 don't redirect if rgid is not filled in - otherwise you wind up at an unfiltered dedupe calculation screen
Eileen [Wed, 13 Aug 2014 01:47:10 +0000 (01:47 +0000)]
CRM-15105 fix for erroneous setting of status
Vagrant User [Wed, 13 Aug 2014 01:43:13 +0000 (01:43 +0000)]
CRM-15105 add test to demonstrate + fix other tests to use
create rather than update so we are not encouraging use of update action
colemanw [Mon, 11 Aug 2014 15:26:17 +0000 (16:26 +0100)]
Merge pull request #3785 from eileenmcnaughton/CRM-15075
CRM-15075 fatal on membership renew with long text (plus this line seems...
Kurund Jalmi [Fri, 8 Aug 2014 04:38:46 +0000 (10:08 +0530)]
Merge pull request #3797 from pradpnayak/CRM-15082
-- CRM-15082, changed the function name
Kurund Jalmi [Fri, 8 Aug 2014 04:33:35 +0000 (10:03 +0530)]
Merge pull request #3801 from kurund/CRM-12722
CRM-12722, added fixed that was missed during forward merging from 4.3 t...
kurund [Fri, 8 Aug 2014 04:32:18 +0000 (10:02 +0530)]
CRM-12722, added fixed that was missed during forward merging from 4.3 to 4.4
----------------------------------------
* CRM-12722: Group page only shows 25 child groups
https://issues.civicrm.org/jira/browse/CRM-12722
Tim Otten [Thu, 7 Aug 2014 23:29:50 +0000 (16:29 -0700)]
Merge pull request #3800 from mlutfy/4.4-crm15086
CRM-15086: remove {ts} on a few civicrm_option_value.name strings
Mathieu Lutfy [Thu, 7 Aug 2014 22:24:31 +0000 (18:24 -0400)]
CRM-15086: remove {ts} on civicrm_option_value.name strings for: default conference slots, default batch type and default batch statuses.
Pradeep Nayak [Thu, 7 Aug 2014 16:43:36 +0000 (22:13 +0530)]
-- CRM-15082, changed the function name
----------------------------------------
* CRM-15082: WSOD on advanced search when proximity search is performed
https://issues.civicrm.org/jira/browse/CRM-15082
Eileen McNaughton [Tue, 5 Aug 2014 23:43:32 +0000 (11:43 +1200)]
CRM-15075 fatal on membership renew with long text (plus this line seems just BAD)
colemanw [Fri, 1 Aug 2014 14:49:49 +0000 (15:49 +0100)]
Merge pull request #3775 from colemanw/file
CRM-15068 - Add api support for custom file fields
Coleman Watts [Fri, 1 Aug 2014 14:49:08 +0000 (15:49 +0100)]
CRM-15068 - Add api support for custom file fields
Dave Greenberg [Tue, 29 Jul 2014 19:14:02 +0000 (12:14 -0700)]
Merge pull request #3752 from colemanw/wr
CRM-15056 - Workaround for civicrm_worldregion bug in search builder
Coleman Watts [Tue, 29 Jul 2014 18:59:52 +0000 (19:59 +0100)]
CRM-15056 - Workaround for civicrm_worldregion bug in search builder
colemanw [Tue, 29 Jul 2014 13:41:54 +0000 (14:41 +0100)]
Merge pull request #3748 from colemanw/relMemberApi
CRM-13652 - Fix relationship api to process related memberships
Kurund Jalmi [Tue, 29 Jul 2014 10:48:07 +0000 (16:18 +0530)]
Merge pull request #3744 from yashodha/CRM-15032
CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding
Kurund Jalmi [Tue, 29 Jul 2014 10:48:01 +0000 (16:18 +0530)]
Merge pull request #3737 from yashodha/4.4
CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding
Coleman Watts [Tue, 29 Jul 2014 10:23:28 +0000 (11:23 +0100)]
CRM-13652 - Fix relationship api to process related memberships
CiviCRM [Tue, 29 Jul 2014 06:40:42 +0000 (12:10 +0530)]
CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding
Dave Greenberg [Mon, 28 Jul 2014 23:03:35 +0000 (16:03 -0700)]
Merge pull request #3741 from davecivicrm/CRM-14997
CRM-14997 - fix regression that caused Add Contacts to Group button to b...
Dave Greenberg [Mon, 28 Jul 2014 23:02:22 +0000 (16:02 -0700)]
CRM-14997 - fix regression that caused Add Contacts to Group button to be ALWAYS hidden.
----------------------------------------
* CRM-14997:
https://issues.civicrm.org/jira/browse/CRM-14997
CiviCRM [Mon, 28 Jul 2014 10:19:47 +0000 (15:49 +0530)]
CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding
Kurund Jalmi [Wed, 16 Jul 2014 07:18:33 +0000 (12:48 +0530)]
Merge pull request #3538 from totten/4.4-wordrep
CRM-14224 - CRM_Upgrade_Incremental_php_FourFour - Fix isValidWordReplacement()
Kurund Jalmi [Wed, 16 Jul 2014 07:15:09 +0000 (12:45 +0530)]
Merge pull request #3670 from monishdeb/CRM-14888
CRM-14888 fix - historical smart groups with membership status break on ...
Dave Greenberg [Wed, 16 Jul 2014 00:00:21 +0000 (17:00 -0700)]
Merge pull request #3671 from agh1/contrib-date-sort
CRM-14991 CiviContribute: add sort by date to contrib detail report
Tim Otten [Tue, 15 Jul 2014 20:39:45 +0000 (13:39 -0700)]
Merge pull request #3660 from totten/4.4-imgsize
CRM-14971 - Fix resizing of contact images
Andrew Hunt [Tue, 15 Jul 2014 17:59:30 +0000 (13:59 -0400)]
CRM-14991 CiviContribute: add sort by date to contrib detail report
----------------------------------------
* CRM-14991: Sort contribution detail report by contribution date
https://issues.civicrm.org/jira/browse/CRM-14991
monishdeb [Tue, 15 Jul 2014 17:09:15 +0000 (22:39 +0530)]
CRM-14888 fix - historical smart groups with membership status break on upgrade to 4.4
https://issues.civicrm.org/jira/browse/CRM-14888
Eileen McNaughton [Tue, 15 Jul 2014 04:43:20 +0000 (16:43 +1200)]
Merge pull request #3664 from eileenmcnaughton/CRM-14986
CRM-14986 add function comments as pointer as to why isoToDate fn may be...
Eileen McNaughton [Tue, 15 Jul 2014 04:35:48 +0000 (16:35 +1200)]
CRM-14986 add function comments as pointer as to why isoToDate fn may be over-used
Eileen McNaughton [Tue, 15 Jul 2014 04:27:10 +0000 (16:27 +1200)]
Merge pull request #3663 from eileenmcnaughton/CRM-14986
CRM-14986 fix DB error on date find + save
Eileen McNaughton [Tue, 15 Jul 2014 03:33:03 +0000 (15:33 +1200)]
CRM-14986 fix DB error on date find + save
this is manefesting in the failure to save contributions, however, it has been a recurrent problem
that the format used for date fields on ->find does not match the requirement of ->save
hence we see in the ContributionRecur class 3 lines like
->modified_date = CRM_Utils_Date::isoToMysql(->modified_date);
which exist simply to format the date fields for re-save.
The end_date & next_scheduled_date were missed - resulting in fatals when this function
is used
It seems kind of crazy to keep solving this problem in the form & BAO layer
so this commit is tests only & there is a commit on the packages dir
that alters the DAO->update fn to check for the presence of a '-' & do the isoToMysql there
instead.
Tim Otten [Tue, 15 Jul 2014 00:08:19 +0000 (17:08 -0700)]
CRM-14971 - Fix resizing of contact images
----------------------------------------
* CRM-14971: Contact image URLs broken in WordPress after upgrade to 4.4.6
https://issues.civicrm.org/jira/browse/CRM-14971
Tim Otten [Mon, 14 Jul 2014 23:11:32 +0000 (16:11 -0700)]
Merge pull request #3647 from totten/4.4-wp-images
CRM-14971 - Contact image URLs should go through WP frontend
Kurund Jalmi [Mon, 14 Jul 2014 10:00:20 +0000 (15:30 +0530)]
Merge pull request #3633 from eileenmcnaughton/CRM-14967
CRM-14967 fix redirect link
Tim Otten [Fri, 11 Jul 2014 05:39:26 +0000 (22:39 -0700)]
CRM-14971 - CRM_Upgrade - Change backend image_URLs to frontend image_URLs
----------------------------------------
* CRM-14971: Contact image URLs broken in WordPress after upgrade to 4.4.6
https://issues.civicrm.org/jira/browse/CRM-14971
Tim Otten [Fri, 11 Jul 2014 01:58:45 +0000 (18:58 -0700)]
CRM-14971 - Contact image URLs should go through WP frontend
----------------------------------------
* CRM-14971: Contact image URLs broken in WordPress after upgrade to 4.4.6
https://issues.civicrm.org/jira/browse/CRM-14971
Eileen McNaughton [Thu, 10 Jul 2014 01:15:04 +0000 (13:15 +1200)]
Merge pull request #3635 from eileenmcnaughton/4.4-tests
revert minor data change in test suite
Eileen McNaughton [Thu, 10 Jul 2014 01:14:58 +0000 (13:14 +1200)]
revert minor data change in test suite
projects / civicrm-core.git / log