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

Merge branch 'master' into docblocks

b2fc0e814136fd4a9792415a30ce02c706d08084 authored over 13 years ago

More style clean up

4c9b7c1826f7c06e1edf600d6668c6aaed6b23ab authored over 13 years ago

Merge pull request #205 from ianmacl/htmlfix

Added missing jimport

157c2e2671be981ae42e67164e9509eb9275ec4e authored over 13 years ago

Merge pull request #204 from elinw/docblocks

Code style work

e0953fe4ac0ef6feb3885bb88eb6a2f9f60073d8 authored over 13 years ago

Code style work

b6ba2a1c576abc295066c9d2745507fecd13b1c1 authored over 13 years ago

Merge commit '21fa3119a0b852c6b5353223faaebccc025c1101' into HEAD

db848ab11c341ca7e6889ba2ed3c4d714feaf279 authored over 13 years ago

Merge pull request #193 from jonnsl/master

Call to a member function qn() on a non-object

21fa3119a0b852c6b5353223faaebccc025c1101 authored over 13 years ago

Merge commit '1dbdade6cedd6ac18544d210c6b6261e77f8eeaa' into HEAD

c5b98a7abcb1187c16f3420201f63cd64e0720b6 authored over 13 years ago

Merge pull request #195 from elinw/docblocks

More doc block work

1dbdade6cedd6ac18544d210c6b6261e77f8eeaa authored over 13 years ago

Merge pull request #203 from jlleblanc/master

Fixed function name mentioned in deprecated warning.

5c5675534e3d15c63f9d703c48f38bcc39079965 authored over 13 years ago

Deprecated JDatabase::loadResultArray() logged a warning with the incorrect replacement function name.

5707fa99241f2072de3eaa6891483b42f7e38c97 authored over 13 years ago

Fix where pcntl_signal errors trying to set a SIG

f0371e679f04d25550ccf1ed95d1618c63edd3df authored over 13 years ago

Simple daemon does nothing but sleep

ea024cbc9b699840dca8787d1429d9a31c9f4952 authored over 13 years ago

Fix calendar doc blocks

ce454cfd00e6c580bc106dda5d6ef0d78d19dbe0 authored over 13 years ago

Updated changelog

Updated change log with the proposed change

084921d4de174f0f668501e759e376e5c08f4b93 authored over 13 years ago

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

3c74fd7b70bbec975b8858511cffa15bf0fa8e0a authored over 13 years ago

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

848f7e02c320d8482ba6af5d1c926e199635d873 authored over 13 years ago

Added missing jimport

4f2562a8b9c5142588ee090793041827ff264a21 authored over 13 years ago

Code formating

b806ecaa98d12f9988151d27e171be8269c701ea authored over 13 years ago

Add item to changelog.

5d6cbacb1e0054a457b833b2624f2086cd8bce52 authored over 13 years ago

Improved setup and teardown of rules field test.

1ad897cd42c97da44dd1076db7d39c34f6319b61 authored over 13 years ago

Replaced internal database mock with universal mock.

52af51386b815496a8b6180f1b95192d4f40f361 authored over 13 years ago

Added database helper; added dummy JDatabaseQuery class for testing support.

f2f9495262ce8f354078bb62d7304c91a8498a91 authored over 13 years ago

Added universal mock objects.

f1d9272a784c807f989e890cf5e1db7e39465b69 authored over 13 years ago

Added support for getting universal mock objects.

762d5e19e8667b3903c116881a4b3b3192621a66 authored over 13 years ago

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

5ea974ff7886e9b2369c5aa3385e06495e3d6eec authored over 13 years ago

Merge pull request #201 from nikosdion/patch-1

Fixed a typo in JHttp (stream_set_timeout vs stream_settimeout) as it cau

3e946b1fb61b95d6017365426719150e80a4d3c9 authored over 13 years ago

Fixed a typo in JHttp (stream_set_timeout vs stream_settimeout) as it caused a fatal error when using the class ;)

deecd392a1535b6111af01d0d6ff25d3f46eec50 authored over 13 years ago

Merge pull request #198 from realityking/media

Various fixes

bcbda2b7ab7d33a4e91b9b145ae4bd4b7b016d38 authored over 13 years ago

Missed this one

b54434f66dd6d968ea973eccaf52685b429e786f authored over 13 years ago

More doc blocks

d2d859e06b69e481383bccff0e4867ca911a3292 authored over 13 years ago

More doc block work

becd9eba5a39d5ac0786406e8fab6307c01f0e8d authored over 13 years ago

Add the namespacing of JS functions to the changelog.

3b1b35199f4f9c4eecc8ddfe65811dfacb0679db authored over 13 years ago

Merge pull request #194 from ianmacl/docs

Adding test execution instructions

86aee55af2854fd0dc52bc0a3edab9157aa53e70 authored over 13 years ago

Adding test execution instructions

f3d95cab2e377697bad6904889e71b431261fffa authored over 13 years ago

