civicrm-core.git
9 years agoForce page title to plain text
Coleman Watts [Sun, 25 Oct 2015 15:50:43 +0000 (11:50 -0400)]
Force page title to plain text

9 years agoSet CMS page title from Angular
Coleman Watts [Sun, 25 Oct 2015 15:36:35 +0000 (11:36 -0400)]
Set CMS page title from Angular

9 years agoMerge pull request #7078 from colemanw/qs
colemanw [Fri, 30 Oct 2015 17:08:57 +0000 (13:08 -0400)]
Merge pull request #7078 from colemanw/qs

EntityRef filter UI fixes

9 years agoMerge pull request #7086 from jitendrapurohit/webtest47
Monish Deb [Fri, 30 Oct 2015 14:40:21 +0000 (20:10 +0530)]
Merge pull request #7086 from jitendrapurohit/webtest47

webtest fix for CRM-17182

9 years agoMerge pull request #7087 from sudhabisht/webtest2Fix
Monish Deb [Fri, 30 Oct 2015 14:03:29 +0000 (19:33 +0530)]
Merge pull request #7087 from sudhabisht/webtest2Fix

Webtest2 fix

9 years agoMinor fix
Sudha Bisht [Fri, 30 Oct 2015 13:59:26 +0000 (19:29 +0530)]
Minor fix

9 years agoWebtestFix2
Sudha Bisht [Fri, 30 Oct 2015 13:57:16 +0000 (19:27 +0530)]
WebtestFix2

9 years agowebtest fix for CRM-17182
jitendrapurohit [Fri, 30 Oct 2015 13:21:13 +0000 (18:51 +0530)]
webtest fix for CRM-17182

9 years agoMerge pull request #7079 from monishdeb/testFailures
Yashodha Chaku [Fri, 30 Oct 2015 11:53:23 +0000 (17:23 +0530)]
Merge pull request #7079 from monishdeb/testFailures

4.7beta1 Webtest fixes for Event

9 years agoMerge pull request #7083 from yashodha/CRM-17181
Yashodha Chaku [Fri, 30 Oct 2015 11:45:02 +0000 (17:15 +0530)]
Merge pull request #7083 from yashodha/CRM-17181

rename Participant Fee to avoid confusion w/ contribution fee amount …

9 years agofixes for profile
monishdeb [Fri, 30 Oct 2015 11:34:48 +0000 (17:04 +0530)]
fixes for profile

9 years agorename Participant Fee to avoid confusion w/ contribution fee amount in the event...
yashodha [Fri, 30 Oct 2015 09:33:53 +0000 (15:03 +0530)]
rename Participant Fee to avoid confusion w/ contribution fee amount in the event report

9 years agoMerge pull request #7082 from yashodha/fixCRM-17461
Yashodha Chaku [Fri, 30 Oct 2015 09:16:00 +0000 (14:46 +0530)]
Merge pull request #7082 from yashodha/fixCRM-17461

CRM-17461: Contribution Batch Entry : eNotices and invalid / missing …

9 years agoCRM-17461: Contribution Batch Entry : eNotices and invalid / missing receipt data
yashodha [Fri, 30 Oct 2015 09:08:37 +0000 (14:38 +0530)]
CRM-17461: Contribution Batch Entry : eNotices and invalid / missing receipt data

----------------------------------------
* CRM-17461: Contribution Batch Entry : eNotices and invalid / missing receipt data
  https://issues.civicrm.org/jira/browse/CRM-17461

9 years ago4.7beta1 Webtest fixes for Event
monishdeb [Fri, 30 Oct 2015 07:26:43 +0000 (12:56 +0530)]
4.7beta1 Webtest fixes for Event

9 years agoMerge pull request #7062 from yashodha/CRM-17331
Yashodha Chaku [Fri, 30 Oct 2015 06:00:08 +0000 (11:30 +0530)]
Merge pull request #7062 from yashodha/CRM-17331

CRM-17331: Mass SMSes are not being sent, even though send schedules …

9 years agoMerge pull request #7075 from rohankatkar/Master_webtests
Monish Deb [Fri, 30 Oct 2015 05:03:20 +0000 (10:33 +0530)]
Merge pull request #7075 from rohankatkar/Master_webtests

Webtest Fix for Import

