civicrm-core.git
9 years agoMerge pull request #4917 from eileenmcnaughton/minor-tidies
Tim Otten [Tue, 13 Jan 2015 03:44:30 +0000 (19:44 -0800)]
Merge pull request #4917 from eileenmcnaughton/minor-tidies

Minor tidies

9 years agoMerge pull request #4916 from totten/master-casetypetest-cleanup
Tim Otten [Tue, 13 Jan 2015 02:23:14 +0000 (18:23 -0800)]
Merge pull request #4916 from totten/master-casetypetest-cleanup

INFRA-132 - Fix the longest stretches of contiguous spacing errors

9 years agoMerge pull request #4918 from colemanw/INFRA-132
colemanw [Tue, 13 Jan 2015 02:18:30 +0000 (21:18 -0500)]
Merge pull request #4918 from colemanw/INFRA-132

INFRA-132 - Fix docblocks

9 years agoINFRA-132 - Cleanup stray comments
Coleman Watts [Tue, 13 Jan 2015 02:13:48 +0000 (21:13 -0500)]
INFRA-132 - Cleanup stray comments

9 years agofix a few more comments
Eileen McNaughton [Tue, 13 Jan 2015 01:33:40 +0000 (14:33 +1300)]
fix a few more comments

9 years agoadd a few more arguments
Eileen McNaughton [Tue, 13 Jan 2015 01:30:42 +0000 (14:30 +1300)]
add a few more arguments

9 years agoa few mre comment block fixes
Eileen McNaughton [Tue, 13 Jan 2015 01:28:30 +0000 (14:28 +1300)]
a few mre comment block fixes

9 years agoremove some unused variables
Eileen McNaughton [Tue, 13 Jan 2015 01:21:42 +0000 (14:21 +1300)]
remove some unused variables

9 years agoTidy file to 'clean margin' standard
Eileen McNaughton [Tue, 13 Jan 2015 01:15:11 +0000 (14:15 +1300)]
Tidy file to 'clean margin' standard

9 years agofix syntax error I introduced last commit
Eileen McNaughton [Tue, 13 Jan 2015 01:02:34 +0000 (14:02 +1300)]
fix syntax error I introduced last commit

9 years agoa few more comment fixes
Eileen McNaughton [Tue, 13 Jan 2015 00:58:14 +0000 (13:58 +1300)]
a few more comment fixes

9 years agominor variable & doc fixes
Eileen McNaughton [Tue, 13 Jan 2015 00:52:23 +0000 (13:52 +1300)]
minor variable & doc fixes

9 years agoremove unused parameter
Eileen McNaughton [Tue, 13 Jan 2015 00:44:42 +0000 (13:44 +1300)]
remove unused parameter

9 years agominor comment corrections
Eileen McNaughton [Tue, 13 Jan 2015 00:44:19 +0000 (13:44 +1300)]
minor comment corrections

9 years agoINFRA-132 - Cleanup generated dao docblocks
Coleman Watts [Tue, 13 Jan 2015 00:29:15 +0000 (19:29 -0500)]
INFRA-132 - Cleanup generated dao docblocks

9 years agoINFRA-132 - CRM_Utils_JSTest - Spacing errors
Tim Otten [Tue, 13 Jan 2015 00:30:59 +0000 (16:30 -0800)]
INFRA-132 - CRM_Utils_JSTest - Spacing errors

9 years agoINFRA-132 - CRM_Utils_HtmlToTextTest - Spacing errors
Tim Otten [Tue, 13 Jan 2015 00:22:31 +0000 (16:22 -0800)]
INFRA-132 - CRM_Utils_HtmlToTextTest - Spacing errors

9 years agoINFRA-132 - Civi\Core\Container - Spacing errors
Tim Otten [Mon, 12 Jan 2015 23:48:32 +0000 (15:48 -0800)]
INFRA-132 - Civi\Core\Container - Spacing errors

9 years agoINFRA-132 - CaseTypeTest - Spacing errors
Tim Otten [Mon, 12 Jan 2015 23:48:15 +0000 (15:48 -0800)]
INFRA-132 - CaseTypeTest - Spacing errors

9 years agoremove piece of code that does nothing
Eileen McNaughton [Tue, 13 Jan 2015 00:31:47 +0000 (13:31 +1300)]
remove piece of code that does nothing