Call to a member function qn() on a non-object

defe9c257a2b9c68b27fd1c883643e48a25c32ee authored over 13 years ago

Merge remote-tracking branch 'upstream/master' into media

a2d5a71b6c467ecd35ecca68530844cad5688b9d authored over 13 years ago

Merge pull request #191 from realityking/corejs

Namespace more of Joomla's JavaScript functions and deprecate the old one

36dad2febf555ec983e032523706bd3c208d00dc authored over 13 years ago

Update Squeezebox

5da56fd99daa4ad7b20711b089b4a05090a897aa authored over 13 years ago

Make multiselect.js work without the MooTools 1.2 compatability layer.

7d60a1f7369112ef779434042cb0ac2c4d114a5b authored over 13 years ago

Fix deprecated tags.

Merge remote-tracking branch 'upstream/master' into corejs

Conflicts:
media/system/js/core.js

8f0c5697ab21d8f39dd60069bd2287edd4a50056 authored over 13 years ago

Merge remote-tracking branch 'upstream/master' into passwordstrength

040e2a4ad5bf0d979119bd5511fb94758f9c34a6 authored over 13 years ago

Merge pull request #192 from elinw/docblocks

Mising @since tags

2e4fa39f47afbaac0741415c981b946abdd50b3b authored over 13 years ago

Mising @since tags

55e2bc2bed011862e08bc4bca2195fc672fd8c34 authored over 13 years ago

Merge pull request #189 from realityking/media

Sync changes to the media folder from Joomla 1.7.

a38f24103cb70e9bf138a4d827b5a7c2e074c57b authored over 13 years ago

Namespace more of Joomla's JavaScript functions and deprecate the old ones.

90b2ba49a3697ca695e1a4ca162221d5fe77e45f authored over 13 years ago

Sync changes to the media folder from Joomla 1.7.

0fe1fd64e0cca57aa3b77a6a320bd5b2a730d07f authored over 13 years ago

Merge remote-tracking branch 'upstream/master' into passwordstrength

Conflicts:
libraries/joomla/form/fields/password.php

a4317d80976fc6e5e4e0b76d6466b53e958f8e56 authored over 13 years ago

Merge pull request #188 from realityking/various

Various little fixes.

e14f0b77c17a9a5b344e8ae3aab24cda9fb8ebd7 authored over 13 years ago

Allow other formats (json, xml, etc.) for the base controller as well.

3a9f46061182b4a8ad325cf87c80086737ea8891 authored over 13 years ago

Need to load JLog in JRequest.

ae20285be19e556a5e505b57cb0d595e4e42b52a authored over 13 years ago

Use the new index.htmls' in the media folder as well.

2a6d329826f2437aed5df6da071b2c58457a8cf7 authored over 13 years ago

Take of the svn revision from media files.

0e92259b9fb16ccd59bcdd7af466988d4a1d07aa authored over 13 years ago

Save a little markup on toolbar buttons.

1ed9d6ba92188dcb70f241527253ab4fd94c32ca authored over 13 years ago

Merge pull request #186 from ianmacl/utfail

Utfail

3d34d4a7526ba0d8bc99cbf2e039bfb840c2c376 authored over 13 years ago

Fixing unit test

283c91454758b7b7baacd973a3412f19554a42af authored over 13 years ago

Merge pull request #185 from WebMechanic/fluent_doc

JDocument fluent interface - reprise

7042b2d1af259533d82b0848039359cd8ebf164b authored over 13 years ago

Merge pull request #184 from LouisLandry/master

Code cleaning.

fd503d275536b8083d06155ef90ec25ddf5d0233 authored over 13 years ago

JDocument fluent interface

- changed setters and mutators to return $this instead of "void".
- cleanup of duplicate jimport...

e1c146743d166d4e6ade398fa59769d88ad2f1ca authored over 13 years ago

Code cleaning in the environment package.

4210d65c2be18750d19ca1cd0eada15b8fee2283 authored over 13 years ago

Code cleaning in the error package.

385c48c34aebd9ec1d05f3100e72c8de6605847a authored over 13 years ago

Code cleaning for cache and client packages.

5ab216aa679f2dd136c680ff0f51c569ff0029d7 authored over 13 years ago

Merge pull request #182 from eddieajau/cleaning

Code cleaning

88fa5184108beda44ffde724e97e8032c57ece16 authored over 13 years ago

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

b54c723ecc23c114cb9f27ffcb1872e884ba0733 authored over 13 years ago

Code cleaning

79891cf9ca578cadec7e64e3e8a39930639caa7b authored over 13 years ago

Merge pull request #180 from rvsjoen/adminmenus

Allow removal of admin menu entries

5d349ea53d1da126f77761c21159d5ff922a2f1e authored over 13 years ago

Allow removal of admin menu entries

4c4a1944c70551e102726685593fa04502515a4b authored over 13 years ago

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

