civicrm-core.git
9 years agoCRM-16276 Daily jobs run by cron slip forward each day, until eventually missed
Ken West [Tue, 21 Apr 2015 11:53:27 +0000 (21:53 +1000)]
CRM-16276 Daily jobs run by cron slip forward each day, until eventually missed

9 years agoMerge pull request #5805 from colemanw/CRM-16483
Dave Greenberg [Mon, 11 May 2015 20:35:04 +0000 (13:35 -0700)]
Merge pull request #5805 from colemanw/CRM-16483

CRM-16483 - Fix search builder groups operators

9 years agoMerge pull request #5780 from eileenmcnaughton/CRM-16397
Eileen McNaughton [Sun, 10 May 2015 21:36:41 +0000 (09:36 +1200)]
Merge pull request #5780 from eileenmcnaughton/CRM-16397

CRM-16397 handle changes to contribution amount in repeattransaction api

9 years agoMerge pull request #5791 from monishdeb/CRM-16338
Kurund Jalmi [Sun, 10 May 2015 20:12:55 +0000 (01:42 +0530)]
Merge pull request #5791 from monishdeb/CRM-16338

CRM-16338 fix - Incorrect Contribution Summary Report when a contribu…

9 years agotrying to get whitespace right
Eileen McNaughton [Sun, 10 May 2015 04:20:58 +0000 (16:20 +1200)]
trying to get whitespace right

9 years agoCRM-16483 - Fix search builder groups operators
Coleman Watts [Sun, 10 May 2015 01:35:58 +0000 (21:35 -0400)]
CRM-16483 - Fix search builder groups operators

9 years agoMerge pull request #5714 from colemanw/uiSelect
colemanw [Sun, 10 May 2015 00:39:14 +0000 (20:39 -0400)]
Merge pull request #5714 from colemanw/uiSelect

Allow crmUiSelect to function without an attached model

9 years agowhitespace
Eileen McNaughton [Sat, 9 May 2015 08:50:32 +0000 (20:50 +1200)]
whitespace

9 years agoMerge pull request #5572 from monishdeb/4.6
Dave Greenberg [Fri, 8 May 2015 23:45:43 +0000 (16:45 -0700)]
Merge pull request #5572 from monishdeb/4.6

CRM-16165 fix - Combining online membership signup with a recurring addi...

9 years agoMerge pull request #5801 from davecivicrm/fixUpgradeDonateLink
Dave Greenberg [Fri, 8 May 2015 18:42:51 +0000 (11:42 -0700)]
Merge pull request #5801 from davecivicrm/fixUpgradeDonateLink

Fix link in upgrade success message - supposed to go to /contribute p…

9 years agoFix link in upgrade success message - supposed to go to /contribute page.
Dave Greenberg [Fri, 8 May 2015 18:40:35 +0000 (11:40 -0700)]
Fix link in upgrade success message - supposed to go to /contribute page.

9 years agoMerge pull request #5798 from sudhabisht/CRM-16391
Monish Deb [Fri, 8 May 2015 15:27:05 +0000 (20:57 +0530)]
Merge pull request #5798 from sudhabisht/CRM-16391

Renamed type for contribution and membership profile

9 years agoMerge pull request #5795 from totten/4.6-case-actname
Kurund Jalmi [Fri, 8 May 2015 14:49:04 +0000 (10:49 -0400)]
Merge pull request #5795 from totten/4.6-case-actname

CRM-16360 - CiviCase XML - Escape ampersand

9 years agoFormat fix
monishdeb [Fri, 8 May 2015 10:10:11 +0000 (15:40 +0530)]
Format fix

9 years agoCRM-16338 fix - Incorrect Contribution Summary Report when a contributions has multip...
monishdeb [Thu, 30 Apr 2015 13:28:22 +0000 (18:58 +0530)]
CRM-16338 fix - Incorrect Contribution Summary Report when a contributions has multiple soft credits

