Allen Shaw [Wed, 1 May 2013 20:53:15 +0000 (13:53 -0700)]
Refactored out of CRM_Core_PseudoConstant: IMProvider(), pcm(), preferredCommunicationMethod(), activityContacts(), eventContacts(), getBatchMode(), autoRenew(). CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
----------------------------------------
* CRM-12464:
http://issues.civicrm.org/jira/browse/CRM-12464
* CRM-12464::
http://issues.civicrm.org/jira/browse/CRM-12464:
Donald A. Lobo [Wed, 1 May 2013 18:24:45 +0000 (11:24 -0700)]
fix PHP 5.4 static warnings
Allen Shaw [Wed, 1 May 2013 18:13:30 +0000 (11:13 -0700)]
Refactored out of CRM_Core_PseudoConstant: getBatchType(), getBatchStatus(). CRM-12464
----------------------------------------
* CRM-12464:
http://issues.civicrm.org/jira/browse/CRM-12464
Allen Shaw [Wed, 1 May 2013 05:45:18 +0000 (22:45 -0700)]
Refactored out of CRM_Core_PseudoConstant: websiteType(), fromEmailAddress(), honorType(), priority(), wysiwygEditor(), mappingType(), mailProtocol(). CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
----------------------------------------
* CRM-12464:
http://issues.civicrm.org/jira/browse/CRM-12464
* CRM-12464::
http://issues.civicrm.org/jira/browse/CRM-12464:
Donald A. Lobo [Wed, 1 May 2013 01:50:04 +0000 (18:50 -0700)]
CRM-14264 : start using xml for gender / suffix / prefix
----------------------------------------
* CRM-14264:
http://issues.civicrm.org/jira/browse/CRM-14264
Donald A. Lobo [Wed, 1 May 2013 01:31:47 +0000 (18:31 -0700)]
CRM-14264 : start using xml for gender / suffix / prefix
----------------------------------------
* CRM-14264:
http://issues.civicrm.org/jira/browse/CRM-14264
Allen Shaw [Wed, 1 May 2013 00:02:49 +0000 (17:02 -0700)]
Refactored location_type_id in CRM_Core_PseudoConstant::get() CRM_12464
Coleman Watts [Tue, 30 Apr 2013 23:38:37 +0000 (16:38 -0700)]
Support additional options for pseudoConstant::get CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Tue, 30 Apr 2013 22:12:03 +0000 (15:12 -0700)]
Refactor cache flush CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Tue, 30 Apr 2013 22:07:34 +0000 (15:07 -0700)]
Refactor phone type CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Tue, 30 Apr 2013 21:57:28 +0000 (14:57 -0700)]
Refactor individual prefix and suffix CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
Donald A. Lobo [Tue, 30 Apr 2013 21:58:52 +0000 (14:58 -0700)]
Migrate to new code
Allen Shaw [Tue, 30 Apr 2013 21:45:21 +0000 (14:45 -0700)]
Bug-fix: removed duplicate class variable declaration. CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Tue, 30 Apr 2013 20:59:04 +0000 (13:59 -0700)]
Refactor gender pseudoconstant to use generic get method CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
Allen Shaw [Tue, 30 Apr 2013 20:27:41 +0000 (13:27 -0700)]
Added support for more optionValue types in get() method, with corresponding tests. Toward CRM-12464.
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
Allen Shaw [Tue, 30 Apr 2013 05:00:24 +0000 (22:00 -0700)]
Added support for 'localize' param in CRM_Core_PseudoConstant::get(). CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
AS [Tue, 30 Apr 2013 04:33:41 +0000 (21:33 -0700)]
Added checks for valid array keys. CRM-12464
----------------------------------------
* CRM-12464:
http://issues.civicrm.org/jira/browse/CRM-12464
AS [Tue, 30 Apr 2013 03:59:05 +0000 (20:59 -0700)]
Added generic method CRM_Core_PseudoConstant::get(). CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
Donald A. Lobo [Tue, 30 Apr 2013 20:38:03 +0000 (13:38 -0700)]
Get export working
Donald A. Lobo [Tue, 30 Apr 2013 18:00:32 +0000 (11:00 -0700)]
get rid of left joins
Donald A. Lobo [Tue, 30 Apr 2013 04:13:46 +0000 (21:13 -0700)]
CRM-12464
----------------------------------------
* CRM-12464: Search improvements in 4.4
http://issues.civicrm.org/jira/browse/CRM-12464
dlobo [Wed, 29 May 2013 20:34:00 +0000 (13:34 -0700)]
Merge pull request #906 from eileenmcnaughton/CRM-12674
CRM-12674 wordpress fix broke update settings for drupal - refactored version
Kurund Jalmi [Wed, 29 May 2013 20:04:41 +0000 (13:04 -0700)]
Merge pull request #908 from eileenmcnaughton/CRM-11356
CRM-11356 reword ending date range
eileen [Wed, 29 May 2013 20:03:03 +0000 (08:03 +1200)]
CRM-11356 reword ending date range
eileen [Wed, 29 May 2013 09:02:25 +0000 (21:02 +1200)]
CRM-12674 wordpress fix broke update settings for drupal
Kurund Jalmi [Wed, 29 May 2013 19:17:32 +0000 (12:17 -0700)]
Merge pull request #900 from dlobo/CRM-12588
CRM-12588
Donald A. Lobo [Wed, 29 May 2013 15:23:51 +0000 (08:23 -0700)]
CRM-12588
----------------------------------------
* CRM-12588: Query by Memership Type using Search Builder does not work
http://issues.civicrm.org/jira/browse/CRM-12588
Kurund Jalmi [Wed, 29 May 2013 15:17:03 +0000 (08:17 -0700)]
Merge pull request #899 from ravishnair/CRM-12463QAfix
CRM-12463 QA fix
Ravish Nair [Wed, 29 May 2013 15:11:52 +0000 (20:41 +0530)]
-- CRM-12463 Indentation fix
Ravish Nair [Wed, 29 May 2013 15:07:25 +0000 (20:37 +0530)]
-- CRM-12463 QA fix
Kurund Jalmi [Wed, 29 May 2013 14:04:53 +0000 (07:04 -0700)]
Merge pull request #887 from yashodha/4.4
4.4
Kurund Jalmi [Wed, 29 May 2013 14:02:26 +0000 (07:02 -0700)]
Merge pull request #893 from pratik-joshi/CRM-12696
CRM-12696 fix: re-structured CRM_Contact_Form_Edit_Address::fixStateSele...
yashodha [Wed, 29 May 2013 10:30:59 +0000 (16:00 +0530)]
more clean up (CRM-12697)
Pratik Joshi [Wed, 29 May 2013 10:00:59 +0000 (15:30 +0530)]
CRM-12696 fix: re-structured CRM_Contact_Form_Edit_Address::fixStateSelect code and CRM_Core_BAO_Address::fixAllStateSelects code to allow state and county selections even if the country address field is disabled in civi
yashodha [Wed, 29 May 2013 09:45:35 +0000 (15:15 +0530)]
more clean up (CRM-12697)
yashodha [Wed, 29 May 2013 07:20:02 +0000 (12:50 +0530)]
clean up (CRM-12697)
yashodha [Wed, 29 May 2013 07:11:52 +0000 (12:41 +0530)]
clean up (CRM-12697)
yashodha [Wed, 29 May 2013 06:21:10 +0000 (11:51 +0530)]
CRM-12697
yashodha [Wed, 29 May 2013 06:00:28 +0000 (11:30 +0530)]
CRM-12697
Kurund Jalmi [Wed, 29 May 2013 05:53:39 +0000 (22:53 -0700)]
Merge pull request #886 from yashodha/4.4
CRM-12697
yashodha [Wed, 29 May 2013 05:48:52 +0000 (11:18 +0530)]
CRM-12697
Kurund Jalmi [Tue, 28 May 2013 19:06:50 +0000 (12:06 -0700)]
Merge pull request #878 from pradpnayak/CRM-12470-masterFixes
-- CRM fixes for CRM-12470
Pradeep Nayak [Tue, 28 May 2013 17:39:59 +0000 (23:09 +0530)]
-- CRM fixes for CRM-12470
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
* CRM-12470-masterFixes:
http://issues.civicrm.org/jira/browse/CRM-12470-masterFixes
Kurund Jalmi [Tue, 28 May 2013 11:51:57 +0000 (04:51 -0700)]
Merge pull request #875 from yashodha/4.4
CRM-12697
yashodha [Tue, 28 May 2013 11:29:52 +0000 (16:59 +0530)]
CRM-12697
Kurund Jalmi [Tue, 28 May 2013 08:44:26 +0000 (14:14 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-28-14-04-12
Conflicts:
CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
sql/civicrm_generated.mysql
Kurund Jalmi [Tue, 28 May 2013 07:41:27 +0000 (00:41 -0700)]
Merge pull request #868 from kurund/CRM-12681
worked on CRM-12681, fixed display of copy checkbox when billing block i...
Kurund Jalmi [Tue, 28 May 2013 07:41:10 +0000 (00:41 -0700)]
Merge pull request #869 from totten/cms-perms
CRM-12499 - Allow CMS-specific permission expressions
Kurund Jalmi [Tue, 28 May 2013 07:40:36 +0000 (00:40 -0700)]
Merge pull request #870 from colemanw/import
Rename CRM_Import -> CRM_Contact_Import CRM-11254
Kurund Jalmi [Tue, 28 May 2013 07:36:39 +0000 (00:36 -0700)]
Merge pull request #871 from colemanw/versionAlert
Add versionAlert setting CRM-12701
Kurund Jalmi [Tue, 28 May 2013 07:35:16 +0000 (00:35 -0700)]
Merge pull request #872 from eileenmcnaughton/master
a bit more formatting / whitespace
Kurund Jalmi [Tue, 28 May 2013 07:30:41 +0000 (00:30 -0700)]
Merge pull request #873 from ravishnair/CRM-12410QAfix
-- CRM-12410 Minor QA fix
Kurund Jalmi [Tue, 28 May 2013 07:29:03 +0000 (00:29 -0700)]
Merge pull request #874 from kurund/CRM-12705
applied patch for CRM-12705
Kurund Jalmi [Tue, 28 May 2013 07:28:30 +0000 (12:58 +0530)]
applied patch for CRM-12705
Ravish Nair [Tue, 28 May 2013 05:58:59 +0000 (11:28 +0530)]
-- CRM-12410 Minor QA fix
eileen [Tue, 28 May 2013 03:24:29 +0000 (15:24 +1200)]
a few more trailing space removals, //ids removals, tabs
Coleman Watts [Tue, 28 May 2013 03:06:47 +0000 (20:06 -0700)]
Add versionAlert setting CRM-12701
Coleman Watts [Tue, 28 May 2013 01:57:37 +0000 (18:57 -0700)]
Rename CRM_Import -> CRM_Contact_Import CRM-11254
----------------------------------------
* CRM-11254: Create parent class for import
http://issues.civicrm.org/jira/browse/CRM-11254
----------------------------------------
* CRM-11254:
http://issues.civicrm.org/jira/browse/CRM-11254
* CRM-11254::
http://issues.civicrm.org/jira/browse/CRM-11254:
Kurund Jalmi [Mon, 27 May 2013 15:14:39 +0000 (20:44 +0530)]
worked on CRM-12681, fixed display of copy checkbox when billing block is build without ajax
Kurund Jalmi [Mon, 27 May 2013 11:53:15 +0000 (04:53 -0700)]
Merge pull request #867 from pradpnayak/CRM-12665
-- removed cruft data for grant, worked on CRM-12665
Pradeep Nayak [Mon, 27 May 2013 10:12:28 +0000 (15:42 +0530)]
-- removed cruft data for grant, worked on CRM-12665
----------------------------------------
* CRM-12665: Remove unwanted files in Grant
http://issues.civicrm.org/jira/browse/CRM-12665
Kurund Jalmi [Mon, 27 May 2013 06:21:52 +0000 (23:21 -0700)]
Merge pull request #866 from kurund/CRM-12673
applied patch for CRM-12673
Kurund Jalmi [Mon, 27 May 2013 05:47:14 +0000 (11:17 +0530)]
applied patch for CRM-12673
dlobo [Sun, 26 May 2013 19:54:56 +0000 (12:54 -0700)]
Merge pull request #851 from eileenmcnaughton/CRM-12686
CRM-12686 add ability to set specific date as a default in Reports
dlobo [Sun, 26 May 2013 19:53:56 +0000 (12:53 -0700)]
Merge pull request #852 from eileenmcnaughton/CRM-12687
CRM-12687 make DAO field optional when defining report columns
dlobo [Sun, 26 May 2013 19:52:57 +0000 (12:52 -0700)]
Merge pull request #864 from eileenmcnaughton/CRM-12160
Crm 12160 -fix navigation upgrade errors
dlobo [Sun, 26 May 2013 19:50:13 +0000 (12:50 -0700)]
Merge pull request #857 from colemanw/is_test
Automatically filter test records on forced searches CRM-12610
dlobo [Sun, 26 May 2013 19:43:10 +0000 (12:43 -0700)]
Merge pull request #860 from yashodha/CRM-12688
CRM-12688
Tim Otten [Sun, 26 May 2013 17:01:24 +0000 (10:01 -0700)]
Merge pull request #863 from eileenmcnaughton/CRM-11320
Crm 11320 - make api stable for 4.3
Tim Otten [Sun, 26 May 2013 16:57:51 +0000 (09:57 -0700)]
Merge pull request #865 from eileenmcnaughton/master
remove tabs
eileen [Sun, 26 May 2013 11:04:08 +0000 (23:04 +1200)]
remove tabs (whitespace only)
eileen [Sun, 26 May 2013 10:37:54 +0000 (22:37 +1200)]
CRM-12160 menu fixes for 4.3
eileen [Wed, 20 Mar 2013 00:36:09 +0000 (13:36 +1300)]
CRM-12160 Fix domain on navigation inserts
Conflicts:
CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
eileen [Wed, 15 May 2013 21:35:32 +0000 (09:35 +1200)]
CRM-11320 fix error in test
eileen [Wed, 15 May 2013 14:02:41 +0000 (02:02 +1200)]
CRM-11320 this makes the api stable from 4.2 to 4.3
Conflicts:
api/v3/Contribution.php
yashodha [Sun, 26 May 2013 05:53:11 +0000 (11:23 +0530)]
CRM-12688
dlobo [Sun, 26 May 2013 00:52:33 +0000 (17:52 -0700)]
Merge pull request #862 from dlobo/CRM-10682
CRM-10692 - commit andrew hunt patch. rework in next commit
Donald A. Lobo [Sun, 26 May 2013 00:51:37 +0000 (17:51 -0700)]
CRM-10692 - commit andrew hunt patch. rework in next commit
----------------------------------------
* CRM-10692: unable to override /CRM/Core/Utils.php from extension
http://issues.civicrm.org/jira/browse/CRM-10692
Tim Otten [Sat, 25 May 2013 05:12:58 +0000 (01:12 -0400)]
CRM-12499 - Allow users with 'access user profiles' access to userRecordUrl
----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
http://issues.civicrm.org/jira/browse/CRM-12499
Tim Otten [Sat, 25 May 2013 04:06:05 +0000 (00:06 -0400)]
CRM-12499 - CRM_Core_Permission_Joomla - Add translation
----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
http://issues.civicrm.org/jira/browse/CRM-12499
Tim Otten [Sat, 25 May 2013 04:01:36 +0000 (00:01 -0400)]
CRM-12499 - CRM_Core_Permission_Base::translatePermission
Add helper function translatePermission which translates an expression like
"administer CiviCRM", "cms:view user account", or "drupal:access user
profiles" into something understood by native CMS.
Use translatePermission as part of check() in D6, D7, WP.
Use placeholder permssions ALWAYS_ALLOW_PERMISSION and
ALWAYS_DENY_PERMISSION for select corner cases.
----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
http://issues.civicrm.org/jira/browse/CRM-12499
Tim Otten [Sat, 25 May 2013 03:57:12 +0000 (23:57 -0400)]
CRM-12499 - Add CRM_Utils_String::parsePrefix
----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
http://issues.civicrm.org/jira/browse/CRM-12499
yashodha [Sat, 25 May 2013 02:08:37 +0000 (07:38 +0530)]
CRM-12688
Coleman Watts [Fri, 24 May 2013 22:58:42 +0000 (18:58 -0400)]
Automatically filter test records on forced searches CRM-12610
dlobo [Fri, 24 May 2013 20:57:47 +0000 (13:57 -0700)]
Merge pull request #856 from dlobo/CRM-12594
CRM-12594 - Fix typo in warning message
Donald A. Lobo [Fri, 24 May 2013 20:57:01 +0000 (13:57 -0700)]
CRM-12594
----------------------------------------
* CRM-12594: Wrong texts in UI
http://issues.civicrm.org/jira/browse/CRM-12594
Donald A. Lobo [Fri, 24 May 2013 20:54:39 +0000 (13:54 -0700)]
CRM-12594
----------------------------------------
* CRM-12594: Wrong texts in UI
http://issues.civicrm.org/jira/browse/CRM-12594
Kurund Jalmi [Fri, 24 May 2013 18:51:38 +0000 (11:51 -0700)]
Merge pull request #855 from pratik-joshi/CRM-12524-fix
Crm 12524 fix
Dave Greenberg [Fri, 24 May 2013 16:33:30 +0000 (09:33 -0700)]
Merge pull request #854 from yashodha/CRM-12688
CRM-12688
Yash - the help needs to be clearer, since I "think" you said the behavior is that reminders are limited to participants who have the selected status(es) AND meet the Limit Recipients criteria. Maybe something like "Only send reminders to participants with the status(es) selected above AND who match this criteria. If you select Manual Recipients - only those people will receive the reminder (AND only if they are ALSO participants with the selected status)."
Pratik Joshi [Fri, 24 May 2013 12:29:15 +0000 (17:59 +0530)]
CRM-12524-fix : handled custom fields carry forward for recurring contributions
Pratik Joshi [Fri, 24 May 2013 12:24:47 +0000 (17:54 +0530)]
CRM-12524-fix : handled carry forward of campaign id, honor contact id, honor type fields for recurring contributions
yashodha [Fri, 24 May 2013 10:55:19 +0000 (16:25 +0530)]
CRM-12688
yashodha [Fri, 24 May 2013 10:21:17 +0000 (15:51 +0530)]
CRM-12688
Kurund Jalmi [Fri, 24 May 2013 06:43:24 +0000 (02:43 -0400)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-24-02-32-04
Conflicts:
CRM/Financial/Form/FinancialTypeAccount.php
sql/civicrm_generated.mysql
xml/templates/civicrm_navigation.tpl
Kurund Jalmi [Fri, 24 May 2013 06:07:50 +0000 (23:07 -0700)]
Merge pull request #847 from eileenmcnaughton/master
this file seems to have 2 version with different mixes of case in git - remove one!
Kurund Jalmi [Fri, 24 May 2013 05:56:00 +0000 (22:56 -0700)]
Merge pull request #849 from eileenmcnaughton/CRM-11356
CRM-11356 fix wording on 'greater' relative date and introduce 'current'...
Kurund Jalmi [Fri, 24 May 2013 04:45:23 +0000 (21:45 -0700)]
Merge pull request #853 from kurund/CRM-12425-fixes
CRM-12425, merged #792
Kurund Jalmi [Fri, 24 May 2013 04:44:12 +0000 (00:44 -0400)]
CRM-12425, merged #792
eileen [Fri, 24 May 2013 02:36:07 +0000 (14:36 +1200)]
CRM-12687 make DAO field optional when defining report columns
eileen [Thu, 23 May 2013 22:52:16 +0000 (10:52 +1200)]
CRM-12686 add ability to set specific date as a default
projects / civicrm-core.git / log