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
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
Eileen McNaughton [Sat, 3 May 2014 04:37:48 +0000 (21:37 -0700)]
Merge pull request #3150 from eileenmcnaughton/tests
fix for test bug due to faulty kiwi brain wiring
Eileen McNaughton [Sat, 3 May 2014 04:37:17 +0000 (21:37 -0700)]
fix for test bug due to faulty kiwi brain wiring
Eileen McNaughton [Sat, 3 May 2014 04:30:38 +0000 (21:30 -0700)]
Merge pull request #3147 from eileenmcnaughton/CRM-14367
CRM-14367 check for appropriateness of <td> separator
Eileen McNaughton [Sat, 3 May 2014 04:27:33 +0000 (21:27 -0700)]
CRM-14367 remove unused & try catch in favour of hard fail (can't think of any cases where soft fail is good
Eileen McNaughton [Sat, 3 May 2014 04:25:50 +0000 (21:25 -0700)]
CRM-14367 code tidy ups
Eileen McNaughton [Sat, 3 May 2014 04:21:57 +0000 (21:21 -0700)]
CRM-14367 add regex to check for applicability of table cell
Tim Otten [Sat, 3 May 2014 03:52:03 +0000 (20:52 -0700)]
Merge pull request #3145 from KarinG/CRM-11302b
Fixed wording of commentary re: CRM-11302
KarinG [Sat, 3 May 2014 02:41:16 +0000 (20:41 -0600)]
Fixed wording of commentary.
Eileen McNaughton [Sat, 3 May 2014 00:59:20 +0000 (17:59 -0700)]
CRM-14367 check for valid html structure - regex function to come
Yashodha Chaku [Sat, 3 May 2014 02:07:34 +0000 (07:37 +0530)]
Merge pull request #3143 from leez/CRM-14063
now shows more than one attachment icon if comment has more than one
leez [Sat, 3 May 2014 01:57:38 +0000 (18:57 -0700)]
now shows more than one attachment icon if comment has more than one
Kurund Jalmi [Sat, 3 May 2014 01:39:58 +0000 (18:39 -0700)]
Merge pull request #3119 from pradpnayak/CRM-14380
-- made financial account as required, CRM-14380
Yashodha Chaku [Sat, 3 May 2014 00:31:41 +0000 (06:01 +0530)]
Merge pull request #3139 from leez/CRM-14063
CRM-14063-added attachment icon for comments that are children of notes
leez [Sat, 3 May 2014 00:28:22 +0000 (17:28 -0700)]
CRM-14063-added attachment icon for comments that are children of notes
colemanw [Sat, 3 May 2014 00:26:35 +0000 (17:26 -0700)]
Merge pull request #3138 from colemanw/contactRef
js updates
Coleman Watts [Sat, 3 May 2014 00:14:19 +0000 (17:14 -0700)]
CRM-13929 - Remove jQuery migrate
Coleman Watts [Sat, 3 May 2014 00:06:32 +0000 (17:06 -0700)]
CRM-13966 - Remove legacy autocomplete plugin
Coleman Watts [Sat, 3 May 2014 00:02:48 +0000 (17:02 -0700)]
CRM-13966 - Migrate custom ContactReference fields to use select2
Maggie [Fri, 2 May 2014 23:43:54 +0000 (19:43 -0400)]
Rewrote function to put display if there is a cid so it would not create an error when emailing contacts from advanced search--might make more sense to remove function but wanted to preserve functionality if needed
Eileen McNaughton [Fri, 2 May 2014 23:24:52 +0000 (16:24 -0700)]
Merge pull request #3137 from eileenmcnaughton/CRM-14367
test fix - typo in var
Eileen McNaughton [Fri, 2 May 2014 23:24:14 +0000 (16:24 -0700)]
test fix - typo in var
Eileen McNaughton [Fri, 2 May 2014 23:10:45 +0000 (16:10 -0700)]
Merge pull request #3136 from eileenmcnaughton/CRM-14367
CRM-14367 e-notice fix
Eileen McNaughton [Fri, 2 May 2014 23:09:30 +0000 (16:09 -0700)]
CRM-14367 e-notice fix
Eileen McNaughton [Fri, 2 May 2014 22:49:29 +0000 (15:49 -0700)]
Merge pull request #3134 from eileenmcnaughton/CRM-14367
CRM-14367 fix incorrect addition of separators before first string
Eileen McNaughton [Fri, 2 May 2014 22:48:14 +0000 (15:48 -0700)]
Comment fix
Eileen McNaughton [Fri, 2 May 2014 22:47:39 +0000 (15:47 -0700)]
CRM-14367 fix incorrect addition of separators before first string
Eileen McNaughton [Fri, 2 May 2014 22:20:43 +0000 (15:20 -0700)]
Merge pull request #3133 from eileenmcnaughton/CRM-14367
Tidy ups & test fixes preparatory to fix
Eileen McNaughton [Fri, 2 May 2014 22:19:22 +0000 (15:19 -0700)]
fix static vs non static method in tests
Eileen McNaughton [Fri, 2 May 2014 22:16:06 +0000 (15:16 -0700)]
comment cleanup & remove unused functions
Eileen McNaughton [Fri, 2 May 2014 22:09:58 +0000 (15:09 -0700)]
more comment fixes
Dave Greenberg [Fri, 2 May 2014 22:07:56 +0000 (15:07 -0700)]
Merge pull request #3057 from agh1/counties-as-extensions
CRM-13927 fix county notice and point it to extensions
Eileen McNaughton [Fri, 2 May 2014 22:06:39 +0000 (15:06 -0700)]
update comment blocks
Kurund Jalmi [Fri, 2 May 2014 22:06:00 +0000 (15:06 -0700)]
Merge pull request #3131 from kurund/CRM-14238
fixes for CRM-14238
kurund [Fri, 2 May 2014 22:05:26 +0000 (15:05 -0700)]
fixes for CRM-14238
----------------------------------------
* CRM-14238: Export of Membership drops Campaign ID and Campaign Title
https://issues.civicrm.org/jira/browse/CRM-14238
Yashodha Chaku [Fri, 2 May 2014 21:57:07 +0000 (03:27 +0530)]
Merge pull request #3126 from pradpnayak/CRM-9288
Crm 9288
Dave Greenberg [Fri, 2 May 2014 21:54:51 +0000 (14:54 -0700)]
Merge pull request #3130 from davecivicrm/CRM-11302
CRM-11302 - some syntax fixes and put buttons in standard order on the n...
Dave Greenberg [Fri, 2 May 2014 21:54:16 +0000 (14:54 -0700)]
CRM-11302 - some syntax fixes and put buttons in standard order on the new forms.
----------------------------------------
* CRM-11302:
https://issues.civicrm.org/jira/browse/CRM-11302
Kurund Jalmi [Fri, 2 May 2014 21:48:15 +0000 (14:48 -0700)]
Merge pull request #3127 from GinkgoFJG/CRM-14354
Misc code clean-up around membership/contribution forms
mzd [Fri, 2 May 2014 21:11:21 +0000 (17:11 -0400)]
CRM-14353 fix for changed fields check not being disabled on submit
----------------------------------------
* CRM-14353: Fix formNavigate to work with multiple forms & ajax
https://issues.civicrm.org/jira/browse/CRM-14353
Eileen McNaughton [Fri, 2 May 2014 21:18:56 +0000 (14:18 -0700)]
Merge pull request #3107 from eileenmcnaughton/tests
CRM-14319 addition to scheduled reminders not being sent
Yashodha Chaku [Fri, 2 May 2014 21:11:24 +0000 (02:41 +0530)]
Merge pull request #3128 from yashodha/CRM-11182.4.5
limit option for confirmation only for free events
yashodha [Fri, 2 May 2014 21:23:42 +0000 (02:53 +0530)]
limit option for confirmation only for free events
Eileen McNaughton [Fri, 2 May 2014 21:07:24 +0000 (14:07 -0700)]
test fix - change var to non-static
Kurund Jalmi [Fri, 2 May 2014 21:01:44 +0000 (14:01 -0700)]
Merge pull request #3125 from kurund/CRM-14084
CRM-14084 fixes - Search by participant role does not work in Search Bui...
kurund [Fri, 2 May 2014 21:00:44 +0000 (14:00 -0700)]
CRM-14084 fixes - Search by participant role does not work in Search Builder
https://issues.civicrm.org/jira/browse/CRM-14084
Pradeep Nayak [Fri, 2 May 2014 20:59:39 +0000 (02:29 +0530)]
-- added code to set/update is default for website type, CRM-9288
----------------------------------------
* CRM-9288: Website type improvements: allow multiple websites in Profiles, respect default type and update type options
https://issues.civicrm.org/jira/browse/CRM-9288
Pradeep Nayak [Fri, 2 May 2014 20:59:15 +0000 (02:29 +0530)]
-- added upgrade script, CRM-9288
----------------------------------------
* CRM-9288: Website type improvements: allow multiple websites in Profiles, respect default type and update type options
https://issues.civicrm.org/jira/browse/CRM-9288
Frank J. Gómez [Fri, 2 May 2014 20:13:51 +0000 (13:13 -0700)]
Added some code documentation to help with debugging.
Frank J. Gómez [Sun, 27 Apr 2014 18:01:02 +0000 (11:01 -0700)]
Whitespace edit for code readability.
Frank J. Gómez [Fri, 21 Mar 2014 20:42:50 +0000 (16:42 -0400)]
Fixed misnamed variable. Should result in more useful error messages.
Frank J. Gómez [Fri, 21 Mar 2014 17:10:50 +0000 (13:10 -0400)]
Variable $className was undefined; replaced it with a lookup for the class name of the current form.
Frank J. Gómez [Fri, 21 Mar 2014 17:08:34 +0000 (13:08 -0400)]
Replaced hardcoded contribution status ID with a pseudoconstant lookup.
Pradeep Nayak [Fri, 2 May 2014 20:58:44 +0000 (02:28 +0530)]
-- CRM-9288 - Website type improvements: allow multiple websites in Profiles, respect default type and update type options
https://issues.civicrm.org/jira/browse/CRM-9288
Frank J. Gómez [Fri, 21 Mar 2014 17:02:13 +0000 (13:02 -0400)]
Code cleanup. Improved readability with better variable names. Removed unused variables. Shouldn't actually change anything about how Civi works.
Kurund Jalmi [Fri, 2 May 2014 20:54:22 +0000 (13:54 -0700)]
Merge pull request #3124 from adamwight/CRM-14473-setnull
Prevent delete cascade from case_type to case
Kurund Jalmi [Fri, 2 May 2014 20:52:26 +0000 (13:52 -0700)]
Merge pull request #3083 from freeform/CRM-14084
CRM-14084 - Fix for Search by participant role does not work in Search Builder
Adam Roses Wight [Fri, 2 May 2014 20:43:09 +0000 (13:43 -0700)]
Prevent delete cascade from case_type to case
CRM-14473: Migrate case-types from OptionGroup to new table
colemanw [Fri, 2 May 2014 20:24:39 +0000 (13:24 -0700)]
Merge pull request #3123 from adamwight/aw-fixtures-typo
fix typo caused by merge resolution
Adam Roses Wight [Fri, 2 May 2014 20:21:55 +0000 (13:21 -0700)]
fix typo caused by merge resolution
Yashodha Chaku [Fri, 2 May 2014 19:21:52 +0000 (00:51 +0530)]
Merge pull request #3121 from yashodha/CRM-14134
fix upgrade typo
yashodha [Fri, 2 May 2014 19:34:12 +0000 (01:04 +0530)]
fix upgrade typo
yashodha [Fri, 2 May 2014 19:20:13 +0000 (00:50 +0530)]
CRM-14134 : allow option to configure dedupe rule per event
Yashodha Chaku [Fri, 2 May 2014 19:08:27 +0000 (00:38 +0530)]
Merge pull request #3118 from yashodha/CRM-14134
CRM-14134 : allow option to configure dedupe rule per event
Pradeep Nayak [Fri, 2 May 2014 19:07:50 +0000 (00:37 +0530)]
-- made financial account as required, CRM-14380
----------------------------------------
* CRM-14380: Adding a new Payment Instrument does not require account, results in unbalanced transactions
https://issues.civicrm.org/jira/browse/CRM-14380
Coleman Watts [Fri, 2 May 2014 18:41:15 +0000 (11:41 -0700)]
Code cleanup
Kurund Jalmi [Fri, 2 May 2014 18:10:04 +0000 (11:10 -0700)]
Merge pull request #3077 from adamwight/test_fixtures
Provide a RoR-like test fixture helper
Kurund Jalmi [Fri, 2 May 2014 18:02:49 +0000 (11:02 -0700)]
Merge pull request #3106 from adamwight/CRM-14473-l10n
CiviCase case type fields are localized
Kurund Jalmi [Fri, 2 May 2014 17:50:55 +0000 (10:50 -0700)]
Merge pull request #3116 from jitendrapurohit/Report_Webtest
Web Test Fix
jitendrapurohit [Fri, 2 May 2014 11:41:57 +0000 (17:11 +0530)]
Web Test Fix
Deepak Srivastava [Fri, 2 May 2014 07:17:52 +0000 (12:47 +0530)]
Merge pull request #3113 from deepak-srivastava/CRM-14431
CRM-14431 - send report api function exits rather than returning (this c...
Deepak Srivastava [Fri, 2 May 2014 07:16:26 +0000 (12:46 +0530)]
CRM-14431 - send report api function exits rather than returning (this can mess up scheduled jobs)
https://issues.civicrm.org/jira/browse/CRM-14431
Adam Roses Wight [Fri, 2 May 2014 01:37:45 +0000 (18:37 -0700)]
localize the case type schema migration
colemanw [Fri, 2 May 2014 01:25:28 +0000 (18:25 -0700)]
Merge pull request #3096 from mepps/remove-autocomplete-email
Removed autocomplete from send email activity
Maggie [Fri, 2 May 2014 01:17:31 +0000 (21:17 -0400)]
Removed tokeninput from CRM/Core/Resources.php
Coleman Watts [Fri, 2 May 2014 01:14:00 +0000 (18:14 -0700)]
CRM-14353 - Standardize unsaved form popups
Maggie [Fri, 2 May 2014 01:14:24 +0000 (21:14 -0400)]
Prepopulated autoselect with email values--found bug caused by other code to be reconciled later
Yashodha Chaku [Fri, 2 May 2014 01:11:31 +0000 (06:41 +0530)]
Merge pull request #3110 from yashodha/4.5.CRM-11182
CRM-11182 : option to configure confirm screen
yashodha [Fri, 2 May 2014 01:24:14 +0000 (06:54 +0530)]
option to configure confirm screen
Dave Greenberg [Fri, 2 May 2014 01:03:29 +0000 (18:03 -0700)]
Merge pull request #3109 from davecivicrm/CRM-14515
CRM-14515 add display of the link for the PCP itself.