9 years agoremove unused var
Eileen McNaughton [Tue, 13 Jan 2015 00:29:01 +0000 (13:29 +1300)]
remove unused var

9 years agoremove unused var
Eileen McNaughton [Tue, 13 Jan 2015 00:28:23 +0000 (13:28 +1300)]
remove unused var

9 years agoremove unusable circular function
Eileen McNaughton [Tue, 13 Jan 2015 00:28:00 +0000 (13:28 +1300)]
remove unusable circular function

9 years agotidy up some unused params
Eileen McNaughton [Tue, 13 Jan 2015 00:27:34 +0000 (13:27 +1300)]
tidy up some unused params

9 years agoMerge pull request #4915 from eileenmcnaughton/minor-tidies
Eileen McNaughton [Tue, 13 Jan 2015 00:19:31 +0000 (13:19 +1300)]
Merge pull request #4915 from eileenmcnaughton/minor-tidies

Minor tidies - phpdoc

9 years agocleanup old tools for sanities sake
Eileen McNaughton [Tue, 13 Jan 2015 00:18:35 +0000 (13:18 +1300)]
cleanup old tools for sanities sake

9 years agofix comment blocks
Eileen McNaughton [Tue, 13 Jan 2015 00:00:25 +0000 (13:00 +1300)]
fix comment blocks

9 years agoremove some @access from phpdoc
Eileen McNaughton [Mon, 12 Jan 2015 23:26:04 +0000 (12:26 +1300)]
remove some @access from phpdoc

9 years agoMerge pull request #4913 from colemanw/INFRA-132
colemanw [Mon, 12 Jan 2015 23:02:17 +0000 (18:02 -0500)]
Merge pull request #4913 from colemanw/INFRA-132

INFRA-132 - Remove @static annotation

9 years agoMerge pull request #4914 from eileenmcnaughton/minor-tidies
Eileen McNaughton [Mon, 12 Jan 2015 23:00:59 +0000 (12:00 +1300)]
Merge pull request #4914 from eileenmcnaughton/minor-tidies

Minor tidies

9 years agoINFRA-132 - Remove @static annotation
Coleman Watts [Mon, 12 Jan 2015 22:48:58 +0000 (17:48 -0500)]
INFRA-132 - Remove @static annotation

9 years agophpdoc - re-fix country
Eileen McNaughton [Mon, 12 Jan 2015 22:53:40 +0000 (11:53 +1300)]
phpdoc - re-fix country

9 years agophpdoc params is always an array in api
Eileen McNaughton [Mon, 12 Jan 2015 22:52:44 +0000 (11:52 +1300)]
phpdoc params is always an array in api

9 years agofix re-use of variable
Eileen McNaughton [Mon, 12 Jan 2015 22:49:46 +0000 (11:49 +1300)]
fix re-use of variable

9 years agoa few random comment fixes
Eileen McNaughton [Mon, 12 Jan 2015 22:49:22 +0000 (11:49 +1300)]
a few random comment fixes

9 years agoINFRA-132 - Minor spacing fixes
Coleman Watts [Mon, 12 Jan 2015 22:47:27 +0000 (17:47 -0500)]
INFRA-132 - Minor spacing fixes

9 years agoMerge pull request #4912 from eileenmcnaughton/minor-tidies
colemanw [Mon, 12 Jan 2015 22:39:19 +0000 (17:39 -0500)]
Merge pull request #4912 from eileenmcnaughton/minor-tidies

phpdoc fixes

9 years agophpdoc fixes
Eileen McNaughton [Mon, 12 Jan 2015 22:34:57 +0000 (11:34 +1300)]
phpdoc fixes

9 years agoMerge pull request #4906 from eileenmcnaughton/minor-tidies
Tim Otten [Mon, 12 Jan 2015 21:21:08 +0000 (13:21 -0800)]
Merge pull request #4906 from eileenmcnaughton/minor-tidies

Minor tidies

9 years agoMerge pull request #4910 from colemanw/INFRA-132
colemanw [Mon, 12 Jan 2015 17:39:42 +0000 (12:39 -0500)]
Merge pull request #4910 from colemanw/INFRA-132

