civicrm-core.git
10 years agomore minor tidy-ups & comment fixes
Eileen McNaughton [Wed, 14 May 2014 03:59:42 +0000 (15:59 +1200)]
more minor tidy-ups & comment fixes

10 years agomore comment fixes & minor tidy ups
Eileen McNaughton [Wed, 14 May 2014 02:41:01 +0000 (14:41 +1200)]
more comment fixes & minor tidy ups

10 years agomore comment fixes
Eileen McNaughton [Wed, 14 May 2014 02:32:54 +0000 (14:32 +1200)]
more comment fixes

10 years agocomment fix
Eileen McNaughton [Wed, 14 May 2014 02:29:16 +0000 (14:29 +1200)]
comment fix

10 years agominor code cleanups - add comments, remove unused var, declare function as static
Eileen McNaughton [Wed, 14 May 2014 02:27:09 +0000 (14:27 +1200)]
minor code cleanups - add comments, remove unused var, declare function as static

10 years agoCRM-14684 add comments
Eileen McNaughton [Wed, 14 May 2014 00:48:33 +0000 (12:48 +1200)]
CRM-14684 add comments

10 years agoCRM-14684 refactor function that identifies is a site supports back-office contributions
Eileen McNaughton [Wed, 14 May 2014 00:26:44 +0000 (12:26 +1200)]
CRM-14684 refactor function that identifies is a site supports back-office contributions
& leave form layer part on forms

10 years agoMerge pull request #3239 from eileenmcnaughton/whitespace-fixes
Eileen McNaughton [Tue, 13 May 2014 09:29:34 +0000 (21:29 +1200)]
Merge pull request #3239 from eileenmcnaughton/whitespace-fixes

Whitespace fixes

10 years agofinish on a new line to reduce merge clashes
Eileen McNaughton [Tue, 13 May 2014 09:28:57 +0000 (21:28 +1200)]
finish on a new line to reduce merge clashes

10 years agofix use of tabs (std is two spaces) & trailing whitespaces (std is none)
Eileen McNaughton [Tue, 13 May 2014 09:27:03 +0000 (21:27 +1200)]
fix use of tabs (std is two spaces) & trailing whitespaces (std is none)

10 years agoMerge pull request #3231 from monishdeb/CRM-14665
Dave Greenberg [Mon, 12 May 2014 23:55:09 +0000 (16:55 -0700)]
Merge pull request #3231 from monishdeb/CRM-14665

CRM-14665 fix - On Behalf profile field values are not being displayed on Thank-you pages

10 years agoMerge pull request #3237 from davecivicrm/pr-3234Redo
Dave Greenberg [Mon, 12 May 2014 23:37:38 +0000 (16:37 -0700)]
Merge pull request #3237 from davecivicrm/pr-3234Redo

pr-3234 replacement. Grant status syntax error already fixed.

10 years agopr-3234 replacement. Grant status syntax error already fixed.
Dave Greenberg [Mon, 12 May 2014 23:36:12 +0000 (16:36 -0700)]
pr-3234 replacement. Grant status syntax error already fixed.

10 years agoMerge pull request #3232 from pradpnayak/CRM-14639
Dave Greenberg [Mon, 12 May 2014 22:33:29 +0000 (15:33 -0700)]
Merge pull request #3232 from pradpnayak/CRM-14639

Crm 14639

10 years agoMerge pull request #3230 from monishdeb/CRM-13981
Dave Greenberg [Mon, 12 May 2014 16:30:02 +0000 (09:30 -0700)]
Merge pull request #3230 from monishdeb/CRM-13981

CRM-13981, missing {ts} tag around accordion header

10 years ago-- crm test fix, Aprroved grant status is replaced by Eligible, CRM-14639
Pradeep Nayak [Mon, 12 May 2014 10:12:48 +0000 (15:42 +0530)]
-- crm test fix, Aprroved grant status is replaced by Eligible, CRM-14639

----------------------------------------
* CRM-14639: Grant status inconsistent after 4.3 upgrade
  https://issues.civicrm.org/jira/browse/CRM-14639

10 years ago-- fixed script for multilingual and also syntax error, CRM-14639
Pradeep Nayak [Mon, 12 May 2014 10:12:03 +0000 (15:42 +0530)]
--  fixed script for multilingual and also syntax error, CRM-14639

