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...
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.
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.
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
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
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
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
JoeMurray [Wed, 7 May 2014 22:24:20 +0000 (18:24 -0400)]
Adding civicrm_mailing_spool for Redirect to DB
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
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
Kurund Jalmi [Wed, 7 May 2014 16:08:25 +0000 (09:08 -0700)]
Merge pull request #3194 from atif-shaikh/WebTextFix
WebTestFix
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
atif-shaikh [Wed, 7 May 2014 15:18:25 +0000 (20:48 +0530)]
WebTestFix
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
Nileema [Wed, 7 May 2014 14:48:06 +0000 (20:18 +0530)]
--Tweak to condition to check create condition
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
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
yashodha [Wed, 7 May 2014 01:15:02 +0000 (06:45 +0530)]
CRM-13776 limit the reminder to 'administer CiviCRM' permission
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
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
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.
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
Kurund Jalmi [Tue, 6 May 2014 16:33:27 +0000 (09:33 -0700)]
Merge pull request #3181 from atif-shaikh/WebTextFix
WebTestFix
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...
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
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
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.
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. ...
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
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
Nileema [Tue, 6 May 2014 14:38:20 +0000 (20:08 +0530)]
--Fix for "New Case" page break
jitendrapurohit [Tue, 6 May 2014 14:30:31 +0000 (20:00 +0530)]
Web Test Fix
Atif Shaikh [Tue, 6 May 2014 14:17:42 +0000 (19:47 +0530)]
WebTestFix
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
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
pratik-joshi [Tue, 6 May 2014 06:58:07 +0000 (12:28 +0530)]
Merge pull request #3171 from atif-shaikh/WebTextFix
Web text fix
Atif Shaikh [Tue, 6 May 2014 06:42:45 +0000 (12:12 +0530)]
WebTestFix Improvements
Nileema [Tue, 6 May 2014 06:37:53 +0000 (12:07 +0530)]
--Modification to caseType PseudoConstant function call
pratik-joshi [Tue, 6 May 2014 06:33:34 +0000 (12:03 +0530)]
Merge pull request #3170 from jitendrapurohit/WebFix
Web Test Fixes
Atif Shaikh [Mon, 5 May 2014 14:57:04 +0000 (20:27 +0530)]
WebtestFix Further Enhancements
Atif Shaikh [Mon, 5 May 2014 14:53:30 +0000 (20:23 +0530)]
WebTestFix Further Changes
Atif Shaikh [Mon, 5 May 2014 14:47:18 +0000 (20:17 +0530)]
WebTestFix
Nileema [Tue, 6 May 2014 06:23:19 +0000 (11:53 +0530)]
--Fix for 'Case dashboard' and 'Find case' page break
colemanw [Mon, 5 May 2014 18:36:49 +0000 (14:36 -0400)]
Merge pull request #3177 from colemanw/cleanup
Various fixes and cleanup
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
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
Eileen McNaughton [Mon, 5 May 2014 16:13:07 +0000 (09:13 -0700)]
CRM-14459 change use of separator in form to be explicit
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
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...
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
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
Eileen McNaughton [Mon, 5 May 2014 15:35:08 +0000 (08:35 -0700)]
fix test to match behaviour
jitendrapurohit [Mon, 5 May 2014 14:48:40 +0000 (20:18 +0530)]
Web Test Fixes
Pratik Joshi [Mon, 5 May 2014 12:56:54 +0000 (18:26 +0530)]
CRM-13973 : comment #comment-59922
monishdeb [Mon, 5 May 2014 08:34:01 +0000 (14:04 +0530)]
Minor fix on SC tpl
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.
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
Eileen McNaughton [Mon, 5 May 2014 05:21:07 +0000 (22:21 -0700)]
test fix - should have failed
Eileen McNaughton [Mon, 5 May 2014 03:16:20 +0000 (20:16 -0700)]
Merge pull request #3165 from eileenmcnaughton/tests
test fixes & tidy up
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
Eileen McNaughton [Mon, 5 May 2014 03:03:45 +0000 (20:03 -0700)]
Comment fixes
Coleman Watts [Sun, 4 May 2014 23:47:41 +0000 (19:47 -0400)]
CRM-14612 - Fix relationship permission checkboxes
Coleman Watts [Sun, 4 May 2014 23:35:57 +0000 (19:35 -0400)]
attachment.tpl - cleanup related to js clear buttons
Coleman Watts [Sun, 4 May 2014 23:35:14 +0000 (19:35 -0400)]
Note.tpl - Add clause to prevent javascript crash
Coleman Watts [Sun, 4 May 2014 23:32:48 +0000 (19:32 -0400)]
jsortable.tpl - Removed buggy function
I really don't know what this function was attempting to do but it was crashing jQuery.
colemanw [Sun, 4 May 2014 02:36:46 +0000 (19:36 -0700)]
Merge pull request #3163 from colemanw/select2
Update select2 plugin to 3.4.8 and use minified version
Coleman Watts [Sun, 4 May 2014 02:36:07 +0000 (19:36 -0700)]
Update select2 plugin to 3.4.8 and use minified version
Coleman Watts [Sun, 4 May 2014 02:05:03 +0000 (19:05 -0700)]
CRM-14215 - Remove livePage.js from message templates b/c it doesn't work
colemanw [Sun, 4 May 2014 01:26:07 +0000 (18:26 -0700)]
Merge pull request #3140 from colemanw/master-js-trans
CRM-13580 - Add CRM.translate() helper
Coleman Watts [Sun, 4 May 2014 00:10:17 +0000 (17:10 -0700)]
CRM-14215 - add 'no-popup' to event manage link
colemanw [Sun, 4 May 2014 00:05:03 +0000 (17:05 -0700)]
Merge pull request #3141 from mfb/feature/CRM-14592
Feature/crm 14592
colemanw [Sat, 3 May 2014 23:50:21 +0000 (16:50 -0700)]
Merge pull request #3162 from colemanw/test
CRM-13966 - Add shim to api custom data to fix testActivityCreateCustomContactRefField
Coleman Watts [Sat, 3 May 2014 23:49:38 +0000 (16:49 -0700)]
CRM-13966 - Add shim to api custom data to fix testActivityCreateCustomContactRefField
Kurund Jalmi [Sat, 3 May 2014 23:27:27 +0000 (16:27 -0700)]
Merge pull request #3153 from pradpnayak/CRM-14632
-- CRM-14632, removed hard-coded status filtering and also fixed notice ...
Kurund Jalmi [Sat, 3 May 2014 23:26:10 +0000 (16:26 -0700)]
Merge pull request #3155 from pradpnayak/CRM-14115
-- CRM-14115, added code to limit count on dashboard.
Yashodha Chaku [Sat, 3 May 2014 22:07:12 +0000 (03:37 +0530)]
Merge pull request #3151 from pradpnayak/CRM-9288
Crm 9288
Coleman Watts [Sat, 3 May 2014 22:03:11 +0000 (15:03 -0700)]
Merge branch '4.4' into master
Conflicts:
templates/CRM/Contact/Form/OnBehalfOf.tpl
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
Eileen McNaughton [Sat, 3 May 2014 21:33:20 +0000 (14:33 -0700)]
Merge pull request #3161 from eileenmcnaughton/tests
Comments, formatting, e-notices
Eileen McNaughton [Sat, 3 May 2014 21:22:30 +0000 (14:22 -0700)]
comment fixes
colemanw [Sat, 3 May 2014 21:19:45 +0000 (14:19 -0700)]
Merge pull request #3146 from mepps/fix-prepopulate-send-email
Rewrote function to put display if there is a cid so it would not create...
colemanw [Sat, 3 May 2014 20:35:51 +0000 (13:35 -0700)]
Merge pull request #3160 from colemanw/master
CRM-14353 - Cleanup old dialog when opening a new one
Coleman Watts [Sat, 3 May 2014 20:34:51 +0000 (13:34 -0700)]
CRM-14353 - Cleanup old dialog when opening a new one
colemanw [Sat, 3 May 2014 20:02:41 +0000 (13:02 -0700)]
Merge pull request #3129 from ginkgomzd/CRM-14353-fixes
CRM-14353 fix for changed fields check not being disabled on submit
Coleman Watts [Sat, 3 May 2014 19:56:22 +0000 (12:56 -0700)]
CRM-14572 - fix event registration popup
Eileen McNaughton [Sat, 3 May 2014 18:44:28 +0000 (11:44 -0700)]
comments & formatting fixes
Eileen McNaughton [Sat, 3 May 2014 16:55:09 +0000 (09:55 -0700)]
Comments & e-notice fixes
Eileen McNaughton [Sat, 3 May 2014 15:18:57 +0000 (08:18 -0700)]
Merge pull request #3159 from eileenmcnaughton/tests
test - flush pseudoconstant on case test, comments
Eileen McNaughton [Sat, 3 May 2014 15:18:23 +0000 (08:18 -0700)]
test - flush pseudoconstant on case test, comments
Eileen McNaughton [Sat, 3 May 2014 15:02:35 +0000 (08:02 -0700)]
Merge pull request #3158 from eileenmcnaughton/tests
Test fixes & a few comments
Eileen McNaughton [Sat, 3 May 2014 15:01:46 +0000 (08:01 -0700)]
Test fixes & a few comments
Eileen McNaughton [Sat, 3 May 2014 14:40:29 +0000 (07:40 -0700)]
Merge pull request #3157 from eileenmcnaughton/CRM-14109
CRM-14109 fixes for count prob exposed by tests
Eileen McNaughton [Sat, 3 May 2014 14:39:00 +0000 (07:39 -0700)]
CRM-14109 fix group page acl tests
KarinG [Sat, 3 May 2014 14:04:45 +0000 (08:04 -0600)]
CRM-14570 - Participant Role Notices in postprocess.
Pradeep Nayak [Sat, 3 May 2014 13:54:29 +0000 (19:24 +0530)]
-- CRM-14115, added code to limit count on dashboard.
----------------------------------------
* CRM-14115: Allow maximum number of Reportlet rows to be specified
https://issues.civicrm.org/jira/browse/CRM-14115
Eileen McNaughton [Sat, 3 May 2014 13:46:41 +0000 (06:46 -0700)]
minor tidy ups
Eileen McNaughton [Sat, 3 May 2014 13:33:55 +0000 (06:33 -0700)]
CRM-14109 enable & fix group count tests
Eileen McNaughton [Sat, 3 May 2014 13:17:29 +0000 (06:17 -0700)]
comment cleanup & unused var removal
Eileen McNaughton [Sat, 3 May 2014 13:15:11 +0000 (06:15 -0700)]
comment fixes
Eileen McNaughton [Sat, 3 May 2014 12:43:45 +0000 (05:43 -0700)]
Merge pull request #3154 from eileenmcnaughton/tests
test fix - add extra fns to system_log api
Eileen McNaughton [Sat, 3 May 2014 12:43:09 +0000 (05:43 -0700)]
test fix - add extra fns to system_log api
projects / civicrm-core.git / log