civicrm-core.git
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 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 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 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 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

10 years agoMerge pull request #3185 from davecivicrm/CRM-14513
Dave Greenberg [Tue, 6 May 2014 16:32:35 +0000 (12:32 -0400)]
Merge pull request #3185 from davecivicrm/CRM-14513

CRM-14513 - fixed the constant being checked - should be CIVICRM_MAIL_LO...

10 years agoCRM-14513 - fixed the constant being checked - should be CIVICRM_MAIL_LOG.
Dave Greenberg [Tue, 6 May 2014 16:31:36 +0000 (12:31 -0400)]
CRM-14513 - fixed the constant being checked - should be CIVICRM_MAIL_LOG.

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

10 years agoUpdate Page.php
Dave Greenberg [Tue, 6 May 2014 16:08:29 +0000 (12:08 -0400)]
Update Page.php

Change outbound email alert and debug alert timer to 2 hours. dgg

10 years agoMerge pull request #3122 from TobiasLounsbury/14513
Dave Greenberg [Tue, 6 May 2014 16:06:48 +0000 (12:06 -0400)]
Merge pull request #3122 from TobiasLounsbury/14513

CRM-14513 - Added every two hour admin message when outbound email is disabled.

10 years agoMerge pull request #3184 from davecivicrm/CRM-14367a
Dave Greenberg [Tue, 6 May 2014 15:34:32 +0000 (11:34 -0400)]
Merge pull request #3184 from davecivicrm/CRM-14367a

CRM-14367 - Prevent notice by adding display_name to $returnProperties. ...

10 years agoCRM-14367 - Prevent notice by adding display_name to $returnProperties. Also remove...
Dave Greenberg [Tue, 6 May 2014 15:33:50 +0000 (11:33 -0400)]
CRM-14367 - Prevent notice by adding display_name to $returnProperties. Also remove unintentionally committed debug line in CRM/Mailing/Form/Settings.php

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

10 years agoMerge pull request #3135 from eileenmcnaughton/CRM-14367-pdf-option
Dave Greenberg [Tue, 6 May 2014 15:21:42 +0000 (11:21 -0400)]
Merge pull request #3135 from eileenmcnaughton/CRM-14367-pdf-option

CRM-14367 make pdf option dependent on site setting

10 years ago--Fix for "New Case" page break
Nileema [Tue, 6 May 2014 14:38:20 +0000 (20:08 +0530)]
--Fix for "New Case" page break

10 years agoWeb Test Fix
jitendrapurohit [Tue, 6 May 2014 14:30:31 +0000 (20:00 +0530)]
Web Test Fix

10 years agoWebTestFix
Atif Shaikh [Tue, 6 May 2014 14:17:42 +0000 (19:47 +0530)]
WebTestFix

10 years agoMerge pull request #3167 from adamwight/CRM-14473-warning
Kurund Jalmi [Tue, 6 May 2014 07:35:20 +0000 (00:35 -0700)]
Merge pull request #3167 from adamwight/CRM-14473-warning

More accurate warning text

10 years agoMerge pull request #3180 from NileemaJadhav/CRM-master
Kurund Jalmi [Tue, 6 May 2014 07:11:16 +0000 (00:11 -0700)]
Merge pull request #3180 from NileemaJadhav/CRM-master

Fix for 'Case dashboard' and 'Find case' page break

10 years agoMerge pull request #3171 from atif-shaikh/WebTextFix
pratik-joshi [Tue, 6 May 2014 06:58:07 +0000 (12:28 +0530)]
Merge pull request #3171 from atif-shaikh/WebTextFix

Web text fix

10 years agoWebTestFix Improvements
Atif Shaikh [Tue, 6 May 2014 06:42:45 +0000 (12:12 +0530)]
WebTestFix Improvements

10 years ago--Modification to caseType PseudoConstant function call
Nileema [Tue, 6 May 2014 06:37:53 +0000 (12:07 +0530)]
--Modification to caseType PseudoConstant function call

10 years agoMerge pull request #3170 from jitendrapurohit/WebFix
pratik-joshi [Tue, 6 May 2014 06:33:34 +0000 (12:03 +0530)]
Merge pull request #3170 from jitendrapurohit/WebFix

Web Test Fixes

10 years agoWebtestFix Further Enhancements
Atif Shaikh [Mon, 5 May 2014 14:57:04 +0000 (20:27 +0530)]
WebtestFix Further Enhancements

10 years agoWebTestFix Further Changes
Atif Shaikh [Mon, 5 May 2014 14:53:30 +0000 (20:23 +0530)]
WebTestFix Further Changes

10 years agoWebTestFix
Atif Shaikh [Mon, 5 May 2014 14:47:18 +0000 (20:17 +0530)]
WebTestFix

10 years ago--Fix for 'Case dashboard' and 'Find case' page break
Nileema [Tue, 6 May 2014 06:23:19 +0000 (11:53 +0530)]
--Fix for 'Case dashboard' and 'Find case' page break

