github.com/joomla/joomla-framework commits | Ecosyste.ms: OpenCollective

Fixing up doc blocks

3ad5df9c5946fe35b2c4ac37dfa6815dc286ccdf authored over 13 years ago

Merge pull request #138 from LouisLandry/master

Silly fix.

eae39f2be3e9657289ed17f4aebb9fac73eb7373 authored over 13 years ago

Just plain silly.

aa71bbf5dc7e6766ce7d44aa80ab6bd264d05c0b authored over 13 years ago

Merge pull request #137 from LouisLandry/master

Updates for 11.2

476d6242a0b7e8a347075bcfd2ba81869c198705 authored over 13 years ago

In honor of my favorite new PLT member.

57d456a11886605263a0609d7e3712e5bbe516e1 authored over 13 years ago

Merge pull request #136 from WebMechanic/client_id

Undefined index: 'CLIENT' in updater/adapters/collection.php

a7783111ab4738bd8d257aed1cff2818c93625fb authored over 13 years ago

Undefined index: 'CLIENT' in updater/adapters/collection.php

- take 3
From: http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracke...

31db4c83e028486ca5cd779e4b75e9e7f989417e authored over 13 years ago

Merge pull request #135 from eddieajau/master

Code sniffer compliance for access package.

d34324c92a07a3cda01c9e563e1d8c2bce08118d authored over 13 years ago

Merge pull request #132 from elinw/docblocks

doc blocks cache

41c71cd2c25467e90f253af3046ce253f353e0ae authored over 13 years ago

Merge pull request #116 from pasamio/jauthentication

JAuthentication updates to block logins and use class constants

e1b6760b347fa5d0fd43fd6ff8908dfae12bb2dd authored over 13 years ago

Code cleaning.

f613a6e6893a4955691a0065c1dd86e498bfc5a5 authored over 13 years ago

Merge pull request #130 from rvsjoen/updater

Make JUpdate also use regular expression for targetplatform

954d3a350f7394ddc210d25759dc59c36d69a538 authored over 13 years ago

Merge pull request #131 from rvsjoen/strict

Fix strict warning in JDatabase

3fdd88d0b60eafb3694e49f47f3787d1043d5eca authored over 13 years ago

Merge pull request #134 from LouisLandry/master

Fixing up a unit test I broke.

37e28f094f9040a132a18ed564f6f6ff9ba62b37 authored over 13 years ago

Fixing unit test :-)

7fe9ce791c30710a8dcfe4c67c45b487eec1165f authored over 13 years ago

Merge pull request #133 from LouisLandry/master

Fixing up the code sniffer and doing a little code cleanup.

47c6372d2d4d4cdb36e484b07475797de740fd9a authored over 13 years ago

Code cleanup.

45748e4f7e10633cc5210756f3fe2a49c7b78131 authored over 13 years ago

Fixing up some formatting issues with the new coding standard.

8371313985c9574b6045f5babc4fb067f13733a1 authored over 13 years ago

Merge branch 'master' into docblocks

0f737c8bf78782bef1284d8822b55c26841e7bde authored over 13 years ago

doc blocks cache

579210d4002b25fd76df7d008aca84ae91a685e6 authored over 13 years ago

Updates to the build process.

13f23a8646f696bb05e39e00e36adc4192e19820 authored over 13 years ago

Merge branch 'master' of github.com:joomla/joomla-platform

Conflicts:
libraries/joomla/access/rules.php

79e718e0f1e3889a39787ca8ef421232d0c9904c authored over 13 years ago

CI Test

73d43be5ab33921fd7247d7519c426a5dbb8c4d9 authored over 13 years ago

Merge pull request #120 from elinw/docblocks

Doc blocks

8b6deff174e4465eec7633b150b29b91207a5b0c authored over 13 years ago

Fix up content

4f842446d43bfdbbe9c28275881a423acbbade6a authored over 13 years ago

Doc bloc work in base

89d021b0318a387825a86a75c6879398fff4095d authored over 13 years ago

Merge branch 'master' into HEAD

Conflicts:
libraries/joomla/html/html/content.php

030559531ad875d981351a69d4e737ede72a2f58 authored over 13 years ago

Fix strict warning in JDatabase

e6d6d058e2766cba8c6b94ef118e0fa4f5e4252c authored over 13 years ago

Make JUpdate also use regular expression for targetplatform

d6a047c432db259f6d946f3dc6787a3d209ec771 authored over 13 years ago

Merge pull request #119 from mbabker/staging

Allow the infourl to be stored

88d3c551da727d215c707a0884f02f737704ac52 authored over 13 years ago

Merge pull request #117 from elinw/categoriesfix

System test failure fix

eb00e53e12573a51bbb519feecb329932f834f32 authored over 13 years ago

Merge branch 'master' of git://github.com/eddieajau/joomla-platform

