Coleman Watts [Wed, 18 Nov 2015 23:17:53 +0000 (18:17 -0500)]
SyntaxConformance fix
Coleman Watts [Wed, 18 Nov 2015 22:29:58 +0000 (17:29 -0500)]
Indentation fix
Coleman Watts [Wed, 18 Nov 2015 22:24:24 +0000 (17:24 -0500)]
CRM-13823 - Extract setLevel method from CRM_Utils_Check_Message constructor
Coleman Watts [Wed, 18 Nov 2015 21:52:31 +0000 (16:52 -0500)]
CRM-13823 - Extension status msg tweak
Coleman Watts [Wed, 18 Nov 2015 21:45:00 +0000 (16:45 -0500)]
CRM-13823 - Remove unncessary settings
Now that status messages can be snoozed and disabled there is no need for settings specific to version checks.
Coleman Watts [Wed, 18 Nov 2015 19:40:41 +0000 (14:40 -0500)]
CRM-13823 - Split extension status into multiple messages
Coleman Watts [Wed, 18 Nov 2015 17:54:58 +0000 (12:54 -0500)]
CRM-13823 - Tweak popup status alerts
Coleman Watts [Wed, 18 Nov 2015 16:21:00 +0000 (11:21 -0500)]
CRM-13823 - Fix caching of system status
Coleman Watts [Wed, 18 Nov 2015 16:17:46 +0000 (11:17 -0500)]
Fix missing comma
Coleman Watts [Wed, 18 Nov 2015 04:20:09 +0000 (23:20 -0500)]
CRM-13823 - Fix converting null to date
Coleman Watts [Wed, 18 Nov 2015 04:09:23 +0000 (23:09 -0500)]
Better markup and icons for extension version check
Coleman Watts [Tue, 17 Nov 2015 22:56:59 +0000 (17:56 -0500)]
Better format for extension upgrade msg
colemanw [Tue, 17 Nov 2015 22:15:45 +0000 (17:15 -0500)]
Merge pull request #7225 from colemanw/check
System status check improvements
Coleman Watts [Tue, 17 Nov 2015 21:27:32 +0000 (16:27 -0500)]
CRM-13823 - Allow string and numeric output of severity level
Coleman Watts [Tue, 17 Nov 2015 21:11:37 +0000 (16:11 -0500)]
CRM-13823 - Better validation of PSR level
colemanw [Tue, 17 Nov 2015 21:08:53 +0000 (16:08 -0500)]
Merge pull request #7235 from colemanw/djs
Remove deprecated js code
Coleman Watts [Tue, 17 Nov 2015 20:25:10 +0000 (15:25 -0500)]
Avoid duplicate statusPreference checks
Coleman Watts [Tue, 17 Nov 2015 20:11:29 +0000 (15:11 -0500)]
Remove deprecated js code
Coleman Watts [Tue, 17 Nov 2015 19:53:36 +0000 (14:53 -0500)]
Add pseudoconstant to StatusPreference
Fix for failing StatusPreferenceTest - pseudoconstant is needed by api to validate input.
Monish Deb [Tue, 17 Nov 2015 19:00:03 +0000 (00:30 +0530)]
Merge pull request #7234 from monishdeb/testFailures
4.7beta1 Webtest failures
Dave Greenberg [Tue, 17 Nov 2015 17:01:33 +0000 (09:01 -0800)]
Merge pull request #7222 from davecivicrm/CRM-17580
CRM-17580 - Include contributionTokens in contribution PDFLetter (Tha…
Coleman Watts [Tue, 17 Nov 2015 16:10:47 +0000 (11:10 -0500)]
Add CRM.utils.makeDate function
Coleman Watts [Tue, 17 Nov 2015 15:46:15 +0000 (10:46 -0500)]
Add api doc link
monishdeb [Tue, 17 Nov 2015 15:01:03 +0000 (20:31 +0530)]
4.7beta1 Webtest failures
Eileen McNaughton [Tue, 17 Nov 2015 03:24:54 +0000 (16:24 +1300)]
Merge pull request #7224 from eileenmcnaughton/master
comment fixes
Coleman Watts [Tue, 17 Nov 2015 02:55:57 +0000 (21:55 -0500)]
Code style fix
Coleman Watts [Tue, 17 Nov 2015 02:31:12 +0000 (21:31 -0500)]
CRM-13823 - Show/hide button css fix
Coleman Watts [Tue, 17 Nov 2015 02:24:25 +0000 (21:24 -0500)]
Add CRM.utils.formatDate
Coleman Watts [Tue, 17 Nov 2015 01:56:58 +0000 (20:56 -0500)]
System.check api - add severity_id to output
Coleman Watts [Tue, 17 Nov 2015 01:39:07 +0000 (20:39 -0500)]
System.check api cleanup
Coleman Watts [Tue, 17 Nov 2015 01:38:53 +0000 (20:38 -0500)]
CRM-13823 - Display hidden_until date on status page
eileen [Tue, 17 Nov 2015 02:13:51 +0000 (15:13 +1300)]
comment fixes
Eileen McNaughton [Tue, 17 Nov 2015 01:08:33 +0000 (14:08 +1300)]
Merge pull request #7223 from eileenmcnaughton/comments
comment fixes
Dave Greenberg [Tue, 17 Nov 2015 01:06:40 +0000 (17:06 -0800)]
Merge pull request #7216 from jitendrapurohit/CRM-17504
CRM-17504 -- Case activities reporting
eileenmcnaughton [Thu, 22 Oct 2015 01:51:56 +0000 (01:51 +0000)]
comment fixes
Dave Greenberg [Tue, 17 Nov 2015 00:52:07 +0000 (16:52 -0800)]
CRM-17580 - Include contributionTokens in contribution PDFLetter (Thank-you Letter) task.
----------------------------------------
* CRM-17580: Contribution Tokens not available for Print PDF Thank-you Letter Task
https://issues.civicrm.org/jira/browse/CRM-17580
Dave Greenberg [Mon, 16 Nov 2015 23:12:53 +0000 (15:12 -0800)]
Merge pull request #7190 from galgeek/patch-1
CRM-17548 - Thank-you e-mail fails to include message template subject
Coleman Watts [Mon, 16 Nov 2015 17:54:46 +0000 (12:54 -0500)]
CRM-13823 - Add hidden_until property to messages
Barbara Miller [Mon, 16 Nov 2015 16:28:33 +0000 (08:28 -0800)]
= not => !
Coleman Watts [Mon, 16 Nov 2015 16:10:04 +0000 (11:10 -0500)]
CRM-13823 - Refactor CRM_Utils_Check_Message to calculate its own visibility
Coleman Watts [Mon, 16 Nov 2015 15:50:03 +0000 (10:50 -0500)]
Comment fixes
Monish Deb [Mon, 16 Nov 2015 13:27:13 +0000 (18:57 +0530)]
Merge pull request #7218 from monishdeb/testFailures
CRM-17578 fix
monishdeb [Mon, 16 Nov 2015 11:41:59 +0000 (17:11 +0530)]
format fixes
monishdeb [Mon, 16 Nov 2015 11:27:10 +0000 (16:57 +0530)]
CRM-17578 fix - https://issues.civicrm.org/jira/browse/CRM-17578
jitendrapurohit [Mon, 16 Nov 2015 06:18:34 +0000 (11:48 +0530)]
additional fixes
Jitendra Purohit [Thu, 12 Nov 2015 15:38:46 +0000 (21:08 +0530)]
style fix
jitendrapurohit [Fri, 6 Nov 2015 13:26:04 +0000 (18:56 +0530)]
CRM-17504 -- Case activities reporting
colemanw [Mon, 16 Nov 2015 01:53:32 +0000 (20:53 -0500)]
Merge pull request #7211 from agh1/fixStatusAlert
CRM-17575 System Check - stop alert for hushed messages
Eileen McNaughton [Sun, 15 Nov 2015 23:19:16 +0000 (15:19 -0800)]
Merge pull request #7214 from totten/master-wordrep-cache
CRM_Core_I18n - Reduce queries for localized word-replacements.
Tim Otten [Sun, 15 Nov 2015 22:18:18 +0000 (14:18 -0800)]
CRM_Core_I18n - Reduce queries for localized word-replacements.
Eileen McNaughton [Sun, 15 Nov 2015 21:30:45 +0000 (13:30 -0800)]
Merge pull request #7212 from eileenmcnaughton/CRM-17574-2
CRM-17574 fix search to 'listen' to setting for no automatic wildcard. …
Kurund Jalmi [Sun, 15 Nov 2015 19:57:44 +0000 (01:27 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-16-01-17-32
eileen [Sun, 15 Nov 2015 17:09:47 +0000 (09:09 -0800)]
CRM-17574 fix search to 'listen' to setting for no automatic wildcard.
Note the test uses the dataprovider option
eileen [Fri, 13 Nov 2015 16:35:47 +0000 (08:35 -0800)]
fix php static warning
Andrew Hunt [Sat, 14 Nov 2015 22:18:42 +0000 (17:18 -0500)]
CRM-17575 System Check - stop alert for hushed messages
----------------------------------------
* CRM-17575: Hidden alerts still pop up
https://issues.civicrm.org/jira/browse/CRM-17575
colemanw [Sat, 14 Nov 2015 14:26:43 +0000 (09:26 -0500)]
Merge pull request #7202 from colemanw/Date
Date preferences cleanup
Dave Greenberg [Sat, 14 Nov 2015 01:28:54 +0000 (17:28 -0800)]
Merge pull request #7209 from davecivicrm/fixGenerateReportData
Fix GenerateReportData.php style warnings.
Dave Greenberg [Sat, 14 Nov 2015 00:40:00 +0000 (16:40 -0800)]
Merge pull request #7201 from JMAConsulting/CRM-17569
--CRM-17569, changed code to check permission in preprocess when ACL-…
colemanw [Sat, 14 Nov 2015 00:05:22 +0000 (19:05 -0500)]
Merge pull request #7205 from zarandras/master
CRM-17560 - Sql join type fix for civictm_activity_contact
Dave Greenberg [Fri, 13 Nov 2015 23:43:13 +0000 (15:43 -0800)]
Fix GenerateReportData.php style warnings.
colemanw [Fri, 13 Nov 2015 22:07:53 +0000 (17:07 -0500)]
Merge pull request #7180 from GinkgoFJG/CRM-17192
CRM-17192: Fixes problem with failure to prepopulate crmEntityRefs with multiple values.
colemanw [Fri, 13 Nov 2015 22:02:12 +0000 (17:02 -0500)]
Merge pull request #7206 from colemanw/wysiwyg
wysiwyg fixes
zarandras [Fri, 13 Nov 2015 12:52:42 +0000 (13:52 +0100)]
CRM-17560 - Sql join type fix for civictm_activity_contact
Coleman Watts [Fri, 13 Nov 2015 18:07:14 +0000 (13:07 -0500)]
Fix wysiwyg help
Dave Greenberg [Fri, 13 Nov 2015 17:44:42 +0000 (09:44 -0800)]
Merge pull request #7179 from davecivicrm/CRM-14732
CRM-14732
Coleman Watts [Fri, 13 Nov 2015 16:54:58 +0000 (11:54 -0500)]
Fix token selector display with TinyMCE
Coleman Watts [Fri, 13 Nov 2015 16:53:22 +0000 (11:53 -0500)]
CiviMail css tweaks
Eileen McNaughton [Fri, 13 Nov 2015 04:25:34 +0000 (20:25 -0800)]
Merge pull request #7197 from eileenmcnaughton/CRM-17557
CRM-17557 membership not processed to current
eileen [Fri, 13 Nov 2015 02:39:41 +0000 (18:39 -0800)]
CRM-17557 ensure /bin/bash payments are completed
Coleman Watts [Fri, 13 Nov 2015 00:57:20 +0000 (19:57 -0500)]
Translate untranslated strings
Pradeep Nayak [Fri, 13 Nov 2015 00:50:25 +0000 (06:20 +0530)]
--CRM-17569, changed code to check permission in preprocess when ACL-FT is enabled rather permission to menu
Coleman Watts [Fri, 13 Nov 2015 00:40:20 +0000 (19:40 -0500)]
Fix description of searchDate pref to clarify that it affects relationships
Coleman Watts [Fri, 13 Nov 2015 00:36:09 +0000 (19:36 -0500)]
Date preferences form cleanup
colemanw [Fri, 13 Nov 2015 00:25:04 +0000 (19:25 -0500)]
Merge pull request #7199 from colemanw/CRM-16415
CRM-16415 - crmButton fixes
eileen [Thu, 12 Nov 2015 23:45:56 +0000 (15:45 -0800)]
Switch back to retrieving memberships based on membership payment rather than accurate line items
Per comments the unit tests are not building membership payments with accurate linkage between the membership & contribution. THis is not a new
regression so not addressing at the moment. It may related to CRM-14918. NB it seems that the intent is there should be a /bin/bash contribution for a /bin/bash membership
so I guess the line item SHOULD link the 2
eileen [Thu, 12 Nov 2015 23:12:55 +0000 (15:12 -0800)]
CRM-17539 membership payments not completing AND sending emails
eileen [Thu, 12 Nov 2015 20:08:51 +0000 (12:08 -0800)]
CRM-17566 fix eNotice on contributionID not being passed to processor
eileen [Thu, 12 Nov 2015 19:49:21 +0000 (11:49 -0800)]
CRM-17557 set member_since in completetransaction flow
eileen [Thu, 12 Nov 2015 19:14:07 +0000 (11:14 -0800)]
CRM-17557 remove deprecated concepts (focus on component, membership_payment vs line_item)
eileen [Thu, 12 Nov 2015 19:06:39 +0000 (11:06 -0800)]
CRM-17557 membership not processed to current
Eileen McNaughton [Thu, 12 Nov 2015 23:16:26 +0000 (15:16 -0800)]
Merge pull request #7196 from eileenmcnaughton/CRM-17542
CRM-17542 fix test processor being loaded when not applicable.
Coleman Watts [Thu, 12 Nov 2015 21:55:47 +0000 (16:55 -0500)]
CRM-16415 - Use crmButton for menu buttons
Coleman Watts [Thu, 12 Nov 2015 21:36:13 +0000 (16:36 -0500)]
CRM-16415 - Use crmButton on contact summary screen
Coleman Watts [Thu, 12 Nov 2015 21:34:37 +0000 (16:34 -0500)]
CRM-16415 - Update crmButton markup
Coleman Watts [Thu, 12 Nov 2015 21:22:40 +0000 (16:22 -0500)]
CRM-16415 - Fix form button clickability
Coleman Watts [Thu, 12 Nov 2015 21:22:05 +0000 (16:22 -0500)]
CRM-16415 - Add space after icon in crmButton
colemanw [Thu, 12 Nov 2015 17:30:49 +0000 (12:30 -0500)]
Merge pull request #7193 from systopia/CRM-17555
proposed fix for CRM-17555
eileen [Thu, 12 Nov 2015 16:36:58 +0000 (08:36 -0800)]
CRM-
17542424242 fix test processor being loaded when not applicable.
The filter for test processors was including processors that were not included in the array
Monish Deb [Thu, 12 Nov 2015 15:17:21 +0000 (20:47 +0530)]
Merge pull request #7194 from monishdeb/testFailures
Webtests 4.7 beta1 fixes
monishdeb [Thu, 12 Nov 2015 14:46:29 +0000 (20:16 +0530)]
format fix
monishdeb [Thu, 12 Nov 2015 14:42:08 +0000 (20:12 +0530)]
Webtests 4.7 beta1 fixes
Eileen McNaughton [Thu, 12 Nov 2015 14:36:32 +0000 (06:36 -0800)]
Merge pull request #7073 from eileenmcnaughton/CRM-17464-master
CRM-17464 remove deadlock inducing query
colemanw [Thu, 12 Nov 2015 14:18:24 +0000 (09:18 -0500)]
Merge pull request #7187 from davecivicrm/CRM-17176
CRM-17176 - Improve confirm message for clean-up reports menu task. F…
Niko Bochan [Thu, 5 Nov 2015 13:19:26 +0000 (14:19 +0100)]
proposed fix for CRM-17555
Monish Deb [Thu, 12 Nov 2015 10:39:22 +0000 (16:09 +0530)]
Merge pull request #7191 from eileenmcnaughton/master
CRM-17539 & progress on CRM-16929
Yashodha Chaku [Thu, 12 Nov 2015 06:38:15 +0000 (12:08 +0530)]
Merge pull request #7118 from lcdservices/CRM-17491
CRM-17491 update price set field if quantity changes
Kurund Jalmi [Thu, 12 Nov 2015 05:30:26 +0000 (11:00 +0530)]
Merge pull request #7177 from rohankatkar/master4.7webtest
Webtests fixes
eileen [Thu, 12 Nov 2015 04:58:33 +0000 (20:58 -0800)]
CRM-17539 set /bin/bash payments to completed rather than pending
Monish Deb [Thu, 12 Nov 2015 04:54:38 +0000 (10:24 +0530)]
Merge pull request #7188 from davecivicrm/CRM-17550
CRM-17550 - Missing payment description in PayPalImpl.
eileen [Thu, 12 Nov 2015 04:43:33 +0000 (20:43 -0800)]
CRM-CRM-17539, CRM-16929 make payment_method optional for /bin/bash value
projects / civicrm-core.git / log