INFRA-132 - Docblock formatting fixes

9 years agoMerge pull request #4911 from colemanw/CRM-15802
colemanw [Mon, 12 Jan 2015 16:46:01 +0000 (11:46 -0500)]
Merge pull request #4911 from colemanw/CRM-15802

CRM-15802 - Bump up limit on soft credits

9 years agoCRM-15802 - Bump up limit on soft credits
Coleman Watts [Mon, 12 Jan 2015 16:45:41 +0000 (11:45 -0500)]
CRM-15802 - Bump up limit on soft credits

9 years agoINFRA-132 - Docblock formatting fixes
Coleman Watts [Mon, 12 Jan 2015 15:54:21 +0000 (10:54 -0500)]
INFRA-132 - Docblock formatting fixes

9 years agoINFRA-132 - Remove unused fn params
Coleman Watts [Mon, 12 Jan 2015 15:42:02 +0000 (10:42 -0500)]
INFRA-132 - Remove unused fn params

9 years agoINFRA-132 - Docblock fixes
Coleman Watts [Mon, 12 Jan 2015 15:39:21 +0000 (10:39 -0500)]
INFRA-132 - Docblock fixes

9 years agoINFRA-132 - Fix @static docblock tag
Coleman Watts [Mon, 12 Jan 2015 15:18:17 +0000 (10:18 -0500)]
INFRA-132 - Fix @static docblock tag

9 years agoMerge pull request #4907 from monishdeb/CRM-15695
Kurund Jalmi [Mon, 12 Jan 2015 15:08:51 +0000 (20:38 +0530)]
Merge pull request #4907 from monishdeb/CRM-15695

CRM-15695 fix - Showing Custom data options in report criteria problem

9 years agoCRM-15695 fix - Showing Custom data options in report criteria problem
monishdeb [Fri, 30 Jan 2015 12:36:29 +0000 (18:06 +0530)]
CRM-15695 fix - Showing Custom data options in report criteria problem

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

9 years agoMerge pull request #4909 from pratikshad/broken-webtest
Kurund Jalmi [Mon, 12 Jan 2015 15:01:00 +0000 (20:31 +0530)]
Merge pull request #4909 from pratikshad/broken-webtest

Fixed Broken webtest of Event and Contact

9 years agoMerge pull request #4908 from rohankatkar/webtest4.6
Yashodha Chaku [Mon, 12 Jan 2015 14:17:57 +0000 (19:47 +0530)]
Merge pull request #4908 from rohankatkar/webtest4.6

Webtest Fixes

9 years agoFixed Broken webtest of Event and Contact
pratikshad [Mon, 12 Jan 2015 14:05:58 +0000 (19:35 +0530)]
Fixed Broken webtest of Event and Contact

9 years agoWebtest Fixes
Web Access [Mon, 12 Jan 2015 13:07:40 +0000 (18:37 +0530)]
Webtest Fixes