----------------------------------------
* CRM-14639: Grant status inconsistent after 4.3 upgrade
  https://issues.civicrm.org/jira/browse/CRM-14639

10 years agoCRM-14665 fix - On Behalf profile field values are not being displayed on Thank-you...
monishdeb [Mon, 12 May 2014 07:34:24 +0000 (13:04 +0530)]
CRM-14665 fix - On Behalf profile field values are not being displayed on Thank-you pages

https://issues.civicrm.org/jira/browse/CRM-14665

10 years agoCRM-13981, missing {ts} tag around accordion header
monishdeb [Mon, 12 May 2014 07:03:11 +0000 (12:33 +0530)]
CRM-13981, missing {ts} tag around accordion header

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
  https://issues.civicrm.org/jira/browse/CRM-13981

10 years agoMerge pull request #3229 from eileenmcnaughton/e-notice
Eileen McNaughton [Sun, 11 May 2014 21:58:49 +0000 (09:58 +1200)]
Merge pull request #3229 from eileenmcnaughton/e-notice

enotice fix +  missing comment

10 years agoenotice fix + missing comment
Eileen McNaughton [Sun, 11 May 2014 21:57:45 +0000 (09:57 +1200)]
enotice fix +  missing comment

10 years agoMerge pull request #3152 from pradpnayak/CRM-14112
Dave Greenberg [Sat, 10 May 2014 14:57:39 +0000 (07:57 -0700)]
Merge pull request #3152 from pradpnayak/CRM-14112

Crm 14112

10 years agoMerge pull request #3227 from davecivicrm/CRM-14666
Dave Greenberg [Sat, 10 May 2014 14:54:37 +0000 (07:54 -0700)]
Merge pull request #3227 from davecivicrm/CRM-14666

CRM-14666 - add conditional explanation for recurring contributions.

10 years agoCRM-14666 - add conditional explanation for recurring contributions.
Dave Greenberg [Sat, 10 May 2014 01:11:30 +0000 (18:11 -0700)]
CRM-14666 - add conditional explanation for recurring contributions.

----------------------------------------
* CRM-14666:
  https://issues.civicrm.org/jira/browse/CRM-14666

10 years agoMerge pull request #3226 from davecivicrm/CRM-13981a
Dave Greenberg [Fri, 9 May 2014 22:30:37 +0000 (15:30 -0700)]
Merge pull request #3226 from davecivicrm/CRM-13981a

CRM-13981 - Add missing clear-radio-selection feature for the Honor Type...

10 years agoCRM-13981 - Refactor enableHonorType function to use newer style.
Dave Greenberg [Fri, 9 May 2014 22:27:16 +0000 (15:27 -0700)]
CRM-13981 - Refactor enableHonorType function to use newer style.

----------------------------------------
* CRM-13981:
  https://issues.civicrm.org/jira/browse/CRM-13981

10 years agoCRM-13981 - Add missing clear-radio-selection feature for the Honor Type radio in...
Dave Greenberg [Fri, 9 May 2014 22:13:49 +0000 (15:13 -0700)]
CRM-13981 - Add missing clear-radio-selection feature for the Honor Type radio in Honoree block.

----------------------------------------
* CRM-13981:
  https://issues.civicrm.org/jira/browse/CRM-13981

10 years agoMerge pull request #3220 from monishdeb/CRM-13981
Dave Greenberg [Fri, 9 May 2014 20:09:31 +0000 (13:09 -0700)]
Merge pull request #3220 from monishdeb/CRM-13981

CRM-13981 handling SC on Gift Membership minor fix

10 years agoMerge pull request #3223 from lcdservices/CRM-14672
Kurund Jalmi [Fri, 9 May 2014 19:08:51 +0000 (12:08 -0700)]
Merge pull request #3223 from lcdservices/CRM-14672

CRM-14672 exclude _menu table from logging triggers

10 years agoCRM-14672 exclude _menu table from logging triggers
Brian Shaughnessy [Fri, 9 May 2014 19:06:46 +0000 (15:06 -0400)]
CRM-14672 exclude _menu table from logging triggers

