Dave Greenberg [Tue, 5 May 2015 16:32:00 +0000 (09:32 -0700)]
Merge pull request #5762 from davecivicrm/CRM-16411
CRM-16411 - improve xsstring detection error message.
Kurund Jalmi [Tue, 5 May 2015 03:15:59 +0000 (23:15 -0400)]
Merge pull request #5763 from davecivicrm/CRM-16307
CRM-16307 - Fix civicrm_navigation permission for A/B Test items.
Dave Greenberg [Tue, 5 May 2015 01:19:20 +0000 (18:19 -0700)]
CRM-16307 - Fix civicrm_navigation permission for A/B Test items.
----------------------------------------
* CRM-16307: A/B test menu items don't appear on upgrade to 4.6
https://issues.civicrm.org/jira/browse/CRM-16307
Dave Greenberg [Tue, 5 May 2015 01:05:00 +0000 (18:05 -0700)]
CRM-16411 - improve xsstring detection error message.
----------------------------------------
* CRM-16411: CiviMail: Clarify Illegal characters warning
https://issues.civicrm.org/jira/browse/CRM-16411
Tim Otten [Mon, 4 May 2015 21:39:09 +0000 (14:39 -0700)]
Merge pull request #5752 from totten/4.6-install-sitekey
install/civicrm.php - Generate siteKey
Monish Deb [Mon, 4 May 2015 20:05:50 +0000 (01:35 +0530)]
Merge pull request #5761 from sudhabisht/ReceivedateIssue
Changes related to trxn_date
Sudha Bisht [Mon, 4 May 2015 10:35:05 +0000 (16:05 +0530)]
Changes related to trxn_date
Eileen McNaughton [Sun, 3 May 2015 03:20:52 +0000 (15:20 +1200)]
Merge pull request #5695 from mlutfy/46-crm16359
CRM-16359: Report templates title/description translation.
Tim Otten [Sun, 3 May 2015 00:28:36 +0000 (17:28 -0700)]
install/civicrm.php - Generate siteKey
colemanw [Fri, 1 May 2015 17:23:56 +0000 (12:23 -0500)]
Merge pull request #5746 from colemanw/CRM-16333
CRM-16333 - explodePadded should return an empty array from an empty string
Kurund Jalmi [Thu, 30 Apr 2015 14:26:56 +0000 (08:26 -0600)]
Merge pull request #5727 from sudhabisht/4.6
Fix for contribution api filter
Coleman Watts [Thu, 30 Apr 2015 14:15:57 +0000 (08:15 -0600)]
CRM-16333 - explodePadded should return an empty array from an empty string
Monish Deb [Thu, 30 Apr 2015 13:10:15 +0000 (18:40 +0530)]
Merge pull request #5716 from jitendrapurohit/CRM-15716_4.6
fix for CRM-15716 Include missing contact fields in (constituent) report...
Sudha Bisht [Wed, 29 Apr 2015 11:28:59 +0000 (16:58 +0530)]
Fix for contribution api filter
Kurund Jalmi [Tue, 28 Apr 2015 23:19:24 +0000 (17:19 -0600)]
Merge pull request #5647 from kurund/CRM-15629
CRM-15629, during exten/ipn calls we don't bootstrap hence some constants ...
Monish Deb [Tue, 28 Apr 2015 13:09:51 +0000 (18:39 +0530)]
Merge pull request #5708 from atif-shaikh/CRM-16319
CRM-16319 - CiviEvent Registration Invoice Fatal Error
Monish Deb [Tue, 28 Apr 2015 13:08:03 +0000 (18:38 +0530)]
Merge pull request #5677 from atif-shaikh/CRM-16300Regression
CRM-16300 fixed regression which caused webtest to break
Monish Deb [Tue, 28 Apr 2015 13:07:57 +0000 (18:37 +0530)]
Merge pull request #5711 from jitendrapurohit/CRM-16300QA
Set message after updating Relationship
jitendrapurohit [Tue, 28 Apr 2015 11:17:49 +0000 (16:47 +0530)]
field fix for contact_type and contact_subtype
Monish Deb [Tue, 28 Apr 2015 09:39:27 +0000 (15:09 +0530)]
Merge pull request #5709 from pratikshad/16068
CRM-16068 Fix-Tab with table date field shows wrong date format
jitendrapurohit [Tue, 28 Apr 2015 08:28:19 +0000 (13:58 +0530)]
fix for CRM-15716 Include missing contact fields in (constituent) reports in 4.6.3 version
pratikshad [Tue, 28 Apr 2015 07:23:59 +0000 (12:53 +0530)]
typo fix
pratikshad [Mon, 27 Apr 2015 09:30:50 +0000 (15:00 +0530)]
CRM-16068 Fix-Tab with table date field shows wrong date format
----------------------------------------
* CRM-16068: Tab with table date field shows wrong date format
https://issues.civicrm.org/jira/browse/CRM-16068
Monish Deb [Tue, 28 Apr 2015 07:09:08 +0000 (12:39 +0530)]
Merge pull request #5710 from pratikshad/16304
CRM-16304 fix-Incorrect FinancialTrxn dates for Backoffice Event Registr...
Dave Greenberg [Mon, 27 Apr 2015 18:08:29 +0000 (12:08 -0600)]
Merge pull request #5713 from eileenmcnaughton/4.6
CRM-16245 follow up fix on recurring processors not displaying
Eileen McNaughton [Mon, 27 Apr 2015 16:07:34 +0000 (10:07 -0600)]
CRM-16245 follow up fix on recurring processors not displaying
jitendrapurohit [Mon, 27 Apr 2015 11:49:39 +0000 (17:19 +0530)]
Set message after updating Relationship
atif-shaikh [Mon, 27 Apr 2015 10:44:03 +0000 (16:14 +0530)]
CRM-16319 - Code Sniffer Warning Fix
----------------------------------------
* CRM-16319: CiviEvent Registration Invoice Fatal Error
https://issues.civicrm.org/jira/browse/CRM-16319
pratikshad [Mon, 27 Apr 2015 09:18:44 +0000 (14:48 +0530)]
CRM-16304 fix-Incorrect FinancialTrxn dates for Backoffice Event Registration
----------------------------------------
* CRM-16304: Incorrect FinancialTrxn dates for Backoffice Event Registration
https://issues.civicrm.org/jira/browse/CRM-16304
atif-shaikh [Mon, 27 Apr 2015 08:18:38 +0000 (13:48 +0530)]
CRM-16319 - CiviEvent Registration Invoice Fatal Error
https://issues.civicrm.org/jira/browse/CRM-16319
colemanw [Sun, 26 Apr 2015 22:12:59 +0000 (16:12 -0600)]
Merge pull request #5698 from colemanw/sigfig
Move CRM.sigfig into CRM.utils
colemanw [Sun, 26 Apr 2015 19:19:20 +0000 (13:19 -0600)]
Merge pull request #5702 from colemanw/activity_type
CRM-16360 - Don't show id field when creating/editing activity types
Coleman Watts [Sun, 26 Apr 2015 17:19:32 +0000 (11:19 -0600)]
CRM-16360 - Don't show id field when creating/editing activity types
Eileen McNaughton [Sun, 26 Apr 2015 15:44:45 +0000 (09:44 -0600)]
Merge pull request #5697 from lolas-freeform/CRM-16044-fix
Crm 16044 fix - Use return status from the processor if available
Eileen McNaughton [Sun, 26 Apr 2015 04:40:41 +0000 (22:40 -0600)]
Merge pull request #5685 from eileenmcnaughton/4.6
Additional relationship test (plus minor code tidy up)
Coleman Watts [Sun, 26 Apr 2015 03:30:11 +0000 (21:30 -0600)]
Move CRM.sigfig into CRM.utils
colemanw [Sat, 25 Apr 2015 23:32:20 +0000 (17:32 -0600)]
Merge pull request #5683 from monishdeb/15619regression
CRM-15619 regreesion fix on Event's id
colemanw [Sat, 25 Apr 2015 23:29:36 +0000 (17:29 -0600)]
Merge pull request #5690 from katesneed/patch-2
Update AddRecurringActivityTest.php
colemanw [Sat, 25 Apr 2015 23:29:16 +0000 (17:29 -0600)]
Merge pull request #5691 from katesneed/patch-3
Update AddRecurringEventTest.php
colemanw [Sat, 25 Apr 2015 23:29:02 +0000 (17:29 -0600)]
Merge pull request #5689 from katesneed/patch-1
Update RecurringEntityPreview.tpl
Lola Slade [Sat, 25 Apr 2015 23:19:37 +0000 (17:19 -0600)]
CRM-16044 - Back out JS changes after much discussion.
Lola Slade [Wed, 1 Apr 2015 16:15:55 +0000 (12:15 -0400)]
CRM-16044 - Fix two code style errors.
Lola Slade [Wed, 1 Apr 2015 15:31:09 +0000 (11:31 -0400)]
CRM-16044 - Use the return status from the processor if available to set the membership status and send receipt.
Mathieu Lutfy [Sat, 25 Apr 2015 22:30:14 +0000 (18:30 -0400)]
CRM-16359: Report templates title/description translation.
Eileen McNaughton [Sat, 25 Apr 2015 21:18:33 +0000 (15:18 -0600)]
phpcs fix
Eileen McNaughton [Sat, 25 Apr 2015 21:16:07 +0000 (15:16 -0600)]
Merge pull request #5668 from eileenmcnaughton/CRM-16331
CRM-16331 don't set amount to null value
Kate Sneed [Sat, 25 Apr 2015 19:56:02 +0000 (13:56 -0600)]
Update AddRecurringEventTest.php
replace reccuring with repeating
Kate Sneed [Sat, 25 Apr 2015 19:54:50 +0000 (13:54 -0600)]
Update AddRecurringActivityTest.php
change recurring to repeating
Kate Sneed [Sat, 25 Apr 2015 19:48:33 +0000 (13:48 -0600)]
Update RecurringEntityPreview.tpl
Replace reoccur with repeate
colemanw [Sat, 25 Apr 2015 18:26:48 +0000 (12:26 -0600)]
Merge pull request #5688 from colemanw/repeat
Use term repeating not recurring
Coleman Watts [Sat, 25 Apr 2015 18:25:50 +0000 (12:25 -0600)]
Use term repeating not recurring
colemanw [Sat, 25 Apr 2015 18:17:43 +0000 (12:17 -0600)]
Merge pull request #5660 from colemanw/repeat
Show count and position of repeating entities
Coleman Watts [Sat, 25 Apr 2015 18:16:28 +0000 (12:16 -0600)]
CRM-16275 - Workaround for race conditions
Dave Greenberg [Sat, 25 Apr 2015 15:57:46 +0000 (09:57 -0600)]
Update CONTRIBUTORS.txt
Add Pledge Payment Batch Entry sponsor.
Eileen McNaughton [Tue, 21 Apr 2015 23:17:17 +0000 (16:17 -0700)]
extension to test
Eileen McNaughton [Tue, 21 Apr 2015 22:53:49 +0000 (15:53 -0700)]
Add test to check related membership is created
Eileen McNaughton [Tue, 21 Apr 2015 22:25:33 +0000 (15:25 -0700)]
preliminary tidy up
Dave Greenberg [Sat, 25 Apr 2015 05:20:03 +0000 (23:20 -0600)]
Merge pull request #5682 from monishdeb/CRM-16315
CRM-16315 fix - Campaign Menu Items Automatically Enables without civiCa...
monishdeb [Fri, 24 Apr 2015 21:36:52 +0000 (03:06 +0530)]
CRM-15619 regreesion fix on Event's id
----------------------------------------
* CRM-15619: Api breaks
https://issues.civicrm.org/jira/browse/CRM-15619
monishdeb [Fri, 24 Apr 2015 21:29:09 +0000 (02:59 +0530)]
CRM-16315 fix - Campaign Menu Items Automatically Enables without civiCampaign Module enabled.
https://issues.civicrm.org/jira/browse/CRM-16315
atif-shaikh [Thu, 23 Apr 2015 08:12:11 +0000 (13:42 +0530)]
Typo fix
atif-shaikh [Thu, 23 Apr 2015 08:07:08 +0000 (13:37 +0530)]
CRM-16300 fixed regression which caused webtest to break
----------------------------------------
* CRM-16300: Inherited membership is deleted when relationship is updated
https://issues.civicrm.org/jira/browse/CRM-16300
Monish Deb [Thu, 23 Apr 2015 07:28:59 +0000 (12:58 +0530)]
Merge pull request #5672 from monishdeb/CRM-16327
CRM-16327 fix - GroupContact/delete call failed: "edit groups" permissio...
Monish Deb [Wed, 22 Apr 2015 14:08:38 +0000 (19:38 +0530)]
Merge pull request #5670 from monishdeb/CRM-16322
CRM-16322 fix - Notice error on training demo
monishdeb [Wed, 22 Apr 2015 08:09:15 +0000 (13:39 +0530)]
CRM-16327 fix - GroupContact/delete call failed: "edit groups" permission required
https://issues.civicrm.org/jira/browse/CRM-16327
monishdeb [Wed, 22 Apr 2015 06:47:38 +0000 (12:17 +0530)]
CRM-16322 fix - Notice error on training demo
https://issues.civicrm.org/jira/browse/CRM-16322
Kurund Jalmi [Wed, 22 Apr 2015 01:07:31 +0000 (19:07 -0600)]
Merge pull request #5669 from totten/4.6-case-syntax
case_sample.tpl - Fix syntax for older MySQL
Tim Otten [Tue, 21 Apr 2015 20:01:32 +0000 (14:01 -0600)]
case_sample.tpl - Fix syntax for older MySQL
Coleman Watts [Tue, 21 Apr 2015 19:25:11 +0000 (13:25 -0600)]
CRM-16323 - Show repeating info in entityRef fields
colemanw [Tue, 21 Apr 2015 17:29:15 +0000 (11:29 -0600)]
Merge pull request #5659 from colemanw/CRM-16305
CRM-16305 - Fix autofill of onBehalf profile fields
Eileen McNaughton [Tue, 21 Apr 2015 17:18:15 +0000 (10:18 -0700)]
enotice fix
Eileen McNaughton [Tue, 21 Apr 2015 17:16:28 +0000 (10:16 -0700)]
enotice on previous
Eileen McNaughton [Tue, 21 Apr 2015 17:11:39 +0000 (10:11 -0700)]
CRM-16331 don't set amount to null value
Kurund Jalmi [Tue, 21 Apr 2015 14:11:29 +0000 (08:11 -0600)]
Merge pull request #5664 from pratikshad/webtest1
Fixed webtest for civicrm4.6
pratikshad [Tue, 21 Apr 2015 10:32:00 +0000 (16:02 +0530)]
Fixed webtest for civicrm4.6
Monish Deb [Tue, 21 Apr 2015 05:16:12 +0000 (10:46 +0530)]
Merge pull request #5657 from jagrutiP/CRM-16317
Receive date is missing when contribution with pay later
Coleman Watts [Mon, 20 Apr 2015 00:56:57 +0000 (20:56 -0400)]
CRM-16323 Show count and position of repeating entities
Coleman Watts [Mon, 20 Apr 2015 00:43:34 +0000 (20:43 -0400)]
Fix typo
colemanw [Mon, 20 Apr 2015 17:44:53 +0000 (11:44 -0600)]
Merge pull request #5662 from colemanw/CRM-16275
CRM-16275 - Fix repeating events checkbox hiding
colemanw [Mon, 20 Apr 2015 17:20:47 +0000 (11:20 -0600)]
Merge pull request #5661 from colemanw/youCanAddAnotherProfileField
Get rid of unnecessary popup message when saving profile fields
Coleman Watts [Mon, 20 Apr 2015 02:13:41 +0000 (22:13 -0400)]
CRM-16305 - Fix autofill of onBehalf profile fields
jagrutiP [Mon, 20 Apr 2015 10:07:45 +0000 (15:37 +0530)]
Receive date is missing when contribution with pay later.CRM-16317
----------------------------------------
* CRM-16317: Receive date is missing when contribution with pay later
https://issues.civicrm.org/jira/browse/CRM-16317
Monish Deb [Mon, 20 Apr 2015 07:17:17 +0000 (12:47 +0530)]
Merge pull request #5648 from jitendrapurohit/CRM-16302
CRM-16302 Free memberships are broken fix
Monish Deb [Mon, 20 Apr 2015 06:58:19 +0000 (12:28 +0530)]
Merge pull request #5650 from atif-shaikh/CRM-16300
CRM-16300 - Inherited membership is deleted when relationship is updated
Coleman Watts [Mon, 20 Apr 2015 01:45:10 +0000 (21:45 -0400)]
Get rid of unnecessary popup message when saving profile fields
Coleman Watts [Mon, 20 Apr 2015 01:22:22 +0000 (21:22 -0400)]
CRM-16275 - Fix repeating events checkbox hiding
Dave Greenberg [Fri, 17 Apr 2015 19:14:55 +0000 (12:14 -0700)]
Merge pull request #5636 from JKingsnorth/CRM-16284
CRM-16284: Add missing phone location condition
Dave Greenberg [Fri, 17 Apr 2015 19:03:03 +0000 (12:03 -0700)]
Merge pull request #5651 from rohankatkar/CRM-16301
'The Contact Sub Type does not match the Contact type for this record' when saving a new contact
Kurund Jalmi [Fri, 17 Apr 2015 17:12:43 +0000 (10:12 -0700)]
Merge pull request #5645 from kurund/CRM-16234
CRM-16234, don't create ufmatch entries if already exists
Dave Greenberg [Fri, 17 Apr 2015 16:23:05 +0000 (09:23 -0700)]
Merge pull request #5646 from davecivicrm/CRM-16277
CRM-16277 - Sort groups and mailings alphabetically in the recipients dr...
Dave Greenberg [Fri, 17 Apr 2015 16:22:56 +0000 (09:22 -0700)]
Merge pull request #5644 from totten/4.6-mail-estimates2
CRM-16277 - crmMailing - Fix slow recipient count
Web Access [Fri, 17 Apr 2015 14:14:21 +0000 (19:44 +0530)]
Fix for CRM-16301
atif-shaikh [Fri, 17 Apr 2015 13:09:44 +0000 (18:39 +0530)]
CRM-16300 - Inherited membership is deleted when relationship is updated
https://issues.civicrm.org/jira/browse/CRM-16300
jitendrapurohit [Fri, 17 Apr 2015 12:31:48 +0000 (18:01 +0530)]
remove blank line after function comment
jitendrapurohit [Fri, 17 Apr 2015 11:57:16 +0000 (17:27 +0530)]
minor fix
jitendrapurohit [Fri, 17 Apr 2015 11:42:39 +0000 (17:12 +0530)]
warning fix
jitendrapurohit [Fri, 17 Apr 2015 11:38:35 +0000 (17:08 +0530)]
added doc
jitendrapurohit [Fri, 17 Apr 2015 11:31:37 +0000 (17:01 +0530)]
CRM-16302 Free memberships are broken fix
kurund [Fri, 17 Apr 2015 05:59:18 +0000 (22:59 -0700)]
CRM-15629, comment clarification
----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
https://issues.civicrm.org/jira/browse/CRM-15629
kurund [Fri, 17 Apr 2015 05:51:56 +0000 (22:51 -0700)]
CRM-15629, during exten/* calls we don't bootstrap hence some constants are not availble.
----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
https://issues.civicrm.org/jira/browse/CRM-15629