e0ba5fab3bcbbf9b8e08e49befc61473c8d6be0d authored over 13 years ago

Add custom Joomla sniff.

baa740cec515f05967d4eae0b690913a45cdcd77 authored over 13 years ago

Code formatting.

1ada2e0d3e05f97d3cb3c70c56ac77772f9bdad7 authored over 13 years ago

Merge pull request #127 from eddieajau/master

Merge uncaught changes from Joomla SVN trunk.

038b7f02e6b604124e279d101722c326bb8b64cf authored over 13 years ago

Merge branch 'master' of github.com:joomla/joomla-platform

Conflicts:
libraries/joomla/installer/helper.php

b5a3d8861b09dc3db6443a18ad7fd6135f680f5b authored over 13 years ago

Merging uncaught changes from Joomla SVN trunk.

a5a8f75551cff383fa1652f6c734365ba288a965 authored over 13 years ago

Merge pull request #122 from elinw/issues

Fix reference o an image in the CMS

9e70ce26b7c221d05a798fdfd8e0e8664d0b2590 authored over 13 years ago

Merge pull request #126 from LouisLandry/master

Fix up unit tests.

08f90ab653f8411b0df16795edda3f53d16e4486 authored over 13 years ago

Fixing up some unit tests.

5c0727f86b8f7ade481ab5e67c7f38faffaf26ea authored over 13 years ago

Merge pull request #118 from elinw/cmscatchup

This is a cms catchup commit for issues 25696 and 26284 As part of

3949b21249d33f3da079caadecdd73151296be86 authored over 13 years ago

doc block application

67cbc072b644466568ac082df69027c4708bb9a8 authored over 13 years ago

Doc blocks work

9695364f5ba9f96827c2b45ac7d74d9bd7801177 authored over 13 years ago

More of html/html

cb6ec160d357415b6cd71200cdef2da597f66d6a authored over 13 years ago

Merge pull request #123 from ianmacl/jinput

Jinput

fa6bef5413680608a9aa23f40f80e3fe134eb48b authored over 13 years ago

Remove hard coded refernc to bluestork

4c96eff7e8b0183d9add76cbd524502d5f80ddd8 authored over 13 years ago

Chang a word

649004cda5d892a44a6ac6191b56cdec9551e75f authored over 13 years ago

Doc blocks in JHTML list and menu

237762f05ade03b8bd2c61cbdcac67c2c32705b5 authored over 13 years ago

Added test for JApplication to verify JInput gets initialized

11f4688bd28e8bea3201c566a97f22afb94320d1 authored over 13 years ago

More hmtl/html doc blocks through jgrid

269f68427e0a407743f9bc17639ae595db2d30dd authored over 13 years ago

More Doc blocks in html/html through grid

7eefe3d6477bfe5fb98d075db3d31048a5af348d authored over 13 years ago

Set to null

99fd7ca2848f9464028fe26476dde16e204da50a authored over 13 years ago

Added JInput object to JApplication

a9770b336b51e3c85963bb1f0b789d280a5dd046 authored over 13 years ago

work oh html doc blocks.

8624987a2df73787b61bcbbac157e385a9949f90 authored over 13 years ago

Allow the infourl to be stored

a471f927c1511a2cf8558382ead6c183cefa05bb authored over 13 years ago

Correct fatal error when a category id of 0 is passed in; this was

exposed as a problem with system test failurs on the CMS whem there
was a failure to get the modu...

066828c8c21021810cbc3ee0d7560307d2ee42ac authored over 13 years ago

This is a cms catchup commit for issues 25696 and 26284 As part of

solving a problem with updating the maximum time was bumped up for
zip. However some shared hosti...

55338e7a0323913421857f34a6c393e24fbfbac2 authored over 13 years ago

Added 'user' plugins to list of available plugins

10971d4104aa1d9094a6562aa1a0df39db09c90d authored over 13 years ago

Added @since tags for 11.2, perhaps a tad presumptious

0cf9227281291cc54f226c6b67f194da3b897e92 authored over 13 years ago

Fixing up a misindented line

051acd83f0a67a66beb6fe1c7ee0f037a7b27117 authored over 13 years ago

Some more minor formatting fixes

a270297e960a987305d06fe118c16b42e739fc82 authored over 13 years ago

Docblock style fixes

d03e250964e22f6f7d9758fe056e57e771832b6d authored over 13 years ago

More white space fixes

c2b162ca7f9c2362befbf63f87f2b23e6add2da9 authored over 13 years ago

Fixing up some indentation problems

36af5bd3775aa7fcd597f8fbeb4b219fcad7867b authored over 13 years ago

Updated to use class constants instead; fixed up unit test to match behaviour change from CMS:#25237

6848e73a2dee6206b6f2883ad6fcbf7098abf649 authored over 13 years ago

Updates to permit halting authentication from a user or authentication plugin