https://issues.civicrm.org/jira/browse/CRM-16338

9 years agoRenamed type for contribution and membership profile
Sudha Bisht [Fri, 8 May 2015 07:02:25 +0000 (12:32 +0530)]
Renamed type for contribution and membership profile

9 years agoMerge pull request #5794 from colemanw/CRM-16462
colemanw [Fri, 8 May 2015 02:13:55 +0000 (22:13 -0400)]
Merge pull request #5794 from colemanw/CRM-16462

CRM-16462 - update select2 elements on billing block

9 years agoCRM-16360 - CiviCase XML - Escape ampersand
Tim Otten [Fri, 8 May 2015 00:44:59 +0000 (17:44 -0700)]
CRM-16360 - CiviCase XML - Escape ampersand

9 years agoCRM-16462 - update select2 elements on billing block
Coleman Watts [Fri, 8 May 2015 00:26:23 +0000 (20:26 -0400)]
CRM-16462 - update select2 elements on billing block

9 years agoMerge pull request #5635 from pradpnayak/CRM-16268
Kurund Jalmi [Thu, 7 May 2015 20:10:33 +0000 (16:10 -0400)]
Merge pull request #5635 from pradpnayak/CRM-16268

--CRM-16268, modified post hook params for line item to use line item BA...

9 years agoMerge pull request #5776 from monishdeb/CRM-16437
Kurund Jalmi [Thu, 7 May 2015 19:01:57 +0000 (15:01 -0400)]
Merge pull request #5776 from monishdeb/CRM-16437

CRM-16437 fix - Participant export retains all fee levels after change

9 years agoMerge pull request #5785 from pratikshad/16336
Monish Deb [Thu, 7 May 2015 18:52:17 +0000 (00:22 +0530)]
Merge pull request #5785 from pratikshad/16336

CRM-16336 fix-API Pledge Get does not return correct pledge_next_pay_…

9 years agoMerge pull request #5772 from atif-shaikh/CRM-16407
Kurund Jalmi [Thu, 7 May 2015 18:00:55 +0000 (14:00 -0400)]
Merge pull request #5772 from atif-shaikh/CRM-16407

CRM-16407 - Report title entered on Title and Format tab is ignored by C...

9 years agoMerge pull request #5787 from monishdeb/CRM-16330
Kurund Jalmi [Thu, 7 May 2015 17:56:57 +0000 (13:56 -0400)]
Merge pull request #5787 from monishdeb/CRM-16330

CRM-16330 fix - Edit Contribution form validation on total amount is …

9 years agoMerge pull request #5778 from davecivicrm/CRM-15228
Dave Greenberg [Thu, 7 May 2015 16:26:08 +0000 (09:26 -0700)]
Merge pull request #5778 from davecivicrm/CRM-15228

CRM-15228 - replace bogus DTEND with DURATION property in activity ic…

9 years agoCRM-16330 fix - Edit Contribution form validation on total amount is incorrect when...
monishdeb [Thu, 7 May 2015 11:26:43 +0000 (16:56 +0530)]
CRM-16330 fix - Edit Contribution form validation on total amount is incorrect when tax is included

https://issues.civicrm.org/jira/browse/CRM-16330

9 years agoCRM-16336 fix-API Pledge Get does not return correct pledge_next_pay_amount for overd...
pratikshad [Thu, 7 May 2015 10:41:08 +0000 (16:11 +0530)]
CRM-16336 fix-API Pledge Get does not return correct pledge_next_pay_amount for overdue pledgesAPI Pledge Get does not return correct pledge_next_pay_amount for overdue pledges

----------------------------------------
* CRM-16336: API Pledge Get does not return correct pledge_next_pay_amount for overdue pledges
  https://issues.civicrm.org/jira/browse/CRM-16336

9 years agoMerge pull request #5769 from monishdeb/CRM-16433
Monish Deb [Thu, 7 May 2015 07:02:21 +0000 (12:32 +0530)]
Merge pull request #5769 from monishdeb/CRM-16433

