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
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
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
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
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
Pradeep Nayak [Sat, 3 May 2014 11:26:10 +0000 (16:56 +0530)]
-- CRM-14632, removed hard-coded status filtering and also fixed notice errors.
----------------------------------------
* CRM-14632: Grant Statistics Report crash
https://issues.civicrm.org/jira/browse/CRM-14632
Pradeep Nayak [Sat, 3 May 2014 10:51:12 +0000 (16:21 +0530)]
-- added code to set default website type in inline mode, 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 [Sat, 3 May 2014 10:50:11 +0000 (16:20 +0530)]
-- added code to set default website type during add new contact mode, 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
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
mark burdett [Sat, 3 May 2014 01:32:13 +0000 (18:32 -0700)]
add a few more submenus
Coleman Watts [Sat, 3 May 2014 01:24:36 +0000 (18:24 -0700)]
CRM-13580 - change signature of CRM.ts
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
Tim Otten [Fri, 2 May 2014 23:44:22 +0000 (16:44 -0700)]
Merge pull request #3086 from colemanw/onBehalf
Contribution form improvements
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
Kurund Jalmi [Fri, 2 May 2014 23:02:11 +0000 (16:02 -0700)]
Merge pull request #3132 from GinkgoFJG/4.4
Update CONTRIBUTORS.txt for Ginkgo Street Labs.
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
Coleman Watts [Fri, 2 May 2014 22:40:11 +0000 (15:40 -0700)]
Contribution onBehalf form - Improve ajax callback
Coleman Watts [Fri, 2 May 2014 22:39:39 +0000 (15:39 -0700)]
Contribution onBehalf form - Fix js bug
Coleman Watts [Fri, 2 May 2014 22:29:54 +0000 (15:29 -0700)]
code cleanup
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
Frank J. Gómez [Fri, 2 May 2014 22:15:49 +0000 (15:15 -0700)]
Update for Ginkgo Street Labs.
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:52:37 +0000 (14:52 -0700)]
Merge pull request #3111 from mlutfy/4.4-crm13068-b
CRM-13068: load .mo files from l10n/xx_XX/LC_MESSAGES/civicrm.mo
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
projects / civicrm-core.git / log