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
monishdeb [Tue, 25 Nov 2014 12:51:06 +0000 (18:21 +0530)]
minor fix
monishdeb [Tue, 25 Nov 2014 12:45:05 +0000 (18:15 +0530)]
Activity cleanup
monishdeb [Mon, 24 Nov 2014 05:14:42 +0000 (10:44 +0530)]
Api Break fixes
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
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
Monish Deb [Mon, 12 Jan 2015 05:00:52 +0000 (10:30 +0530)]
Merge pull request #4884 from atif-shaikh/CRM-15787
Crm 15787
Eileen McNaughton [Mon, 12 Jan 2015 04:26:21 +0000 (17:26 +1300)]
api cleanup remove unused params
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
Eileen McNaughton [Mon, 12 Jan 2015 04:05:56 +0000 (17:05 +1300)]
convert website.delete api to throw exception
Eileen McNaughton [Mon, 12 Jan 2015 03:57:54 +0000 (16:57 +1300)]
fix some spelling:
colemanw [Mon, 12 Jan 2015 03:56:21 +0000 (22:56 -0500)]
Merge pull request #4903 from colemanw/INFRA-132
INFRA-132 - Docblock fixes
Coleman Watts [Mon, 12 Jan 2015 03:52:42 +0000 (22:52 -0500)]
INFRA-132 - Docblock fixes
Eileen McNaughton [Mon, 12 Jan 2015 03:47:51 +0000 (16:47 +1300)]
minor function tidy-ups
Coleman Watts [Mon, 12 Jan 2015 03:38:03 +0000 (22:38 -0500)]
INFRA-132 - Convert // comments to docblocks
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
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
Coleman Watts [Mon, 12 Jan 2015 03:21:49 +0000 (22:21 -0500)]
Fix static fn use of $this
Coleman Watts [Mon, 12 Jan 2015 03:16:14 +0000 (22:16 -0500)]
INFRA-132 - Comment format cleanup
Eileen McNaughton [Mon, 12 Jan 2015 03:10:57 +0000 (16:10 +1300)]
fix spelling, minor function fix to reflect lack of return value
Coleman Watts [Mon, 12 Jan 2015 03:02:49 +0000 (22:02 -0500)]
INFRA-132 - Fix incorrect param types
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
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
Coleman Watts [Mon, 12 Jan 2015 01:40:52 +0000 (20:40 -0500)]
INFRA-132 - Standardize integer to int
Coleman Watts [Mon, 12 Jan 2015 01:07:35 +0000 (20:07 -0500)]
INFRA-132 - Standardize @inheritDoc tag use
Coleman Watts [Mon, 12 Jan 2015 00:49:32 +0000 (19:49 -0500)]
INFRA-132 - Fix comment formatting
Coleman Watts [Mon, 12 Jan 2015 00:18:14 +0000 (19:18 -0500)]
INFRA-132 - Move stray comments into docblocks
Coleman Watts [Sun, 11 Jan 2015 18:25:12 +0000 (13:25 -0500)]
INFRA-132 - Docblock formatting fixes
Paul Campbell [Sun, 11 Jan 2015 16:02:55 +0000 (16:02 +0000)]
CRM-15806 - getPCPList on new Contribution does not filter
https://issues.civicrm.org/jira/browse/CRM-15806
Monish Deb [Sun, 11 Jan 2015 10:48:20 +0000 (16:18 +0530)]
Merge pull request #4875 from civicrm/minor-fix
fix errors thrown when group is added
colemanw [Sun, 11 Jan 2015 02:46:52 +0000 (21:46 -0500)]
Merge pull request #4899 from colemanw/INFRA-132
INFRA-132 - Docblock @param and @return tag fixes
Coleman Watts [Sat, 10 Jan 2015 19:27:30 +0000 (14:27 -0500)]
INFRA-132 - Docblock @param and @return tag fixes
Tim Otten [Sat, 10 Jan 2015 05:58:12 +0000 (21:58 -0800)]
Merge pull request #4896 from totten/master-movedep
CA_Config, qunit, d3.js - Move various dependencies to bower.json/composer.json
Tim Otten [Sat, 10 Jan 2015 05:57:54 +0000 (21:57 -0800)]
Merge pull request #4897 from totten/master-cleanup2
INFRA-132 - More changes from the Arm & Hammer bald dude
Tim Otten [Sat, 10 Jan 2015 04:57:51 +0000 (20:57 -0800)]
INFRA-132 - Drupal.Files.EndFileNewline.TooMany
Tim Otten [Sat, 10 Jan 2015 04:15:06 +0000 (20:15 -0800)]
INFRA-132 - CRM/ - PHPStorm cleanup
Tim Otten [Sat, 10 Jan 2015 03:51:41 +0000 (19:51 -0800)]
INFRA-132 - Civi - PHPStorm cleanup
Tim Otten [Sat, 10 Jan 2015 03:51:01 +0000 (19:51 -0800)]
INFRA-132 - bin, extern, install, settings, xml - PHPStorm cleanup
Tim Otten [Sat, 10 Jan 2015 03:44:02 +0000 (19:44 -0800)]
INFRA-132 - tests/ - PHPStorm cleanup
Tim Otten [Fri, 9 Jan 2015 23:09:24 +0000 (15:09 -0800)]
INFRA-132 - FunctionDeclarationArgumentSpacing.SpaceBeforeEquals
Tim Otten [Fri, 9 Jan 2015 23:00:50 +0000 (15:00 -0800)]
INFRA-132 - SpacingAfterBeak
Tim Otten [Fri, 9 Jan 2015 22:48:38 +0000 (14:48 -0800)]
INFRA-132 - BraceOnNewLine. ContentAfterBrace. FirstIndexNoNewline.
colemanw [Sat, 10 Jan 2015 03:05:52 +0000 (22:05 -0500)]
Merge pull request #4895 from colemanw/INFRA-132
INFRA-132 - Whitespace fixes in docbloks
Coleman Watts [Sat, 10 Jan 2015 03:03:14 +0000 (22:03 -0500)]
INFRA-132 - Whitespace fixes in docbloks
Tim Otten [Sat, 10 Jan 2015 03:03:07 +0000 (19:03 -0800)]
d3.min.js - Move to bower.json
The version 3.4.11 is selected to match the existing code -- I don't know
that it's better or worse than any other version.
Coleman Watts [Sat, 10 Jan 2015 02:47:51 +0000 (21:47 -0500)]
Merge branch 4.5 into master
Conflicts:
CRM/Report/Form.php
CRM/Report/Form/Activity.php
CRM/Utils/File.php
Tim Otten [Sat, 10 Jan 2015 02:47:14 +0000 (18:47 -0800)]
angularsanitize.js - Remove redundant, unreferenced file
Tim Otten [Sat, 10 Jan 2015 02:45:27 +0000 (18:45 -0800)]
qunit - Move from packages.git to bower.json
colemanw [Sat, 10 Jan 2015 01:55:56 +0000 (20:55 -0500)]
Merge pull request #4894 from colemanw/CRM-15805
CRM-15805 - Add missing permission declaration for option group/value apis
Tim Otten [Sat, 10 Jan 2015 00:22:53 +0000 (16:22 -0800)]
CA_Config - Move from packages.git to composer.json
Coleman Watts [Sat, 10 Jan 2015 00:55:55 +0000 (19:55 -0500)]
CRM-15805 - Add missing permission declaration for option group/value apis
colemanw [Fri, 9 Jan 2015 20:22:35 +0000 (15:22 -0500)]
Merge pull request #4893 from colemanw/INFRA-132
INFRA-132 - Fix spacing of @return tag in comments
Coleman Watts [Fri, 9 Jan 2015 20:19:07 +0000 (15:19 -0500)]
INFRA-132 - Remove extra newlines from the bottom of docblocks
Coleman Watts [Fri, 9 Jan 2015 19:54:55 +0000 (14:54 -0500)]
INFRA-132 - Fix spacing of @return tag in comments
colemanw [Fri, 9 Jan 2015 19:45:32 +0000 (14:45 -0500)]
Merge pull request #4892 from colemanw/INFRA-132
INFRA-132 - Code comment cleanup
Coleman Watts [Fri, 9 Jan 2015 19:37:01 +0000 (14:37 -0500)]
INFRA-132 - Comment grammar cleanup
Coleman Watts [Fri, 9 Jan 2015 18:58:54 +0000 (13:58 -0500)]
INFRA-132 - Comment whitespace cleanup
Coleman Watts [Fri, 9 Jan 2015 18:50:04 +0000 (13:50 -0500)]
INFRA-132 - Fix missing newlines in comments
Coleman Watts [Fri, 9 Jan 2015 18:43:03 +0000 (13:43 -0500)]
INFRA-132 - Fix comment spacing
projects / civicrm-core.git / log