9 years agoEntityRef filter UI fixes
Coleman Watts [Fri, 30 Oct 2015 00:30:52 +0000 (20:30 -0400)]
EntityRef filter UI fixes

9 years agoWebtest Fix for Import
Web Access [Thu, 29 Oct 2015 13:18:18 +0000 (18:48 +0530)]
Webtest Fix for Import

9 years agoCRM-17331: Mass SMSes are not being sent, even though send schedules SMS -job complet...
yashodha [Thu, 29 Oct 2015 09:35:34 +0000 (15:05 +0530)]
CRM-17331: Mass SMSes are not being sent, even though send schedules SMS -job completes without errors

----------------------------------------
* CRM-17331: Mass SMSes are not being sent, even though "send schedules SMS"-job completes without errors
  https://issues.civicrm.org/jira/browse/CRM-17331

9 years agoMerge pull request #7071 from davecivicrm/CRM-17032
Kurund Jalmi [Thu, 29 Oct 2015 07:22:03 +0000 (12:52 +0530)]
Merge pull request #7071 from davecivicrm/CRM-17032

CRM-17032 - Add totals for Fees and Net Amount to Contribution Detail…

9 years agoCRM-17032 - Add totals for Fees and Net Amount to Contribution Detail Report.
Dave Greenberg [Thu, 29 Oct 2015 00:21:40 +0000 (17:21 -0700)]
CRM-17032 - Add totals for Fees and Net Amount to Contribution Detail Report.

----------------------------------------
* CRM-17032: Add Fees and Net to Statistics of Contribution Detail Report
  https://issues.civicrm.org/jira/browse/CRM-17032

9 years agoMerge pull request #7070 from davecivicrm/CRM-17425
Dave Greenberg [Wed, 28 Oct 2015 23:53:27 +0000 (16:53 -0700)]
Merge pull request #7070 from davecivicrm/CRM-17425

Crm 17425

9 years agoMerge pull request #7063 from monishdeb/CRM-17434
Dave Greenberg [Wed, 28 Oct 2015 23:24:01 +0000 (16:24 -0700)]
Merge pull request #7063 from monishdeb/CRM-17434

CRM-17434 fix - Free event registration with 'skip confirmation' thro…

9 years agoCRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGrou...
Dave Greenberg [Wed, 28 Oct 2015 22:55:03 +0000 (15:55 -0700)]
CRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGroup tabset.

----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
  https://issues.civicrm.org/jira/browse/CRM-17425

9 years agoMerge pull request #7067 from eileenmcnaughton/uf_field
Dave Greenberg [Wed, 28 Oct 2015 22:17:49 +0000 (15:17 -0700)]
Merge pull request #7067 from eileenmcnaughton/uf_field

Fix form-call to uf_field:add to reflect new standardised fn signature

9 years agoCRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGrou...
Dave Greenberg [Wed, 28 Oct 2015 22:14:59 +0000 (15:14 -0700)]
CRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGroup tabset.

----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
  https://issues.civicrm.org/jira/browse/CRM-17425

9 years agoMerge pull request #7010 from agh1/pcp-profile
Dave Greenberg [Wed, 28 Oct 2015 22:10:25 +0000 (15:10 -0700)]
Merge pull request #7010 from agh1/pcp-profile

CRM-17425 Handle PCP fields on contribution batch entry

9 years agoCRM-13823 - More descriptive titles for upgrade messages
Coleman Watts [Wed, 28 Oct 2015 15:36:00 +0000 (11:36 -0400)]
CRM-13823 - More descriptive titles for upgrade messages

9 years agoMerge pull request #7068 from rohankatkar/Webtest-Master
Kurund Jalmi [Wed, 28 Oct 2015 15:08:46 +0000 (20:38 +0530)]
Merge pull request #7068 from rohankatkar/Webtest-Master

Webtest fix for master

9 years agoWebtest fix
Web Access [Wed, 28 Oct 2015 13:23:34 +0000 (18:53 +0530)]
Webtest fix

9 years agoCRM-17434 fix - Free event registration with 'skip confirmation' throws warning
monishdeb [Wed, 28 Oct 2015 08:34:25 +0000 (14:04 +0530)]
CRM-17434 fix - Free event registration with 'skip confirmation' throws warning

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