10 years agoMerge pull request #3204 from GinkgoFJG/CRM-14662
Dave Greenberg [Fri, 9 May 2014 18:05:15 +0000 (11:05 -0700)]
Merge pull request #3204 from GinkgoFJG/CRM-14662

Fixed CRM-14662.

10 years agoMerge pull request #3207 from totten/master-alerts
Dave Greenberg [Fri, 9 May 2014 18:00:17 +0000 (11:00 -0700)]
Merge pull request #3207 from totten/master-alerts

CRM-14513 - Move notices to CRM_Utils_Check_*

10 years agoMerge pull request #3219 from atif-shaikh/WebTextFix
Kurund Jalmi [Fri, 9 May 2014 16:57:05 +0000 (09:57 -0700)]
Merge pull request #3219 from atif-shaikh/WebTextFix

Web text fix

10 years agoMerge pull request #3218 from jitendrapurohit/WebTest_4.5alpha1_Fix
Kurund Jalmi [Fri, 9 May 2014 16:40:20 +0000 (09:40 -0700)]
Merge pull request #3218 from jitendrapurohit/WebTest_4.5alpha1_Fix

Web Test Fix For 4.5 alpha1

10 years agoSet SC type to Gift by default
monishdeb [Fri, 9 May 2014 14:56:04 +0000 (20:26 +0530)]
Set SC type to Gift by default

10 years agoMerge pull request #3217 from NileemaJadhav/HR-345
colemanw [Fri, 9 May 2014 14:10:13 +0000 (10:10 -0400)]
Merge pull request #3217 from NileemaJadhav/HR-345

HR-345 Fix for profile selector edit link

10 years agoStyling and minor changes
monishdeb [Fri, 9 May 2014 14:02:47 +0000 (19:32 +0530)]
Styling and minor changes

10 years agoCRM-13981 handling SC on Gift Membership minor fix
monishdeb [Fri, 9 May 2014 13:19:25 +0000 (18:49 +0530)]
CRM-13981 handling SC on Gift Membership minor fix

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
  https://issues.civicrm.org/jira/browse/CRM-13981

10 years agoWebTestFix Changes
atif-shaikh [Fri, 9 May 2014 13:10:31 +0000 (18:40 +0530)]
WebTestFix Changes

10 years agoWebTestFix Further Changes
atif-shaikh [Fri, 9 May 2014 13:08:01 +0000 (18:38 +0530)]
WebTestFix Further Changes

10 years agoWebTestFix
atif-shaikh [Fri, 9 May 2014 12:57:52 +0000 (18:27 +0530)]
WebTestFix

10 years agoWeb Test Fix For 4.5 alpha1
jitendrapurohit [Fri, 9 May 2014 12:10:07 +0000 (17:40 +0530)]
Web Test Fix For 4.5 alpha1

10 years agoHR-345 Fix for profile selector edit link
Nileema [Fri, 9 May 2014 05:11:34 +0000 (10:41 +0530)]
HR-345 Fix for profile selector edit link

10 years agoMerge pull request #3215 from eileenmcnaughton/comments
Eileen McNaughton [Fri, 9 May 2014 02:10:03 +0000 (14:10 +1200)]
Merge pull request #3215 from eileenmcnaughton/comments

bulk comment fixes

10 years agobulk comment fixes
Eileen McNaughton [Fri, 9 May 2014 02:08:37 +0000 (14:08 +1200)]
bulk comment fixes

10 years agoMerge pull request #3214 from eileenmcnaughton/comments
Eileen McNaughton [Fri, 9 May 2014 02:07:16 +0000 (14:07 +1200)]
Merge pull request #3214 from eileenmcnaughton/comments

bulk comment fixes

10 years agobulk comment fixes
Eileen McNaughton [Fri, 9 May 2014 02:06:05 +0000 (14:06 +1200)]
bulk comment fixes

10 years agoMerge pull request #3213 from eileenmcnaughton/comments
Eileen McNaughton [Fri, 9 May 2014 01:36:16 +0000 (13:36 +1200)]
Merge pull request #3213 from eileenmcnaughton/comments

bulk comment fix

10 years agobulk comment fix
Eileen McNaughton [Fri, 9 May 2014 01:35:28 +0000 (13:35 +1200)]
bulk comment fix