3052a3d52504a36488c30244aa9b3a462448d903 authored over 13 years ago

Merge pull request #103 from AmyStephen/master

JForm Telephone Rule

54c24c8315585ba929b34feff3654829e36b32fc authored over 13 years ago

Test

7faa1b116fd1abaf8a949c0ae2263e63f3185119 authored over 13 years ago

Merge pull request #109 from ianmacl/utest

Fixing unit test issue

43ca543ebf49e74d6b883f2a73c44e5c17b16a0b authored over 13 years ago

Fixing unit test issue

3721d10883fe7eb84eb4b502fbf10348fb30c692 authored over 13 years ago

Merge pull request #108 from elinw/testharness

Missing bracket

6fcb2e5cff3312702c37a42454a3a8815474ef92 authored over 13 years ago

Missing bracket

420149cfc87388b879e23602e390818908c6f7d2 authored over 13 years ago

Merge pull request #107 from elinw/testharness

Logging and tests

9904d1e3a352531ba19208d64d394e72f269fbe5 authored over 13 years ago

As logging to test harness

6203bfb3308d95dec2e4b1cfaccf3b15158895ae authored over 13 years ago

Merge pull request #102 from mbabker/master

Add optional context to JHtmlContent::prepare

214e1f89d8b8d0494a71028dee82423660a8bf8d authored over 13 years ago

Merge pull request #105 from elinw/logging

Added logging for deprecated methods.

686015fbd714a093be379ecc56f1fcb4f597d1e6 authored over 13 years ago

Merge branch 'master' into HEAD

Conflicts:
libraries/joomla/application/router.php
libraries/joomla/utilities/simplexml.php

7eca42458f24010b88d696adb1b5055ccdcf4ee4 authored over 13 years ago

More work on logging

88b7d507430b4c4b6291b0ea4e5da29cc8ac6871 authored over 13 years ago

Merge pull request #101 from elinw/docblocks

Merging in docblock changes.

248c49404c05da3565efe9db7dfe7f1da4e361c3 authored over 13 years ago

Merge pull request #106 from ianmacl/cli

Fixed subclass detection code

cadce20678c7ea037e7ab9fd2839aeda4835a406 authored over 13 years ago

Fixing merge error

283612acf03f1054844f4f41263bb81048e639d8 authored over 13 years ago

Merging changes

513481bec749411810e682cd328cea72bdf495b8 authored over 13 years ago

Fixed subclass detection code

1bc0df6097619f8bf9031d807edaee24fd48f4de authored over 13 years ago

Work on deprecation and deprecation logging

317ca8361c17480ff8d7f0bd4d5a1bfdb541448c authored over 13 years ago

Update deprecation release numbers to reflect the planned schedule

more accurately.

a21705a13009185b166f7a3a5c01c2cdb6b00402 authored over 13 years ago

A lot of work on JForm doc blocks

e399b653f6ea23c1ff069e38e6fde14e28f8f08f authored over 13 years ago

Change order of variables

429055ff4469cee40749b0f38a1858945b901d53 authored over 13 years ago

More doc block work in fields

1ed796c0d91cda356e369e02696ec70609cc74f5 authored over 13 years ago

PHP Strict Fixes for JMail Class

ce973b068efa28abf146940cc714a3fb50693f3d authored over 13 years ago

defined('JPATH_PLATFORM') or die; was commented out.

72835c185808ad33b2587f8a8df23983f5b8cb21 authored over 13 years ago

More work in doc blocks in fiels

c274ee715e6534ce1617a2a01ea5d427f6236140 authored over 13 years ago

Merge branch 'master' into HEAD

Conflicts:
libraries/joomla/installer/adapters/component.php
libraries/joomla/updater/updatead...

a5201c66f47362dc6491be0b2d78b89c11ddf398 authored over 13 years ago

File list doc blocks

2af849076d693bb5311cfc9f57f567832fd9e201 authored over 13 years ago

More doc bloc work in form fields.

3e7bbcea4753f9fcfa4e41f16978f25f825363a9 authored over 13 years ago

Clean up in Form Fields doc blocks.

cd0634836a74eb2f6fb3090c4023dcdfe77823ac authored over 13 years ago

Fix checkstyle warnings.

a73c62a2a563941de7ef47aae1339675bed6b2aa authored over 13 years ago

Added build and test ignore files.

8abb26f3516596091bb732911e3dd3f7fc130e7d authored over 13 years ago

Merge cosmetic changes to Cache package from Joomla 1.7.

97262f65c7b99f0d0d3be5f41b13364827db1f5c authored over 13 years ago

Doc block updates in rules

89c10bf7a49654c0c1001f81b1e7b30d7b7a15fe authored over 13 years ago

Merge branch 'master' of ssh://[email protected]/joomla/joomla-platform.git

e4bcaa8f54b84929d1d25ad3ba3a5baa7816acb2 authored over 13 years ago