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 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
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
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
Coleman Watts [Mon, 12 Jan 2015 16:45:41 +0000 (11:45 -0500)]
CRM-15802 - Bump up limit on soft credits
Coleman Watts [Mon, 12 Jan 2015 15:54:21 +0000 (10:54 -0500)]
INFRA-132 - Docblock formatting fixes
Coleman Watts [Mon, 12 Jan 2015 15:42:02 +0000 (10:42 -0500)]
INFRA-132 - Remove unused fn params
Coleman Watts [Mon, 12 Jan 2015 15:39:21 +0000 (10:39 -0500)]
INFRA-132 - Docblock fixes
Coleman Watts [Mon, 12 Jan 2015 15:18:17 +0000 (10:18 -0500)]
INFRA-132 - Fix @static docblock tag
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
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
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
Yashodha Chaku [Mon, 12 Jan 2015 14:17:57 +0000 (19:47 +0530)]
Merge pull request #4908 from rohankatkar/webtest4.6
Webtest Fixes
pratikshad [Mon, 12 Jan 2015 14:05:58 +0000 (19:35 +0530)]
Fixed Broken webtest of Event and Contact
Web Access [Mon, 12 Jan 2015 13:07:40 +0000 (18:37 +0530)]
Webtest Fixes
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
Eileen McNaughton [Mon, 12 Jan 2015 07:44:34 +0000 (20:44 +1300)]
a few random comment fixes in the test suite
Eileen McNaughton [Mon, 12 Jan 2015 07:23:59 +0000 (20:23 +1300)]
use better spelling
Eileen McNaughton [Mon, 12 Jan 2015 07:18:42 +0000 (20:18 +1300)]
tidy-up - remove duplicate array keys
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
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
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
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
monishdeb [Thu, 29 Jan 2015 11:55:36 +0000 (17:25 +0530)]
test failure fix2
monishdeb [Thu, 29 Jan 2015 10:38:26 +0000 (16:08 +0530)]
test failure fix
monishdeb [Wed, 28 Jan 2015 14:45:30 +0000 (20:15 +0530)]
optimization and QA changes
monishdeb [Wed, 7 Jan 2015 02:38:01 +0000 (08:08 +0530)]
typo mistake
monishdeb [Tue, 6 Jan 2015 17:43:48 +0000 (23:13 +0530)]
test break fixes
monishdeb [Tue, 6 Jan 2015 14:55:32 +0000 (20:25 +0530)]
Api test failures fix round4
monishdeb [Fri, 2 Jan 2015 11:45:16 +0000 (17:15 +0530)]
Api test failures fix round4
monishdeb [Fri, 2 Jan 2015 08:10:37 +0000 (13:40 +0530)]
Api test failures fix round3
monishdeb [Tue, 30 Dec 2014 17:28:30 +0000 (22:58 +0530)]
minor change
monishdeb [Tue, 30 Dec 2014 15:31:22 +0000 (21:01 +0530)]
Api test failures fix round2
monishdeb [Mon, 29 Dec 2014 10:23:43 +0000 (15:53 +0530)]
Api test failures fix round1
monishdeb [Mon, 15 Dec 2014 18:10:06 +0000 (23:40 +0530)]
cleanup at api/utils
monishdeb [Mon, 15 Dec 2014 14:11:47 +0000 (19:41 +0530)]
minor change
monishdeb [Mon, 15 Dec 2014 14:07:56 +0000 (19:37 +0530)]
QA fixes Round 2
monishdeb [Wed, 10 Dec 2014 18:27:52 +0000 (23:57 +0530)]
newline add
monishdeb [Sat, 6 Dec 2014 20:27:18 +0000 (01:57 +0530)]
Api test fixes
monishdeb [Fri, 28 Nov 2014 07:58:04 +0000 (13:28 +0530)]
Event api break fixes and cleanup
projects / civicrm-core.git / log