10 years agobulk comment fix
Eileen McNaughton [Fri, 9 May 2014 01:32:08 +0000 (13:32 +1200)]
bulk comment fix

10 years agoMerge pull request #3212 from eileenmcnaughton/comments
Eileen McNaughton [Fri, 9 May 2014 01:20:25 +0000 (13:20 +1200)]
Merge pull request #3212 from eileenmcnaughton/comments

bulk comment fixes

10 years agobulk comment fixes
Eileen McNaughton [Fri, 9 May 2014 01:19:33 +0000 (13:19 +1200)]
bulk comment fixes

10 years agoMerge pull request #3211 from eileenmcnaughton/comments
Eileen McNaughton [Fri, 9 May 2014 01:10:45 +0000 (13:10 +1200)]
Merge pull request #3211 from eileenmcnaughton/comments

bulk comment fixes

10 years agobulk comment fixes
Eileen McNaughton [Fri, 9 May 2014 01:09:44 +0000 (13:09 +1200)]
bulk comment fixes

10 years agoMerge pull request #3209 from eileenmcnaughton/comments
Eileen McNaughton [Fri, 9 May 2014 00:39:33 +0000 (12:39 +1200)]
Merge pull request #3209 from eileenmcnaughton/comments

mass update of comment blocks

10 years agomass update of comment blocks
Eileen McNaughton [Fri, 9 May 2014 00:37:40 +0000 (12:37 +1200)]
mass update of comment blocks

10 years agoMerge pull request #3208 from eileenmcnaughton/comments
Eileen McNaughton [Thu, 8 May 2014 22:54:43 +0000 (10:54 +1200)]
Merge pull request #3208 from eileenmcnaughton/comments

Comment block fixes

10 years agoComment block fixes
Eileen McNaughton [Thu, 8 May 2014 22:54:05 +0000 (10:54 +1200)]
Comment block fixes

10 years agoCRM-14513 - Move notices to CRM_Utils_Check_*
Tim Otten [Thu, 8 May 2014 21:38:48 +0000 (14:38 -0700)]
CRM-14513 - Move notices to CRM_Utils_Check_*

10 years agoMerge pull request #3176 from mepps/new-hook-alter-badge
Kurund Jalmi [Thu, 8 May 2014 21:18:28 +0000 (14:18 -0700)]
Merge pull request #3176 from mepps/new-hook-alter-badge

New hook alter badge

10 years agoMerge pull request #3202 from NileemaJadhav/CRM-master
Kurund Jalmi [Thu, 8 May 2014 21:13:56 +0000 (14:13 -0700)]
Merge pull request #3202 from NileemaJadhav/CRM-master

--Fix to support hook_civicrm_caseTypes

10 years agoMerge pull request #3203 from atif-shaikh/WebTextFix
Kurund Jalmi [Thu, 8 May 2014 19:34:19 +0000 (12:34 -0700)]
Merge pull request #3203 from atif-shaikh/WebTextFix

WebTestFix

10 years agoMerge pull request #3205 from jitendrapurohit/WebFix_4.5
Kurund Jalmi [Thu, 8 May 2014 19:34:10 +0000 (12:34 -0700)]
Merge pull request #3205 from jitendrapurohit/WebFix_4.5

Web Test Fix for 4.5 alpha1

10 years agoWeb Test Fix
jitendrapurohit [Thu, 8 May 2014 14:32:18 +0000 (20:02 +0530)]
Web Test Fix

10 years agoFixed CRM-14662.
Frank J. Gómez [Thu, 8 May 2014 14:17:05 +0000 (10:17 -0400)]
Fixed CRM-14662.

----------------------------------------
* CRM-14662: Fatal error on front-end membership renewal
  https://issues.civicrm.org/jira/browse/CRM-14662

10 years agoWebTestFix
atif-shaikh [Thu, 8 May 2014 13:35:56 +0000 (19:05 +0530)]
WebTestFix

10 years ago--Fix to support hook_civicrm_caseTypes
Nileema [Thu, 8 May 2014 13:21:30 +0000 (18:51 +0530)]
--Fix to support hook_civicrm_caseTypes