CRM-16433 fix - "User and User Admin Only" groups should NOT be included...

9 years agoMerge pull request #5773 from sudhabisht/16452
Monish Deb [Thu, 7 May 2015 06:18:14 +0000 (11:48 +0530)]
Merge pull request #5773 from sudhabisht/16452

Fix for Georgia division

9 years agoCRM-16397 handle changes to contribution amount in repeattransaction api
Eileen McNaughton [Thu, 7 May 2015 04:35:01 +0000 (16:35 +1200)]
CRM-16397 handle changes to contribution amount in repeattransaction api

9 years agoCRM-16397 test for repeatcontribution with altered line items
Eileen McNaughton [Thu, 7 May 2015 02:38:05 +0000 (14:38 +1200)]
CRM-16397 test for repeatcontribution with altered line items

9 years agoCRM-15228 - replace bogus DTEND with DURATION property in activity ical output.
Dave Greenberg [Thu, 7 May 2015 00:25:25 +0000 (17:25 -0700)]
CRM-15228 - replace bogus DTEND with DURATION property in activity ical output.

----------------------------------------
* CRM-15228: Activity End Time same as start Time in iCal invitation
  https://issues.civicrm.org/jira/browse/CRM-15228

9 years agoformat fix
monishdeb [Wed, 6 May 2015 19:33:09 +0000 (01:03 +0530)]
format fix

9 years agoCRM-16437 fix - Participant export retains all fee levels after change
monishdeb [Wed, 6 May 2015 19:22:52 +0000 (00:52 +0530)]
CRM-16437 fix - Participant export retains all fee levels after change

https://issues.civicrm.org/jira/browse/CRM-16437

9 years agoRemoved hardcode country ID
Sudha Bisht [Wed, 6 May 2015 13:49:09 +0000 (19:19 +0530)]
Removed hardcode country ID

9 years agoFix for georgia division
Sudha Bisht [Wed, 6 May 2015 12:22:22 +0000 (17:52 +0530)]
Fix for georgia division

9 years agoCRM-16407 - Report title entered on Title and Format tab is ignored by Create Report...
atif-shaikh [Wed, 6 May 2015 12:02:15 +0000 (17:32 +0530)]
CRM-16407 - Report title entered on Title and Format tab is ignored by Create Report action

https://issues.civicrm.org/jira/browse/CRM-16407

9 years agoCRM-16433 fix - "User and User Admin Only" groups should NOT be included in Contribut...
monishdeb [Wed, 6 May 2015 06:37:13 +0000 (12:07 +0530)]
CRM-16433 fix - "User and User Admin Only" groups should NOT be included in Contribution Receipt Profile Field Group(s) output

https://issues.civicrm.org/jira/browse/CRM-16433

9 years agoMerge pull request #5758 from atif-shaikh/CRM-16320
Kurund Jalmi [Wed, 6 May 2015 06:13:51 +0000 (02:13 -0400)]
Merge pull request #5758 from atif-shaikh/CRM-16320

CRM-16320 - Multiple Registration Confirmation Email does not shows indi...

9 years agoMerge pull request #5762 from davecivicrm/CRM-16411
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.

9 years agoCRM-16320 Missed out changes for event_online_receipt_text.tpl
atif-shaikh [Mon, 4 May 2015 13:00:07 +0000 (18:30 +0530)]
CRM-16320 Missed out changes for event_online_receipt_text.tpl

----------------------------------------
* CRM-16320: Multiple Registration Confirmation Email does not shows individual sums
  https://issues.civicrm.org/jira/browse/CRM-16320

9 years agoCRM-16320 - Multiple Registration Confirmation Email does not shows individual sums
atif-shaikh [Mon, 4 May 2015 12:28:41 +0000 (17:58 +0530)]
CRM-16320 - Multiple Registration Confirmation Email does not shows individual sums

https://issues.civicrm.org/jira/browse/CRM-16320