9 years agoMerge pull request #7066 from eileenmcnaughton/CRM-17120-2
Kurund Jalmi [Wed, 28 Oct 2015 06:11:00 +0000 (11:41 +0530)]
Merge pull request #7066 from eileenmcnaughton/CRM-17120-2

CRM-17120 remove calls to uncached function

9 years agoMerge pull request #7064 from rohankatkar/Webtest-Fix-Master
Kurund Jalmi [Wed, 28 Oct 2015 06:09:57 +0000 (11:39 +0530)]
Merge pull request #7064 from rohankatkar/Webtest-Fix-Master

Webtest Fix- Master

9 years agoFix form-call to uf_field:add to reflect new standardised fn signature
eileen [Wed, 28 Oct 2015 00:56:58 +0000 (13:56 +1300)]
Fix form-call to uf_field:add to reflect new standardised fn signature

9 years agoMerge pull request #7065 from colemanw/wysiwyg
colemanw [Wed, 28 Oct 2015 00:44:15 +0000 (20:44 -0400)]
Merge pull request #7065 from colemanw/wysiwyg

wysiwyg cleanup

9 years agoCRM-17120 remove calls to uncached function
eileen [Wed, 28 Oct 2015 00:11:49 +0000 (13:11 +1300)]
CRM-17120 remove calls to uncached function

9 years agoMerge pull request #7058 from eileenmcnaughton/merge-test
Eileen McNaughton [Tue, 27 Oct 2015 22:27:11 +0000 (11:27 +1300)]
Merge pull request #7058 from eileenmcnaughton/merge-test

Add test for contact.merge action

9 years agoMerge pull request #7060 from eileenmcnaughton/CRM-17256-paypal
Eileen McNaughton [Tue, 27 Oct 2015 22:26:45 +0000 (11:26 +1300)]
Merge pull request #7060 from eileenmcnaughton/CRM-17256-paypal

CRM-17256 Show / bounce on  paypal express errors

9 years agoCRM-16354 - use crm-wysiwyg-enabled css class more reliably
Coleman Watts [Tue, 27 Oct 2015 19:32:17 +0000 (15:32 -0400)]
CRM-16354 - use crm-wysiwyg-enabled css class more reliably

9 years agoCRM-16354 - Add sanity check
Coleman Watts [Tue, 27 Oct 2015 19:12:26 +0000 (15:12 -0400)]
CRM-16354 - Add sanity check

9 years agoMerge pull request #7061 from eileenmcnaughton/CRM-17397
Dave Greenberg [Tue, 27 Oct 2015 18:52:08 +0000 (11:52 -0700)]
Merge pull request #7061 from eileenmcnaughton/CRM-17397

CRM-17397 enotice fix

9 years agoWebtest Fix- Master
Web Access [Tue, 27 Oct 2015 13:01:38 +0000 (18:31 +0530)]
Webtest Fix- Master

9 years agoCRM-17434 fix - Free event registration with 'skip confirmation' throws warning
monishdeb [Tue, 27 Oct 2015 10:59:51 +0000 (16:29 +0530)]
CRM-17434 fix - Free event registration with 'skip confirmation' throws warning

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

9 years agoCRM-17331: Mass SMSes are not being sent, even though send schedules SMS -job complet...
yashodha [Tue, 27 Oct 2015 08:27:40 +0000 (13:57 +0530)]
CRM-17331: Mass SMSes are not being sent, even though send schedules SMS -job completes without errors

----------------------------------------
* CRM-17331: Mass SMSes are not being sent, even though "send schedules SMS"-job completes without errors
  https://issues.civicrm.org/jira/browse/CRM-17331

9 years agoCRM-17397 enotice fix
eileen [Tue, 27 Oct 2015 08:10:08 +0000 (21:10 +1300)]
CRM-17397 enotice fix

9 years agoMerge pull request #7052 from eileenmcnaughton/master
Eileen McNaughton [Tue, 27 Oct 2015 07:50:37 +0000 (20:50 +1300)]
Merge pull request #7052 from eileenmcnaughton/master

Comments fixes

9 years agoAdd test for contact.merge action
eileen [Mon, 26 Oct 2015 22:14:14 +0000 (11:14 +1300)]
Add test for contact.merge action

