Eileen McNaughton [Mon, 1 Sep 2014 04:21:31 +0000 (16:21 +1200)]
CRM-15213 fix spelling of renewal
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 [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
Eileen McNaughton [Thu, 10 Jul 2014 01:06:33 +0000 (13:06 +1200)]
Merge pull request #3634 from eileenmcnaughton/4.4-tests
fix in test suite - mistype
Eileen McNaughton [Thu, 10 Jul 2014 01:05:44 +0000 (13:05 +1200)]
fix in test suite - mistype
Eileen McNaughton [Wed, 9 Jul 2014 23:23:42 +0000 (11:23 +1200)]
CRM-14967 fix redirect link
Eileen McNaughton [Wed, 9 Jul 2014 20:44:11 +0000 (08:44 +1200)]
Merge pull request #3623 from monishdeb/CRM-14758-44-fixes
CRM-14758 fixes for 4.4
monishdeb [Wed, 9 Jul 2014 09:54:36 +0000 (15:24 +0530)]
Test fixes
monishdeb [Tue, 8 Jul 2014 20:20:29 +0000 (01:50 +0530)]
CRM-14758 fixes for 4.4
----------------------------------------
* CRM-14758: API ( contact, create ) does not always create related membership
https://issues.civicrm.org/jira/browse/CRM-14758
Kurund Jalmi [Mon, 7 Jul 2014 15:45:06 +0000 (21:15 +0530)]
Merge pull request #3615 from jmcclelland/prev-next-page-10
CRM-14939 - ensure proper pagination of search results past page 10.
Jamie McClelland [Mon, 7 Jul 2014 15:00:30 +0000 (11:00 -0400)]
CRM-14939 - ensure proper pagination of search results past page 10.
----------------------------------------
* CRM-14939: unpredictable behavior with pagination of search results with duplicates
https://issues.civicrm.org/jira/browse/CRM-14939
Kurund Jalmi [Sat, 5 Jul 2014 14:51:05 +0000 (20:21 +0530)]
Merge pull request #3610 from kurund/CRM-14782
notice fixes, CRM-14782
kurund [Sat, 5 Jul 2014 14:50:20 +0000 (20:20 +0530)]
notice fixes, CRM-14782
----------------------------------------
* CRM-14782: unable to import 0/no/false values
https://issues.civicrm.org/jira/browse/CRM-14782
Dave Greenberg [Thu, 3 Jul 2014 17:58:10 +0000 (10:58 -0700)]
Merge pull request #3605 from monishdeb/CRM-14505
CRM-14505 fix - CiviCRM api contact dedupe check wrong rule type
Dave Greenberg [Thu, 3 Jul 2014 17:19:09 +0000 (10:19 -0700)]
Merge pull request #3604 from monishdeb/CRM-14913
CRM-14913 fix - merging contacts does not change contact_id in financial...
monishdeb [Thu, 3 Jul 2014 16:40:50 +0000 (22:10 +0530)]
CRM-14505 fix - CiviCRM api contact dedupe check wrong rule type
https://issues.civicrm.org/jira/browse/CRM-14505
monishdeb [Thu, 3 Jul 2014 16:13:05 +0000 (21:43 +0530)]
CRM-14913 fix - merging contacts does not change contact_id in financial_item table.
https://issues.civicrm.org/jira/browse/CRM-14913
Tim Otten [Wed, 2 Jul 2014 07:13:39 +0000 (00:13 -0700)]
Merge pull request #3594 from civicrm/4.4.6.x
Merge forward (4.4.6.x => 4.4)
CiviCRM [Wed, 2 Jul 2014 07:12:58 +0000 (00:12 -0700)]
Update version to 4.4.7
Kurund Jalmi [Tue, 1 Jul 2014 11:38:47 +0000 (17:08 +0530)]
Merge pull request #3558 from atif-shaikh/CRM-14782-fix
CRM-14782 fix
Dave Greenberg [Sat, 28 Jun 2014 22:54:48 +0000 (15:54 -0700)]
Merge pull request #3580 from monishdeb/CRM-14701
CRM-14701 QA fix
monishdeb [Sat, 28 Jun 2014 19:41:34 +0000 (01:11 +0530)]
minor fix
monishdeb [Sat, 28 Jun 2014 19:30:04 +0000 (01:00 +0530)]
CRM-14701 fixes - Form data not retained subsequent to contribution page on behalf of fix
https://issues.civicrm.org/jira/browse/CRM-14701
monishdeb [Fri, 27 Jun 2014 17:21:48 +0000 (22:51 +0530)]
CRM-14701 QA fix
----------------------------------------
* CRM-14701: Form data not retained subsequent to contribution page on behalf of fix
https://issues.civicrm.org/jira/browse/CRM-14701
atif-shaikh [Thu, 26 Jun 2014 15:12:31 +0000 (20:42 +0530)]
Additional QA Fixes
atif-shaikh [Wed, 25 Jun 2014 16:06:42 +0000 (21:36 +0530)]
QA fixes
atif-shaikh [Tue, 24 Jun 2014 15:16:24 +0000 (20:46 +0530)]
Further Changes
atif-shaikh [Tue, 24 Jun 2014 15:08:39 +0000 (20:38 +0530)]
Additional notice fixes and comments
atif-shaikh [Tue, 24 Jun 2014 14:36:31 +0000 (20:06 +0530)]
CRM-14782 fix
Dave Greenberg [Wed, 25 Jun 2014 21:11:30 +0000 (14:11 -0700)]
Merge pull request #3554 from eileenmcnaughton/4.4
CRM-14900 use INSERT ignore for states - this is primarily about copy & ...
Dave Greenberg [Tue, 24 Jun 2014 17:58:07 +0000 (10:58 -0700)]
Merge pull request #3559 from davecivicrm/CRM-14908
CRM-14908 - Do not hide payment options just because a $0 price option i...
Dave Greenberg [Tue, 24 Jun 2014 17:56:49 +0000 (10:56 -0700)]
CRM-14908 - Do not hide payment options just because a $0 price option is selected if total is != $0.
----------------------------------------
* CRM-14908:
https://issues.civicrm.org/jira/browse/CRM-14908
Tim Otten [Tue, 24 Jun 2014 03:35:44 +0000 (20:35 -0700)]
Merge pull request #3555 from totten/4.4-14856-regr
CRM-14856 - Fix regressions in Drupal-Profile integration
Tim Otten [Tue, 24 Jun 2014 03:14:09 +0000 (20:14 -0700)]
CRM-14856 - CRM_Profile_Form - Restore behavior of add_to_group_id when there are multiple profiles
The behavior is to scan a combined list of UFFields, see if each UFField's
parent UFGroup has "add_to_group", and use it if found. If multiple
UFGroups define "add_to_group", then the value of the last UFField wins.
I don't see this as good behavior -- just compatible behavior.
Tim Otten [Tue, 24 Jun 2014 02:59:06 +0000 (19:59 -0700)]
CRM-14856 - Fix regression with Drupal-Profile integration
Eileen McNaughton [Tue, 24 Jun 2014 02:20:12 +0000 (14:20 +1200)]
CRM-14900 use INSERT ignore for states - this is primarily about copy & paste protection
Tim Otten [Tue, 24 Jun 2014 01:47:07 +0000 (18:47 -0700)]
Merge pull request #3553 from eileenmcnaughton/4.4
CRM-14903 fix REGEX to RLIKE
Eileen McNaughton [Tue, 24 Jun 2014 01:44:28 +0000 (13:44 +1200)]
CRM-14903 fix REGEX to RLIKE
Tim Otten [Tue, 24 Jun 2014 01:23:01 +0000 (18:23 -0700)]
Merge pull request #3540 from totten/4.4-distmaker
distmaker cleanup
Dave Greenberg [Mon, 23 Jun 2014 21:50:57 +0000 (14:50 -0700)]
Merge pull request #3546 from eileenmcnaughton/4.4
CRM-14903 alter enum field on civicrm_mapping_field to reflect allowed o...
Eileen McNaughton [Mon, 23 Jun 2014 13:54:18 +0000 (01:54 +1200)]
CRM-14903 alter enum field on civicrm_mapping_field to reflect allowed operators
totten@civicrm.org [Sat, 21 Jun 2014 13:53:42 +0000 (06:53 -0700)]
distmaker - Fix the *.info filter and apply it to all Drupal builds
projects / civicrm-core.git / log