10 years agoAdded more information to array for hook--title and id of badge format selected
Maggie [Mon, 5 May 2014 21:17:47 +0000 (17:17 -0400)]
Added more information to array for hook--title and id of badge format selected

10 years agoChanged placement of hook to be able to access variables better
Maggie [Mon, 5 May 2014 17:00:17 +0000 (13:00 -0400)]
Changed placement of hook to be able to access variables better

10 years agoMerge pull request #3177 from colemanw/cleanup
colemanw [Mon, 5 May 2014 18:36:49 +0000 (14:36 -0400)]
Merge pull request #3177 from colemanw/cleanup

Various fixes and cleanup

10 years agoMerge pull request #3168 from monishdeb/CRM-13833
colemanw [Mon, 5 May 2014 18:32:16 +0000 (14:32 -0400)]
Merge pull request #3168 from monishdeb/CRM-13833

Minor fix on SC tpl

10 years agoMerge pull request #3175 from eileenmcnaughton/CRM-14559
Eileen McNaughton [Mon, 5 May 2014 16:14:10 +0000 (09:14 -0700)]
Merge pull request #3175 from eileenmcnaughton/CRM-14559

CRM-14459 change use of separator in form to be explicit

10 years agoCRM-14459 change use of separator in form to be explicit
Eileen McNaughton [Mon, 5 May 2014 16:13:07 +0000 (09:13 -0700)]
CRM-14459 change use of separator in form to be explicit

10 years agoMerge pull request #3169 from pratik-joshi/CRM-13973-pay_later_change_selection
Dave Greenberg [Mon, 5 May 2014 16:07:55 +0000 (12:07 -0400)]
Merge pull request #3169 from pratik-joshi/CRM-13973-pay_later_change_selection

CRM-13973 : comment #comment-59922

10 years agoMerge pull request #3174 from eileenmcnaughton/CRM-14559
Eileen McNaughton [Mon, 5 May 2014 16:06:37 +0000 (09:06 -0700)]
Merge pull request #3174 from eileenmcnaughton/CRM-14559

CRM-14559 make remaining instances of adding the hex(01) to forms explic...

10 years agoCRM-14559 make remaining instances of adding the hex(01) to forms explicit & add...
Eileen McNaughton [Mon, 5 May 2014 16:05:12 +0000 (09:05 -0700)]
CRM-14559 make remaining instances of adding the hex(01) to forms explicit & add todo to remove

10 years agoMerge pull request #3172 from eileenmcnaughton/tests
Eileen McNaughton [Mon, 5 May 2014 15:35:28 +0000 (08:35 -0700)]
Merge pull request #3172 from eileenmcnaughton/tests

fix test to match behaviour

10 years agofix test to match behaviour
Eileen McNaughton [Mon, 5 May 2014 15:35:08 +0000 (08:35 -0700)]
fix test to match behaviour

10 years agoWeb Test Fixes
jitendrapurohit [Mon, 5 May 2014 14:48:40 +0000 (20:18 +0530)]
Web Test Fixes

10 years agoCRM-13973 : comment #comment-59922
Pratik Joshi [Mon, 5 May 2014 12:56:54 +0000 (18:26 +0530)]
CRM-13973 : comment #comment-59922

10 years agoMinor fix on SC tpl
monishdeb [Mon, 5 May 2014 08:34:01 +0000 (14:04 +0530)]
Minor fix on SC tpl

10 years agoMore accurate warning text
Adam Roses Wight [Mon, 5 May 2014 06:37:56 +0000 (23:37 -0700)]
More accurate warning text

If a case type is deleted, linked case.case_type_id data will be set to
null, rather than cascade deleted.  Update the warning to reflect this.

10 years agoMerge pull request #3166 from eileenmcnaughton/tests
Eileen McNaughton [Mon, 5 May 2014 05:21:40 +0000 (22:21 -0700)]
Merge pull request #3166 from eileenmcnaughton/tests

test fix - should have failed

10 years agotest fix - should have failed
Eileen McNaughton [Mon, 5 May 2014 05:21:07 +0000 (22:21 -0700)]
test fix - should have failed

10 years agoMerge pull request #3165 from eileenmcnaughton/tests
Eileen McNaughton [Mon, 5 May 2014 03:16:20 +0000 (20:16 -0700)]
Merge pull request #3165 from eileenmcnaughton/tests

test fixes & tidy up

10 years agoignore system_log in update single test as updating logs doesn't make sense
Eileen McNaughton [Mon, 5 May 2014 03:14:39 +0000 (20:14 -0700)]
ignore system_log in update single test as updating logs doesn't make sense

10 years agoComment fixes
Eileen McNaughton [Mon, 5 May 2014 03:03:45 +0000 (20:03 -0700)]
Comment fixes

10 years agoCRM-14612 - Fix relationship permission checkboxes
Coleman Watts [Sun, 4 May 2014 23:47:41 +0000 (19:47 -0400)]
CRM-14612 - Fix relationship permission checkboxes