10 years agoMerge pull request #3195 from JoeMurray/patch-2
Kurund Jalmi [Thu, 8 May 2014 07:45:40 +0000 (00:45 -0700)]
Merge pull request #3195 from JoeMurray/patch-2

fix IATS recurring payments

10 years agoMerge pull request #3201 from eileenmcnaughton/comments
Eileen McNaughton [Thu, 8 May 2014 01:06:57 +0000 (13:06 +1200)]
Merge pull request #3201 from eileenmcnaughton/comments

Comment fixes & IDE highlighted cleanups

10 years agomore comment fixes
Eileen McNaughton [Thu, 8 May 2014 01:05:13 +0000 (13:05 +1200)]
more comment fixes

10 years agomore comment fixes
Eileen McNaughton [Thu, 8 May 2014 01:01:05 +0000 (13:01 +1200)]
more comment fixes

10 years agofix spelling
Eileen McNaughton [Thu, 8 May 2014 00:54:41 +0000 (12:54 +1200)]
fix spelling

10 years agocomment fixes
Eileen McNaughton [Thu, 8 May 2014 00:39:29 +0000 (12:39 +1200)]
comment fixes

10 years agoMerge pull request #3199 from davecivicrm/CRM-14656
Dave Greenberg [Thu, 8 May 2014 00:29:58 +0000 (20:29 -0400)]
Merge pull request #3199 from davecivicrm/CRM-14656

CRM-14656 - Add contact ID A and B and relationship ID to Relationship r...

10 years agoMerge pull request #3198 from davecivicrm/CRM-14639
Dave Greenberg [Thu, 8 May 2014 00:15:26 +0000 (20:15 -0400)]
Merge pull request #3198 from davecivicrm/CRM-14639

CRM-14639 - replace stale PR.

10 years agoAdd fix for trailing single-quote in Awaiting Information grant status label.
Dave Greenberg [Thu, 8 May 2014 00:14:18 +0000 (20:14 -0400)]
Add fix for trailing single-quote in Awaiting Information grant status label.

10 years agocomment fixes
Eileen McNaughton [Thu, 8 May 2014 00:13:02 +0000 (12:13 +1200)]
comment fixes

10 years agoCRM-14639 - replace stale PR.
Dave Greenberg [Thu, 8 May 2014 00:10:22 +0000 (20:10 -0400)]
CRM-14639 - replace stale PR.

----------------------------------------
* CRM-14639:
  https://issues.civicrm.org/jira/browse/CRM-14639

10 years agocomment fixes
Eileen McNaughton [Thu, 8 May 2014 00:01:43 +0000 (12:01 +1200)]
comment fixes

10 years agominor code tidy ups highlighted by IDE
Eileen McNaughton [Wed, 7 May 2014 23:55:42 +0000 (11:55 +1200)]
minor code tidy ups highlighted by IDE

10 years agoMerge pull request #3196 from JoeMurray/master
Dave Greenberg [Wed, 7 May 2014 22:48:49 +0000 (18:48 -0400)]
Merge pull request #3196 from JoeMurray/master

Adding civicrm_mailing_spool for Redirect to DB

10 years agoMerge pull request #3183 from NileemaJadhav/CRM-master
Yashodha Chaku [Wed, 7 May 2014 22:42:29 +0000 (04:12 +0530)]
Merge pull request #3183 from NileemaJadhav/CRM-master

--Fix for "New Case" page break

10 years agoMerge pull request #3114 from Edzelopez/CRM-14621
Dave Greenberg [Wed, 7 May 2014 22:31:59 +0000 (18:31 -0400)]
Merge pull request #3114 from Edzelopez/CRM-14621

CRM-14621 Fixed rendering of date fields on On Behalf of profiles

10 years agoAdding civicrm_mailing_spool for Redirect to DB
JoeMurray [Wed, 7 May 2014 22:24:20 +0000 (18:24 -0400)]
Adding civicrm_mailing_spool for Redirect to DB

10 years agoMerge pull request #3192 from NileemaJadhav/CRM-14475
Kurund Jalmi [Wed, 7 May 2014 16:11:10 +0000 (09:11 -0700)]
Merge pull request #3192 from NileemaJadhav/CRM-14475

CRM-14475 Create basic CRUD API for CaseType