9 years agoMerge pull request #5763 from davecivicrm/CRM-16307
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.

9 years agoCRM-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

9 years agoCRM-16411 - improve xsstring detection error message.
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

9 years agoMerge pull request #5752 from totten/4.6-install-sitekey
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

9 years agoMerge pull request #5761 from sudhabisht/ReceivedateIssue
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

9 years agoadded comment
monishdeb [Fri, 17 Apr 2015 15:12:14 +0000 (20:42 +0530)]
added comment

9 years agoAdded Webtests
monishdeb [Fri, 17 Apr 2015 15:09:33 +0000 (20:39 +0530)]
Added Webtests

9 years agominor change
monishdeb [Wed, 15 Apr 2015 09:38:59 +0000 (15:08 +0530)]
minor change

9 years agoImprovement and bug fixes
monishdeb [Wed, 15 Apr 2015 09:30:34 +0000 (15:00 +0530)]
Improvement and bug fixes

9 years agoCRM-16165 fix - Combining online membership signup with a recurring additional contri...
monishdeb [Mon, 6 Apr 2015 14:31:40 +0000 (20:01 +0530)]
CRM-16165 fix - Combining online membership signup with a recurring additional contribution results in incorrect recurring contribution amount and frequency

https://issues.civicrm.org/jira/browse/CRM-16165

9 years agoChanges related to trxn_date
Sudha Bisht [Mon, 4 May 2015 10:35:05 +0000 (16:05 +0530)]
Changes related to trxn_date

9 years agoMerge pull request #5695 from mlutfy/46-crm16359
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.

9 years agoinstall/civicrm.php - Generate siteKey
Tim Otten [Sun, 3 May 2015 00:28:36 +0000 (17:28 -0700)]
install/civicrm.php - Generate siteKey

9 years agoMerge pull request #5746 from colemanw/CRM-16333
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

9 years agoMerge pull request #5727 from sudhabisht/4.6
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

9 years agoCRM-16333 - explodePadded should return an empty array from an empty string
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

9 years agoMerge pull request #5716 from jitendrapurohit/CRM-15716_4.6
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...

9 years agoFix for contribution api filter
Sudha Bisht [Wed, 29 Apr 2015 11:28:59 +0000 (16:58 +0530)]
Fix for contribution api filter

9 years agoMerge pull request #5647 from kurund/CRM-15629
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 ...

9 years agoMerge pull request #5708 from atif-shaikh/CRM-16319
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

9 years agoMerge pull request #5677 from atif-shaikh/CRM-16300Regression
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

9 years agoMerge pull request #5711 from jitendrapurohit/CRM-16300QA
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

9 years agofield fix for contact_type and contact_subtype
jitendrapurohit [Tue, 28 Apr 2015 11:17:49 +0000 (16:47 +0530)]
field fix for contact_type and contact_subtype

9 years agoMerge pull request #5709 from pratikshad/16068
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

9 years agofix for CRM-15716 Include missing contact fields in (constituent) reports in 4.6...
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

9 years agotypo fix
pratikshad [Tue, 28 Apr 2015 07:23:59 +0000 (12:53 +0530)]
typo fix

9 years agoCRM-16068 Fix-Tab with table date field shows wrong date format
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

9 years agoMerge pull request #5710 from pratikshad/16304
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...

9 years agoMerge pull request #5713 from eileenmcnaughton/4.6
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

9 years agoAllow crmUiSelect to function without an attached model
Coleman Watts [Mon, 27 Apr 2015 17:23:14 +0000 (11:23 -0600)]
Allow crmUiSelect to function without an attached model

9 years agoCRM-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

9 years agoSet message after updating Relationship
jitendrapurohit [Mon, 27 Apr 2015 11:49:39 +0000 (17:19 +0530)]
Set message after updating Relationship

9 years agoCRM-16319 - Code Sniffer Warning Fix
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

9 years agoCRM-16304 fix-Incorrect FinancialTrxn dates for Backoffice Event Registration
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