f9ea25fdbc01b6575889cf36daa864ccc2760316 authored over 13 years ago

Merge pull request #179 from robschley/master

Added String package, updated changelog

c61d1277195bd7c2ffa910e9f9c683fbb2519ecb authored over 13 years ago

Merge pull request #178 from eddieajau/cleaning

Code cleaning.

9d73a7f313aa638e02367ccbc42ae121f4ce2688 authored over 13 years ago

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

Conflicts:
libraries/joomla/html/toolbar/button.php
libraries/joomla/html/toolbar/button/confi...

58a275640021fee6e0da4dce10d910dd5b8ab886 authored over 13 years ago

Fixed the deprecated warning in utilites/string.

5aab4b2eaa368b07fcb378662f73159dc79c8c16 authored over 13 years ago

Code cleaning.

e3d0f39e565610ce14f2dc7c5b80f6f0c68adac4 authored over 13 years ago

Updated new changelog.

Removed old changelog.

8be880500327fa26b6427b762b41e7b2b99a20bf authored over 13 years ago

Moved JString from Utilites package to String package.

Added JStringNormalize.

7ac88ec3e4cb352e3099a428c71139ed7cc601ac authored over 13 years ago

Merge pull request #174 from rvsjoen/updater2

Graceful return when update manifest cannot be parsed

1739596a2e65b7143de644b4e755263ae63d6cd5 authored over 13 years ago

Merge pull request #173 from elinw/test

Test

83404f7291d3433e754cd15c5fada9903f00a089 authored over 13 years ago

Merge pull request #176 from robschley/master

Database package cleanup

cd95a24aa106347000c3e61d743ceb7564d67e17 authored over 13 years ago

Renamed DatabaseException to JDatabaseException

Fixed several instances of database exceptions being throw without
error messages or codes.

504fbf18f4d39380364ad1403ad796e38da5ffc9 authored over 13 years ago

If given id is ourselves, behave like no id was given

64be392f71ded7e725e2263344574c12be785ba0 authored over 13 years ago

Add warning level to enqueued messages

e9732f39b42c03e9ead3105a4469c8035ff0c2f3 authored over 13 years ago

Added category for JLog in updater adapters

cdc32ccf8678715b3a14f74c073d689c3660fc46 authored over 13 years ago

Updated changelog

369b44d06aa18570b68d70a39f53234e63c5b2ea authored over 13 years ago

Use JLog instead of JError in update adapters

275ec9382d85766d36909461b0abae8d94edf3ef authored over 13 years ago

Merge pull request #170 from elinw/docblocks

Code cleaning.

333f8f8b89775455de888f052751605bd7bc06d1 authored over 13 years ago

Graceful return when update manifest cannot be parsed

2a9d0a5133959148b99f2b088bd5345d5fd85866 authored over 13 years ago

Revert "Starting doc blocks in toolbar, yikes."

This reverts commit 1c555bd237a62fd6873d5baeadc62ef1d7689d4d.

14dd6b0c44f7f40bf8438c47bdc0c754b5f4e516 authored over 13 years ago

Revert "More toolbar doc blocks"

This reverts commit 5526d0c817f366c4fe1cd0249a44ee447a66cd3f.

2a3cf73e2cbbf5ac539343af49d93336ab54217a authored over 13 years ago

Add missing basic validation checks for new rules

d911df88eea7cd2901aff4d4cf9228741fdfe825 authored over 13 years ago

More doc blocks mainly mismatched with arguments

71d6b0ceda5e8ffd4f7d74dc5c068e9d37709603 authored over 13 years ago

Doc block cleaning

98f49bcab53983e1c1cf8a246603a3780190ad2a authored over 13 years ago

Merge branch 'staging', remote-tracking branch 'upstream/staging' into staging

1bc5876448150d4d98d05a1e578ab79beac90cbc authored over 13 years ago

Merge branch 'staging', remote-tracking branch 'upstream/staging'

76eb908abbbcaa39de9803b28b8e4b6d1d768204 authored over 13 years ago

More work in browser.php

d7e89e7eed288ab3f3884b3c7e0d87f5b271e0e5 authored over 13 years ago

More toolbar doc blocks

5526d0c817f366c4fe1cd0249a44ee447a66cd3f authored over 13 years ago

Starting doc blocks in toolbar, yikes.

1c555bd237a62fd6873d5baeadc62ef1d7689d4d authored over 13 years ago

Some more work in document.php

885a5a1a2bb3ab069328c4cb4d01f6e2f088ac4c authored over 13 years ago

Merge pull request #168 from eddieajau/cleaning

Code cleaning.

dd04b05d323b551ed2a5ae116c67b0406081bca5 authored over 13 years ago

Code cleaning.

563b0a3eddd54fb2afe9cb6431f97ddfbd17be7a authored over 13 years ago

Merge pull request #166 from eddieajau/cleaning

Code cleaning.

7a6453f88ec24fba920998148b6951463135716d authored over 13 years ago