yashodha [Thu, 15 Jan 2015 07:05:01 +0000 (12:35 +0530)]
clean up fixes for batch 5
Yashodha Chaku [Thu, 15 Jan 2015 06:58:29 +0000 (12:28 +0530)]
Merge pull request #4941 from totten/master-batch-14
INFRA-132 - Batch 14 (g)
Yashodha Chaku [Thu, 15 Jan 2015 06:56:06 +0000 (12:26 +0530)]
Merge pull request #4942 from civicrm/batch-5
cleanup fixes
Eileen McNaughton [Thu, 15 Jan 2015 06:46:41 +0000 (19:46 +1300)]
Merge pull request #4938 from eileenmcnaughton/minor-tidies
Minor tidies
Eileen McNaughton [Thu, 15 Jan 2015 06:46:19 +0000 (19:46 +1300)]
a few mor fixes
yashodha [Thu, 15 Jan 2015 05:28:14 +0000 (10:58 +0530)]
cleanup fixes
Eileen McNaughton [Thu, 15 Jan 2015 05:00:04 +0000 (18:00 +1300)]
more tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 04:59:57 +0000 (17:59 +1300)]
fix property visibility
Eileen McNaughton [Thu, 15 Jan 2015 04:13:28 +0000 (17:13 +1300)]
Code tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 04:06:51 +0000 (17:06 +1300)]
more code tidy ups
Tim Otten [Thu, 15 Jan 2015 02:59:26 +0000 (18:59 -0800)]
INFRA-132 - Batch 14 (g)
Eileen McNaughton [Thu, 15 Jan 2015 02:55:34 +0000 (15:55 +1300)]
more file tidy-ups
Eileen McNaughton [Thu, 15 Jan 2015 02:31:14 +0000 (15:31 +1300)]
fix clean up
Eileen McNaughton [Thu, 15 Jan 2015 02:14:54 +0000 (15:14 +1300)]
changed visibility on wrong property - amend
Eileen McNaughton [Thu, 15 Jan 2015 02:07:19 +0000 (15:07 +1300)]
a few more tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 01:44:58 +0000 (14:44 +1300)]
fix report property to public
Eileen McNaughton [Thu, 15 Jan 2015 01:13:53 +0000 (14:13 +1300)]
PHPcs file tidy up
Eileen McNaughton [Thu, 15 Jan 2015 01:01:38 +0000 (14:01 +1300)]
fix class property
Eileen McNaughton [Thu, 15 Jan 2015 00:59:02 +0000 (13:59 +1300)]
fix example tpl for code standards
Eileen McNaughton [Wed, 14 Jan 2015 22:16:12 +0000 (11:16 +1300)]
add a few more property declarations
colemanw [Wed, 14 Jan 2015 22:13:26 +0000 (17:13 -0500)]
Merge pull request #4939 from colemanw/CRM-15789
CRM-15789 - Fix dashboard close icon
Eileen McNaughton [Wed, 14 Jan 2015 22:01:03 +0000 (11:01 +1300)]
declare a few more variables properly
Eileen McNaughton [Wed, 14 Jan 2015 21:40:34 +0000 (10:40 +1300)]
improve CRM_Utils_Type::escape error message
Give people a clue if they have failed to camel case
the type
Eileen McNaughton [Wed, 14 Jan 2015 21:34:17 +0000 (10:34 +1300)]
spelling fixes
Eileen McNaughton [Wed, 14 Jan 2015 21:17:15 +0000 (10:17 +1300)]
minor comment fixes on report class + remove the silence operator
Eileen McNaughton [Wed, 14 Jan 2015 21:09:03 +0000 (10:09 +1300)]
a few more minor tidy ups
Eileen McNaughton [Wed, 14 Jan 2015 21:01:06 +0000 (10:01 +1300)]
a few tidy ups & comment fixes
Eileen McNaughton [Wed, 14 Jan 2015 21:00:19 +0000 (10:00 +1300)]
a few tidy ups on the report class including removing an unused var
Kurund Jalmi [Wed, 14 Jan 2015 18:24:27 +0000 (23:54 +0530)]
Merge pull request #4936 from monishdeb/INFRA-32
INFRA-132 - Batch #7
monishdeb [Sun, 1 Feb 2015 15:25:14 +0000 (20:55 +0530)]
INFRA-132 - Batch #7
Coleman Watts [Wed, 14 Jan 2015 17:06:32 +0000 (12:06 -0500)]
CRM-15789 - Fix dashboard close icon
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
Kurund Jalmi [Wed, 14 Jan 2015 16:11:21 +0000 (21:41 +0530)]
Merge pull request #4920 from pratikshad/Fixed-webtests
Fixed webtest of Contibution
Kurund Jalmi [Wed, 14 Jan 2015 16:10:47 +0000 (21:40 +0530)]
Merge pull request #4932 from totten/master-batch0-g
INFRA-132 - Batch 0 (set g)
Kurund Jalmi [Wed, 14 Jan 2015 16:10:22 +0000 (21:40 +0530)]
Merge pull request #4934 from kurund/cleanup
code cleanup
kurund [Wed, 14 Jan 2015 13:45:55 +0000 (19:15 +0530)]
code cleanup
CiviCRM [Wed, 14 Jan 2015 13:30:28 +0000 (05:30 -0800)]
Update version to 4.6.alpha3
Yashodha Chaku [Wed, 14 Jan 2015 08:39:36 +0000 (14:09 +0530)]
Merge pull request #4933 from civicrm/typo-corrections
typo fixes
yashodha [Wed, 14 Jan 2015 08:36:59 +0000 (14:06 +0530)]
typo fixes
Tim Otten [Wed, 14 Jan 2015 04:53:48 +0000 (20:53 -0800)]
INFRA-132 - Batch 0 (set g)
Tim Otten [Wed, 14 Jan 2015 03:21:30 +0000 (19:21 -0800)]
Merge pull request #4931 from davecivicrm/INFRA-132
INFRA-132 - Batch #6
Coleman Watts [Wed, 14 Jan 2015 02:51:08 +0000 (21:51 -0500)]
Merge branch '4.5' into master
Conflicts:
CRM/Core/Payment/BaseIPN.php
tests/phpunit/WebTest/Campaign/CampaignDescriptionTest.php
tests/phpunit/WebTest/Event/AddPricesetTest.php
tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
colemanw [Wed, 14 Jan 2015 02:28:27 +0000 (21:28 -0500)]
Merge pull request #4930 from colemanw/CRM-15817
CRM-15817 - Fix merge error
Dave Greenberg [Wed, 14 Jan 2015 02:11:34 +0000 (18:11 -0800)]
INFRA-132 - Batch #6
Coleman Watts [Wed, 14 Jan 2015 01:25:45 +0000 (20:25 -0500)]
CRM-15817 - Fix merge error
Tim Otten [Wed, 14 Jan 2015 01:23:43 +0000 (17:23 -0800)]
Merge pull request #4928 from totten/master-batch0
INFRA-132 - Batch 0
Tim Otten [Wed, 14 Jan 2015 00:28:17 +0000 (16:28 -0800)]
Merge pull request #4927 from totten/master-setupsh-data
bin/setup.sh - Distinguish the plain (civicrm_data.mysql) and example (civicrm_generated.mysql) options
Tim Otten [Wed, 14 Jan 2015 00:26:35 +0000 (16:26 -0800)]
INFRA-132 - Batch 0
Tim Otten [Tue, 13 Jan 2015 23:23:47 +0000 (15:23 -0800)]
bin/setup.sh - Distinguish the plain (civicrm_data.mysql) and example (civicrm_generated.mysql) options
colemanw [Tue, 13 Jan 2015 21:24:14 +0000 (16:24 -0500)]
Merge pull request #4926 from colemanw/INFRA-132
INFRA-132 - Batch #1
Coleman Watts [Tue, 13 Jan 2015 19:12:40 +0000 (14:12 -0500)]
INFRA-132 - Batch #1
Monish Deb [Tue, 13 Jan 2015 18:45:24 +0000 (00:15 +0530)]
Merge pull request #4919 from rohankatkar/webtests-4.5
Webtests fix-4.5
colemanw [Tue, 13 Jan 2015 18:17:02 +0000 (13:17 -0500)]
Merge pull request #4924 from colemanw/CRM-15742
CRM-15742 - Prevent dialog from returning to an invalid state
Coleman Watts [Tue, 13 Jan 2015 18:15:55 +0000 (13:15 -0500)]
Participant view button cleanup
Coleman Watts [Tue, 13 Jan 2015 18:01:42 +0000 (13:01 -0500)]
CRM-15742 - Prevent dialog from returning to an invalid state
colemanw [Tue, 13 Jan 2015 17:49:51 +0000 (12:49 -0500)]
Merge pull request #4923 from colemanw/invoice_id
Add invoice_id as default param to api.contribution.transact
colemanw [Tue, 13 Jan 2015 17:46:39 +0000 (12:46 -0500)]
Merge pull request #4922 from sunilpawar/CRM-15809
CRM-15809 fixed location type check
Coleman Watts [Tue, 13 Jan 2015 17:31:53 +0000 (12:31 -0500)]
Add invoice_id as default param to api.contribution.transact
https://www.drupal.org/node/
2402251
sunil [Tue, 13 Jan 2015 16:42:17 +0000 (22:12 +0530)]
CRM-15809 fixed location type check
pratikshad [Tue, 13 Jan 2015 14:01:05 +0000 (19:31 +0530)]
Fixed webtest of Contibution
Web Access [Tue, 13 Jan 2015 11:14:49 +0000 (16:44 +0530)]
Webtests fix-4.5
Tim Otten [Tue, 13 Jan 2015 03:44:30 +0000 (19:44 -0800)]
Merge pull request #4917 from eileenmcnaughton/minor-tidies
Minor tidies
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
colemanw [Tue, 13 Jan 2015 02:18:30 +0000 (21:18 -0500)]
Merge pull request #4918 from colemanw/INFRA-132
INFRA-132 - Fix docblocks
Coleman Watts [Tue, 13 Jan 2015 02:13:48 +0000 (21:13 -0500)]
INFRA-132 - Cleanup stray comments
Eileen McNaughton [Tue, 13 Jan 2015 01:33:40 +0000 (14:33 +1300)]
fix a few more comments
Eileen McNaughton [Tue, 13 Jan 2015 01:30:42 +0000 (14:30 +1300)]
add a few more arguments
Eileen McNaughton [Tue, 13 Jan 2015 01:28:30 +0000 (14:28 +1300)]
a few mre comment block fixes
Eileen McNaughton [Tue, 13 Jan 2015 01:21:42 +0000 (14:21 +1300)]
remove some unused variables
Eileen McNaughton [Tue, 13 Jan 2015 01:15:11 +0000 (14:15 +1300)]
Tidy file to 'clean margin' standard
Eileen McNaughton [Tue, 13 Jan 2015 01:02:34 +0000 (14:02 +1300)]
fix syntax error I introduced last commit
Eileen McNaughton [Tue, 13 Jan 2015 00:58:14 +0000 (13:58 +1300)]
a few more comment fixes
Eileen McNaughton [Tue, 13 Jan 2015 00:52:23 +0000 (13:52 +1300)]
minor variable & doc fixes
Eileen McNaughton [Tue, 13 Jan 2015 00:44:42 +0000 (13:44 +1300)]
remove unused parameter
Eileen McNaughton [Tue, 13 Jan 2015 00:44:19 +0000 (13:44 +1300)]
minor comment corrections
Coleman Watts [Tue, 13 Jan 2015 00:29:15 +0000 (19:29 -0500)]
INFRA-132 - Cleanup generated dao docblocks
Tim Otten [Tue, 13 Jan 2015 00:30:59 +0000 (16:30 -0800)]
INFRA-132 - CRM_Utils_JSTest - Spacing errors
Tim Otten [Tue, 13 Jan 2015 00:22:31 +0000 (16:22 -0800)]
INFRA-132 - CRM_Utils_HtmlToTextTest - Spacing errors
Tim Otten [Mon, 12 Jan 2015 23:48:32 +0000 (15:48 -0800)]
INFRA-132 - Civi\Core\Container - Spacing errors
Tim Otten [Mon, 12 Jan 2015 23:48:15 +0000 (15:48 -0800)]
INFRA-132 - CaseTypeTest - Spacing errors
Eileen McNaughton [Tue, 13 Jan 2015 00:31:47 +0000 (13:31 +1300)]
remove piece of code that does nothing
Eileen McNaughton [Tue, 13 Jan 2015 00:29:01 +0000 (13:29 +1300)]
remove unused var
Eileen McNaughton [Tue, 13 Jan 2015 00:28:23 +0000 (13:28 +1300)]
remove unused var
Eileen McNaughton [Tue, 13 Jan 2015 00:28:00 +0000 (13:28 +1300)]
remove unusable circular function
Eileen McNaughton [Tue, 13 Jan 2015 00:27:34 +0000 (13:27 +1300)]
tidy up some unused params
Eileen McNaughton [Tue, 13 Jan 2015 00:19:31 +0000 (13:19 +1300)]
Merge pull request #4915 from eileenmcnaughton/minor-tidies
Minor tidies - phpdoc
Eileen McNaughton [Tue, 13 Jan 2015 00:18:35 +0000 (13:18 +1300)]
cleanup old tools for sanities sake
Eileen McNaughton [Tue, 13 Jan 2015 00:00:25 +0000 (13:00 +1300)]
fix comment blocks
Eileen McNaughton [Mon, 12 Jan 2015 23:26:04 +0000 (12:26 +1300)]
remove some @access from phpdoc
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
Eileen McNaughton [Mon, 12 Jan 2015 23:00:59 +0000 (12:00 +1300)]
Merge pull request #4914 from eileenmcnaughton/minor-tidies
Minor tidies
Coleman Watts [Mon, 12 Jan 2015 22:48:58 +0000 (17:48 -0500)]
INFRA-132 - Remove @static annotation
Eileen McNaughton [Mon, 12 Jan 2015 22:53:40 +0000 (11:53 +1300)]
phpdoc - re-fix country
Eileen McNaughton [Mon, 12 Jan 2015 22:52:44 +0000 (11:52 +1300)]
phpdoc params is always an array in api
Eileen McNaughton [Mon, 12 Jan 2015 22:49:46 +0000 (11:49 +1300)]
fix re-use of variable
Eileen McNaughton [Mon, 12 Jan 2015 22:49:22 +0000 (11:49 +1300)]
a few random comment fixes
Coleman Watts [Mon, 12 Jan 2015 22:47:27 +0000 (17:47 -0500)]
INFRA-132 - Minor spacing fixes
colemanw [Mon, 12 Jan 2015 22:39:19 +0000 (17:39 -0500)]
Merge pull request #4912 from eileenmcnaughton/minor-tidies
phpdoc fixes
Eileen McNaughton [Mon, 12 Jan 2015 22:34:57 +0000 (11:34 +1300)]
phpdoc fixes
Tim Otten [Mon, 12 Jan 2015 21:21:08 +0000 (13:21 -0800)]
Merge pull request #4906 from eileenmcnaughton/minor-tidies
Minor tidies
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
projects / civicrm-core.git / log