10 years agoMerge pull request #3193 from monishdeb/CRM-14627
Kurund Jalmi [Wed, 7 May 2014 16:09:02 +0000 (09:09 -0700)]
Merge pull request #3193 from monishdeb/CRM-14627

CRM-14627 fix - civicrm navigation inconsistent

10 years agoMerge pull request #3194 from atif-shaikh/WebTextFix
Kurund Jalmi [Wed, 7 May 2014 16:08:25 +0000 (09:08 -0700)]
Merge pull request #3194 from atif-shaikh/WebTextFix

WebTestFix

10 years agoCRM-14656 - Add contact ID A and B and relationship ID to Relationship report, and...
Dave Greenberg [Wed, 7 May 2014 15:31:55 +0000 (11:31 -0400)]
CRM-14656 - Add contact ID A and B and relationship ID to Relationship report, and some field title cleanup for consistency.

----------------------------------------
* CRM-14656:
  https://issues.civicrm.org/jira/browse/CRM-14656

10 years agoWebTestFix
atif-shaikh [Wed, 7 May 2014 15:18:25 +0000 (20:48 +0530)]
WebTestFix

10 years agoCRM-14627 fix - civicrm navigation inconsistent
monishdeb [Wed, 7 May 2014 15:14:00 +0000 (20:44 +0530)]
CRM-14627 fix - civicrm navigation inconsistent

https://issues.civicrm.org/jira/browse/CRM-14627

10 years ago--Tweak to condition to check create condition
Nileema [Wed, 7 May 2014 14:48:06 +0000 (20:18 +0530)]
--Tweak to condition to check create condition

10 years agoCRM-14475 Create basic CRUD API for CaseType
Nileema [Wed, 7 May 2014 14:20:12 +0000 (19:50 +0530)]
CRM-14475 Create basic CRUD API for CaseType

----------------------------------------
* CRM-14475: Create basic CRUD API for CaseType
  https://issues.civicrm.org/jira/browse/CRM-14475

10 years agoMerge pull request #3189 from yashodha/CRM-13776
Yashodha Chaku [Wed, 7 May 2014 01:03:17 +0000 (06:33 +0530)]
Merge pull request #3189 from yashodha/CRM-13776

CRM-13776 limit the reminder to 'administer CiviCRM' permission

10 years agoCRM-13776 limit the reminder to 'administer CiviCRM' permission
yashodha [Wed, 7 May 2014 01:15:02 +0000 (06:45 +0530)]
CRM-13776 limit the reminder to 'administer CiviCRM' permission

10 years agofix IATS recurring payments
JoeMurray [Tue, 6 May 2014 21:50:19 +0000 (17:50 -0400)]
fix IATS recurring payments

10 years agoMerge pull request #3187 from monishdeb/CRM-13981
Kurund Jalmi [Tue, 6 May 2014 19:20:57 +0000 (12:20 -0700)]
Merge pull request #3187 from monishdeb/CRM-13981

CRM-13981, Handling Soft Credit for Gift Membership

10 years agoCRM-13981, Handling Soft Credit for Gift Membership
monishdeb [Tue, 6 May 2014 18:09:01 +0000 (23:39 +0530)]
CRM-13981, Handling Soft Credit for Gift Membership

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
  https://issues.civicrm.org/jira/browse/CRM-13981

10 years agoMerge pull request #3156 from KarinG/CRM-14570
Dave Greenberg [Tue, 6 May 2014 16:58:14 +0000 (12:58 -0400)]
Merge pull request #3156 from KarinG/CRM-14570

CRM-14570 - Participant Role Notices in postprocess.

10 years agoMerge pull request #3182 from jitendrapurohit/Webtest_fix_4.5alpha
Kurund Jalmi [Tue, 6 May 2014 16:34:02 +0000 (09:34 -0700)]
Merge pull request #3182 from jitendrapurohit/Webtest_fix_4.5alpha

Web Test Fix

10 years agoMerge pull request #3181 from atif-shaikh/WebTextFix
Kurund Jalmi [Tue, 6 May 2014 16:33:27 +0000 (09:33 -0700)]
Merge pull request #3181 from atif-shaikh/WebTextFix

WebTestFix