9 years agoCRM-17256 Show / bounce on paypal express errors
eileen [Tue, 27 Oct 2015 07:43:42 +0000 (20:43 +1300)]
CRM-17256 Show / bounce on  paypal express errors

9 years agoMerge pull request #7054 from yashodha/fix.CRM-16990
Yashodha Chaku [Tue, 27 Oct 2015 06:49:42 +0000 (12:19 +0530)]
Merge pull request #7054 from yashodha/fix.CRM-16990

CRM-16990: Custom fields are NOT being saved for some component custo…

9 years agoCRM-16990: notice fixes
yashodha [Tue, 27 Oct 2015 05:41:16 +0000 (11:11 +0530)]
CRM-16990: notice fixes

----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
  https://issues.civicrm.org/jira/browse/CRM-16990

9 years agoCRM-16990: Custom fields are NOT being saved for some component custom data (activiti...
yashodha [Mon, 26 Oct 2015 07:00:35 +0000 (12:30 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)

----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
  https://issues.civicrm.org/jira/browse/CRM-16990

9 years agoMerge pull request #7056 from colemanw/CRM-16665
colemanw [Tue, 27 Oct 2015 01:55:06 +0000 (21:55 -0400)]
Merge pull request #7056 from colemanw/CRM-16665

CRM-16665 - Fix inappropriate tpl inclusion

9 years agoMerge pull request #7057 from davecivicrm/CRM-17271
Dave Greenberg [Tue, 27 Oct 2015 01:18:42 +0000 (18:18 -0700)]
Merge pull request #7057 from davecivicrm/CRM-17271

CRM-17271 - Change all references to profile field visibility to use …

9 years agoCRM-17271 - Fix test to look for new visibilty label.
Dave Greenberg [Mon, 26 Oct 2015 23:47:16 +0000 (16:47 -0700)]
CRM-17271 - Fix test to look for new visibilty label.

----------------------------------------
* CRM-17271: Change Profile Field Label from Public Pages to Expose Publicly
  https://issues.civicrm.org/jira/browse/CRM-17271

9 years agoCRM-17271 - Change all references to profile field visibility to use new language...
Dave Greenberg [Mon, 26 Oct 2015 21:49:17 +0000 (14:49 -0700)]
CRM-17271 - Change all references to profile field visibility to use new language (help and drop-downs in php and js).

----------------------------------------
* CRM-17271: Change Profile Field Label from Public Pages to Expose Publicly
  https://issues.civicrm.org/jira/browse/CRM-17271

9 years agoCRM-16665 - Fix inappropriate tpl inclusion
Coleman Watts [Mon, 26 Oct 2015 21:28:32 +0000 (17:28 -0400)]
CRM-16665 - Fix inappropriate tpl inclusion

9 years agoMerge pull request #7050 from saurabhbatra96/comment-fixes-extension
Kurund Jalmi [Mon, 26 Oct 2015 18:50:06 +0000 (00:20 +0530)]
Merge pull request #7050 from saurabhbatra96/comment-fixes-extension

Minor comment fixes for CRM/Extensions directory.

9 years agoMerge pull request #7053 from eileenmcnaughton/toxic
colemanw [Mon, 26 Oct 2015 14:33:00 +0000 (10:33 -0400)]
Merge pull request #7053 from eileenmcnaughton/toxic

minor clean up of toxic code function

9 years agoMinor comment fixes for CRM/Extensions directory.
Saurabh Batra [Sun, 25 Oct 2015 15:55:58 +0000 (21:25 +0530)]
Minor comment fixes for CRM/Extensions directory.

9 years agoMerge pull request #7055 from monishdeb/CRM-17441
Monish Deb [Mon, 26 Oct 2015 09:56:33 +0000 (15:26 +0530)]
Merge pull request #7055 from monishdeb/CRM-17441

CRM-17441 fix - Code issue in search save

9 years agoCRM-17441 fix - Code issue in search save
monishdeb [Mon, 26 Oct 2015 09:52:05 +0000 (15:22 +0530)]
CRM-17441 fix - Code issue in search save

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

9 years agoMerge pull request #7048 from eileenmcnaughton/CRM-17442
Monish Deb [Mon, 26 Oct 2015 09:39:44 +0000 (15:09 +0530)]
Merge pull request #7048 from eileenmcnaughton/CRM-17442

CRM-17442 fix search builder not yet handling formvalue conversion

9 years agoMerge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-26-14-28-29
Kurund Jalmi [Mon, 26 Oct 2015 08:58:59 +0000 (14:28 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-26-14-28-29

9 years agoMerge pull request #7039 from yashodha/CRM-16990
Yashodha Chaku [Mon, 26 Oct 2015 06:27:28 +0000 (11:57 +0530)]
Merge pull request #7039 from yashodha/CRM-16990

CRM-16990: Custom fields are NOT being saved for some component custo…

9 years agominor clean up of toxic code function
eileenmcnaugton [Mon, 26 Oct 2015 05:49:28 +0000 (18:49 +1300)]
minor clean up of toxic code function

9 years agoComments fixes
eileenmcnaugton [Mon, 26 Oct 2015 05:36:34 +0000 (18:36 +1300)]
Comments fixes

9 years agoMerge pull request #7021 from saurabhbatra96/CRM-14756
Eileen McNaughton [Mon, 26 Oct 2015 01:41:23 +0000 (14:41 +1300)]
Merge pull request #7021 from saurabhbatra96/CRM-14756

CRM-14756 fixed some legacy code and the issue where supplying id was not enough.

9 years agoMerge pull request #7034 from eileenmcnaughton/tests
Eileen McNaughton [Mon, 26 Oct 2015 01:27:48 +0000 (14:27 +1300)]
Merge pull request #7034 from eileenmcnaughton/tests

CRM-17397 fix enotices on amount_level

9 years agoCRM-13823 - Fix invalid markup and add animation
Coleman Watts [Sun, 25 Oct 2015 14:36:47 +0000 (10:36 -0400)]
CRM-13823 - Fix invalid markup and add animation

9 years agoMerge pull request #7033 from colemanw/CRM-13823-2
colemanw [Sun, 25 Oct 2015 13:14:14 +0000 (09:14 -0400)]
Merge pull request #7033 from colemanw/CRM-13823-2

System status message page fixups

9 years agoWhitespace cleanup
Coleman Watts [Sat, 24 Oct 2015 16:56:23 +0000 (12:56 -0400)]
Whitespace cleanup

9 years agoCRM-13823 - Use popup menu for snooze options
Coleman Watts [Sat, 24 Oct 2015 16:52:09 +0000 (12:52 -0400)]
CRM-13823 - Use popup menu for snooze options

9 years agoMerge pull request #7042 from monishdeb/CRM-17434
Eileen McNaughton [Sat, 24 Oct 2015 11:55:15 +0000 (00:55 +1300)]
Merge pull request #7042 from monishdeb/CRM-17434

CRM-17434 fix - Free event registration with 'skip confirmation' thro…

9 years agoCRM-17442 fix search builder not yet handling formvalue conversion
eileenmcnaugton [Sat, 24 Oct 2015 05:20:37 +0000 (18:20 +1300)]
CRM-17442 fix search builder not yet handling formvalue conversion

9 years agoMerge pull request #7046 from eileenmcnaughton/master
Eileen McNaughton [Sat, 24 Oct 2015 05:19:43 +0000 (18:19 +1300)]
Merge pull request #7046 from eileenmcnaughton/master

Master

9 years agocomment fixes
eileenmcnaugton [Fri, 23 Oct 2015 20:00:44 +0000 (09:00 +1300)]
comment fixes

9 years agoMerge pull request #7038 from eileenmcnaughton/master
Eileen McNaughton [Fri, 23 Oct 2015 19:20:33 +0000 (08:20 +1300)]
Merge pull request #7038 from eileenmcnaughton/master

Comments

9 years agocomment fixes
eileenmcnaugton [Fri, 23 Oct 2015 19:07:49 +0000 (08:07 +1300)]
comment fixes

9 years agoCRM-13823 - Show icons in Angular tabs
Coleman Watts [Fri, 23 Oct 2015 19:03:15 +0000 (15:03 -0400)]
CRM-13823 - Show icons in Angular tabs

9 years agocomment fixes
eileenmcnaugton [Fri, 23 Oct 2015 05:09:14 +0000 (18:09 +1300)]
comment fixes

9 years agoCRM-13823 - Show count in Angular tabs
Coleman Watts [Fri, 23 Oct 2015 18:42:31 +0000 (14:42 -0400)]
CRM-13823 - Show count in Angular tabs

9 years agoMerge pull request #7043 from saurabhbatra96/comment-fixes-sms
Eileen McNaughton [Fri, 23 Oct 2015 18:36:16 +0000 (07:36 +1300)]
Merge pull request #7043 from saurabhbatra96/comment-fixes-sms

Minor comment-fixes for CRM/SMS directory.

9 years agoMerge pull request #7045 from laryn/patch-2
colemanw [Fri, 23 Oct 2015 18:31:59 +0000 (14:31 -0400)]
Merge pull request #7045 from laryn/patch-2

CRM-17440 - CSS improvement for notify UI

9 years agoCRM-17440 - CSS improvement for notify UI
Laryn [Fri, 23 Oct 2015 18:20:25 +0000 (13:20 -0500)]
CRM-17440 - CSS improvement for notify UI

9 years agoMinor comment-fixes for CRM/SMS directory.
Saurabh Batra [Fri, 23 Oct 2015 16:33:15 +0000 (22:03 +0530)]
Minor comment-fixes for CRM/SMS directory.

9 years agoCRM-13823 - Snooze/hush cleanup
Coleman Watts [Fri, 23 Oct 2015 12:43:19 +0000 (08:43 -0400)]
CRM-13823 - Snooze/hush cleanup

9 years agoCRM-16990: Custom fields are NOT being saved for some component custom data (activiti...
yashodha [Fri, 23 Oct 2015 11:24:49 +0000 (16:54 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)

----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
  https://issues.civicrm.org/jira/browse/CRM-16990

9 years agoCRM-17434 fix - Free event registration with 'skip confirmation' throws warning
monishdeb [Fri, 23 Oct 2015 11:23:34 +0000 (16:53 +0530)]
CRM-17434 fix - Free event registration with 'skip confirmation' throws warning

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

9 years agoCRM-16990: Custom fields are NOT being saved for some component custom data (activiti...
yashodha [Fri, 23 Oct 2015 10:10:13 +0000 (15:40 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)

----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
  https://issues.civicrm.org/jira/browse/CRM-16990

9 years agoCRM-16990: Custom fields are NOT being saved for some component custom data (activiti...
yashodha [Fri, 23 Oct 2015 09:03:00 +0000 (14:33 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)

----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
  https://issues.civicrm.org/jira/browse/CRM-16990

9 years agoMerge pull request #7018 from monishdeb/CRM-17129
Monish Deb [Fri, 23 Oct 2015 05:04:17 +0000 (10:34 +0530)]
Merge pull request #7018 from monishdeb/CRM-17129

CRM-17129 fix - Checkbox custom fields for participants are not not r…

9 years agocomment fixes
eileenmcnaugton [Fri, 23 Oct 2015 05:02:15 +0000 (18:02 +1300)]
comment fixes

9 years agophpcs fix
Eileen McNaughton [Fri, 23 Oct 2015 04:32:56 +0000 (17:32 +1300)]
phpcs fix

9 years agoMerge pull request #7036 from eileenmcnaughton/master
Eileen McNaughton [Fri, 23 Oct 2015 04:30:30 +0000 (17:30 +1300)]
Merge pull request #7036 from eileenmcnaughton/master

Master

9 years agocomment fixes
eileenmcnaugton [Fri, 23 Oct 2015 03:39:15 +0000 (16:39 +1300)]
comment fixes

9 years agocomment fixes
eileenmcnaugton [Fri, 23 Oct 2015 02:16:36 +0000 (15:16 +1300)]
comment fixes

9 years agoCRM-13823 - Simplify data loading
Coleman Watts [Fri, 23 Oct 2015 02:31:18 +0000 (22:31 -0400)]
CRM-13823 - Simplify data loading

9 years agocomment fixes
eileenmcnaugton [Fri, 23 Oct 2015 01:23:01 +0000 (14:23 +1300)]
comment fixes

9 years agoMerge pull request #7031 from saurabhbatra96/comment-fixes-activity
Eileen McNaughton [Fri, 23 Oct 2015 01:21:07 +0000 (14:21 +1300)]
Merge pull request #7031 from saurabhbatra96/comment-fixes-activity

Comment fixes and function clean-up for CRM/Activity directory.