9 years agoMerge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-12-16-09-32
kurund [Mon, 12 Jan 2015 10:51:26 +0000 (16:21 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-12-16-09-32

Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Contribute/Form/ContributionPage/Settings.php

9 years agoa few random comment fixes in the test suite
Eileen McNaughton [Mon, 12 Jan 2015 07:44:34 +0000 (20:44 +1300)]
a few random comment fixes in the test suite

9 years agouse better spelling
Eileen McNaughton [Mon, 12 Jan 2015 07:23:59 +0000 (20:23 +1300)]
use better spelling

9 years agotidy-up - remove duplicate array keys
Eileen McNaughton [Mon, 12 Jan 2015 07:18:42 +0000 (20:18 +1300)]
tidy-up - remove duplicate array keys

9 years agoMerge pull request #4905 from monishdeb/CRM-15619-fix
Monish Deb [Mon, 12 Jan 2015 06:54:25 +0000 (12:24 +0530)]
Merge pull request #4905 from monishdeb/CRM-15619-fix

CRM-15619, whitespace removal typo fix

9 years agoCRM-15728, whitespace removal typo fix
monishdeb [Fri, 30 Jan 2015 06:49:48 +0000 (12:19 +0530)]
CRM-15728, whitespace removal typo fix

----------------------------------------
* CRM-15728: Improve Scheduled Reminders for membership renewals
  https://issues.civicrm.org/jira/browse/CRM-15728

9 years agoMerge pull request #4904 from eileenmcnaughton/mailing-contact
Kurund Jalmi [Mon, 12 Jan 2015 06:37:47 +0000 (12:07 +0530)]
Merge pull request #4904 from eileenmcnaughton/mailing-contact

api cleanup remove unused params

9 years agoMerge pull request #4898 from monishdeb/CRM-15619-fix
Kurund Jalmi [Mon, 12 Jan 2015 06:30:51 +0000 (12:00 +0530)]
Merge pull request #4898 from monishdeb/CRM-15619-fix

Crm 15619 fix

9 years agotest failure fix2
monishdeb [Thu, 29 Jan 2015 11:55:36 +0000 (17:25 +0530)]
test failure fix2

9 years agotest failure fix
monishdeb [Thu, 29 Jan 2015 10:38:26 +0000 (16:08 +0530)]
test failure fix

9 years agooptimization and QA changes
monishdeb [Wed, 28 Jan 2015 14:45:30 +0000 (20:15 +0530)]
optimization and QA changes

9 years agotypo mistake
monishdeb [Wed, 7 Jan 2015 02:38:01 +0000 (08:08 +0530)]
typo mistake

9 years agotest break fixes
monishdeb [Tue, 6 Jan 2015 17:43:48 +0000 (23:13 +0530)]
test break fixes

9 years agoApi test failures fix round4
monishdeb [Tue, 6 Jan 2015 14:55:32 +0000 (20:25 +0530)]
Api test failures fix round4

9 years agoApi test failures fix round4
monishdeb [Fri, 2 Jan 2015 11:45:16 +0000 (17:15 +0530)]
Api test failures fix round4

9 years agoApi test failures fix round3
monishdeb [Fri, 2 Jan 2015 08:10:37 +0000 (13:40 +0530)]
Api test failures fix round3

9 years agominor change
monishdeb [Tue, 30 Dec 2014 17:28:30 +0000 (22:58 +0530)]
minor change

9 years agoApi test failures fix round2
monishdeb [Tue, 30 Dec 2014 15:31:22 +0000 (21:01 +0530)]
Api test failures fix round2

9 years agoApi test failures fix round1
monishdeb [Mon, 29 Dec 2014 10:23:43 +0000 (15:53 +0530)]
Api test failures fix round1

9 years agocleanup at api/utils
monishdeb [Mon, 15 Dec 2014 18:10:06 +0000 (23:40 +0530)]
cleanup at api/utils

9 years agominor change
monishdeb [Mon, 15 Dec 2014 14:11:47 +0000 (19:41 +0530)]
minor change

9 years agoQA fixes Round 2
monishdeb [Mon, 15 Dec 2014 14:07:56 +0000 (19:37 +0530)]
QA fixes Round 2

9 years agonewline add
monishdeb [Wed, 10 Dec 2014 18:27:52 +0000 (23:57 +0530)]
newline add

9 years agoApi test fixes
monishdeb [Sat, 6 Dec 2014 20:27:18 +0000 (01:57 +0530)]
Api test fixes

9 years agoEvent api break fixes and cleanup
monishdeb [Fri, 28 Nov 2014 07:58:04 +0000 (13:28 +0530)]
Event api break fixes and cleanup

9 years agominor fix
monishdeb [Tue, 25 Nov 2014 12:51:06 +0000 (18:21 +0530)]
minor fix

9 years agoActivity cleanup
monishdeb [Tue, 25 Nov 2014 12:45:05 +0000 (18:15 +0530)]
Activity cleanup

9 years agoApi Break fixes
monishdeb [Mon, 24 Nov 2014 05:14:42 +0000 (10:44 +0530)]
Api Break fixes

9 years agoMerge pull request #4902 from eileenmcnaughton/test-fix
Eileen McNaughton [Mon, 12 Jan 2015 06:22:32 +0000 (19:22 +1300)]
Merge pull request #4902 from eileenmcnaughton/test-fix

Test fix - remove obsolete class & some functions, function signatures

9 years agoMerge pull request #4900 from mrpaulc/CRM-15806
Yashodha Chaku [Mon, 12 Jan 2015 05:29:16 +0000 (10:59 +0530)]
Merge pull request #4900 from mrpaulc/CRM-15806

CRM-15806 - getPCPList on new Contribution does not filter

9 years agoMerge pull request #4884 from atif-shaikh/CRM-15787
Monish Deb [Mon, 12 Jan 2015 05:00:52 +0000 (10:30 +0530)]
Merge pull request #4884 from atif-shaikh/CRM-15787

Crm 15787

9 years agoapi cleanup remove unused params
Eileen McNaughton [Mon, 12 Jan 2015 04:26:21 +0000 (17:26 +1300)]
api cleanup remove unused params

9 years agoMerge pull request #4887 from pratikshad/broken-webtest
Yashodha Chaku [Mon, 12 Jan 2015 04:24:05 +0000 (09:54 +0530)]
Merge pull request #4887 from pratikshad/broken-webtest

Fixed broken webtest of Contact and Event

9 years agoconvert website.delete api to throw exception
Eileen McNaughton [Mon, 12 Jan 2015 04:05:56 +0000 (17:05 +1300)]
convert website.delete api to throw exception

9 years agofix some spelling:
Eileen McNaughton [Mon, 12 Jan 2015 03:57:54 +0000 (16:57 +1300)]
fix some spelling:

9 years agoMerge pull request #4903 from colemanw/INFRA-132
colemanw [Mon, 12 Jan 2015 03:56:21 +0000 (22:56 -0500)]
Merge pull request #4903 from colemanw/INFRA-132

INFRA-132 - Docblock fixes

9 years agoINFRA-132 - Docblock fixes
Coleman Watts [Mon, 12 Jan 2015 03:52:42 +0000 (22:52 -0500)]
INFRA-132 - Docblock fixes

9 years agominor function tidy-ups
Eileen McNaughton [Mon, 12 Jan 2015 03:47:51 +0000 (16:47 +1300)]
minor function tidy-ups

9 years agoINFRA-132 - Convert // comments to docblocks
Coleman Watts [Mon, 12 Jan 2015 03:38:03 +0000 (22:38 -0500)]
INFRA-132 - Convert // comments to docblocks

9 years agoremove another function that would cause tests to fail if it were used
Eileen McNaughton [Mon, 12 Jan 2015 03:29:03 +0000 (16:29 +1300)]
remove another function that would cause tests to fail if it were used

9 years agotest-fixes, stop using non-existent return values & remove broken function
Eileen McNaughton [Mon, 12 Jan 2015 03:23:57 +0000 (16:23 +1300)]
test-fixes, stop using non-existent return values & remove broken function
I feel I can reasonably assume the tests would fail if this function were ever called

9 years agoFix static fn use of $this
Coleman Watts [Mon, 12 Jan 2015 03:21:49 +0000 (22:21 -0500)]
Fix static fn use of $this

9 years agoINFRA-132 - Comment format cleanup
Coleman Watts [Mon, 12 Jan 2015 03:16:14 +0000 (22:16 -0500)]
INFRA-132 - Comment format cleanup

9 years agofix spelling, minor function fix to reflect lack of return value
Eileen McNaughton [Mon, 12 Jan 2015 03:10:57 +0000 (16:10 +1300)]
fix spelling, minor function fix to reflect lack of return value

9 years agoINFRA-132 - Fix incorrect param types
Coleman Watts [Mon, 12 Jan 2015 03:02:49 +0000 (22:02 -0500)]
INFRA-132 - Fix incorrect param types

9 years agoRemove php test class, since it requires files that have been invalid
Eileen McNaughton [Mon, 12 Jan 2015 02:58:47 +0000 (15:58 +1300)]
Remove php test class, since it requires files that have been invalid
for some time we can assume it is not used

9 years agoMerge pull request #4901 from colemanw/INFRA-132
colemanw [Mon, 12 Jan 2015 02:02:21 +0000 (21:02 -0500)]
Merge pull request #4901 from colemanw/INFRA-132

INFRA-132 - Docblock formatting fixes

9 years agoINFRA-132 - Standardize integer to int
Coleman Watts [Mon, 12 Jan 2015 01:40:52 +0000 (20:40 -0500)]
INFRA-132 - Standardize integer to int