9 years agoCRM-16319 - CiviEvent Registration Invoice Fatal Error
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

9 years agoMerge pull request #5698 from colemanw/sigfig
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

9 years agoMerge pull request #5702 from colemanw/activity_type
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

9 years agoCRM-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

9 years agoMerge pull request #5697 from lolas-freeform/CRM-16044-fix
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

9 years agoMerge pull request #5685 from eileenmcnaughton/4.6
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)

9 years agoMove CRM.sigfig into CRM.utils
Coleman Watts [Sun, 26 Apr 2015 03:30:11 +0000 (21:30 -0600)]
Move CRM.sigfig into CRM.utils

9 years agoMerge pull request #5683 from monishdeb/15619regression
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

9 years agoMerge pull request #5690 from katesneed/patch-2
colemanw [Sat, 25 Apr 2015 23:29:36 +0000 (17:29 -0600)]
Merge pull request #5690 from katesneed/patch-2

Update AddRecurringActivityTest.php

9 years agoMerge pull request #5691 from katesneed/patch-3
colemanw [Sat, 25 Apr 2015 23:29:16 +0000 (17:29 -0600)]
Merge pull request #5691 from katesneed/patch-3

Update AddRecurringEventTest.php

9 years agoMerge pull request #5689 from katesneed/patch-1
colemanw [Sat, 25 Apr 2015 23:29:02 +0000 (17:29 -0600)]
Merge pull request #5689 from katesneed/patch-1

Update RecurringEntityPreview.tpl

9 years agoCRM-16044 - Back out JS changes after much discussion.
Lola Slade [Sat, 25 Apr 2015 23:19:37 +0000 (17:19 -0600)]
CRM-16044 - Back out JS changes after much discussion.

9 years agoCRM-16044 - Fix two code style errors.
Lola Slade [Wed, 1 Apr 2015 16:15:55 +0000 (12:15 -0400)]
CRM-16044 - Fix two code style errors.

9 years agoCRM-16044 - Use the return status from the processor if available to set the membersh...
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.

9 years agoCRM-16359: Report templates title/description translation.
Mathieu Lutfy [Sat, 25 Apr 2015 22:30:14 +0000 (18:30 -0400)]
CRM-16359: Report templates title/description translation.

9 years agophpcs fix
Eileen McNaughton [Sat, 25 Apr 2015 21:18:33 +0000 (15:18 -0600)]
phpcs fix

9 years agoMerge pull request #5668 from eileenmcnaughton/CRM-16331
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

9 years agoUpdate AddRecurringEventTest.php
Kate Sneed [Sat, 25 Apr 2015 19:56:02 +0000 (13:56 -0600)]
Update AddRecurringEventTest.php

replace reccuring with repeating

9 years agoUpdate AddRecurringActivityTest.php
Kate Sneed [Sat, 25 Apr 2015 19:54:50 +0000 (13:54 -0600)]
Update AddRecurringActivityTest.php

change recurring to repeating

9 years agoUpdate RecurringEntityPreview.tpl
Kate Sneed [Sat, 25 Apr 2015 19:48:33 +0000 (13:48 -0600)]
Update RecurringEntityPreview.tpl

Replace reoccur with repeate

9 years agoMerge pull request #5688 from colemanw/repeat
colemanw [Sat, 25 Apr 2015 18:26:48 +0000 (12:26 -0600)]
Merge pull request #5688 from colemanw/repeat

Use term repeating not recurring

9 years agoUse term repeating not recurring
Coleman Watts [Sat, 25 Apr 2015 18:25:50 +0000 (12:25 -0600)]
Use term repeating not recurring

9 years agoMerge pull request #5660 from colemanw/repeat
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

9 years agoCRM-16275 - Workaround for race conditions
Coleman Watts [Sat, 25 Apr 2015 18:16:28 +0000 (12:16 -0600)]
CRM-16275 - Workaround for race conditions