summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-08-24Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniter into developEric Barnes0-0/+0
2011-08-20Merge pull request #203 from FrenkyNet/developDerek Jones1-1/+1
Removed unneeded code in CI_Email's set_alt_message.
2011-08-21Removed unneeded code in CI_Email's set_alt_message.Frank de Jonge1-1/+1
2011-08-20added 'planned' to version number in changelogDerek Jones1-1/+1
2011-08-20Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniterDerek Jones1-1/+1
2011-08-20Merge branch 'release/v2.0.3' into developDerek Jones130-133/+133
Conflicts: user_guide/changelog.html
2011-08-20Merge branch 'release/v2.0.3'Derek Jones142-348/+387
2011-08-20updated version number in user guide, removed some stray merge markers found ↵Derek Jones130-137/+131
in the change log
2011-08-15Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon12-74/+423
develop
2011-08-15Merge pull request #52 from waldmeister/developPhil Sturgeon5-49/+224
Added some docs to CI core files
2011-08-15Added some docs to CI core filesDavid Behler5-49/+224
2011-08-15Merge pull request #51 from waldmeister/developPhil Sturgeon5-13/+110
Added some docs to CI core files
2011-08-14Added some docs to CI core filesDavid Behler5-13/+110
2011-08-14Merge pull request #50 from waldmeister/developPhil Sturgeon1-0/+14
Develop - Added some docs to CI core files
2011-08-14Added some docs to CI core filesDavid Behler1-0/+14
2011-08-14Merge pull request #49 from waldmeister/developPhil Sturgeon5-13/+96
Added some doc blocks to some CI core files
2011-08-14Added some docs to CI core filesDavid Behler2-13/+64
2011-08-14Added some docs to CI core filesDavid Behler3-0/+32
2011-08-14Added increment_string() docs and changelog.Phil Sturgeon3-1/+15
2011-08-14Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniterPhil Sturgeon3-15/+9
2011-08-14Fixed conflict.Phil Sturgeon5-17/+54
2011-08-14Merge pull request #46 from waldmeister/masterPhil Sturgeon3-7/+40
Added some docs to CI core files
2011-08-14Added some docs to CI core filesDavid Behler1-7/+22
2011-08-14Added some docs to CI core filesroot2-0/+18
2011-08-14Driver children can be located in any package path. Thanks Namaless.Phil Sturgeon2-2/+3
2011-08-14Fixed a bug (Reactor #89) where MySQL export would fail if the table had ↵Phil Sturgeon2-4/+5
hyphens or other non alphanumeric/underscore characters.
2011-08-13Got changelog in sync with changes after v2.0.3 release branch merged a ↵Phil Sturgeon2-9/+40
bunch of stuff. Anyone moving a develop change into v2.0.3 should move the changelog item too.
2011-08-13Bumped the version number. Can somebody with a working find and replace fix ↵Phil Sturgeon1-1/+1
up the docs?
2011-08-13Fixed conflicts in changelog.Phil Sturgeon2-2/+8
2011-08-13Fixed conflicts.Phil Sturgeon2-1/+3
2011-08-13Fixed conflicts.Phil Sturgeon3-2/+3
2011-08-13Improved logic for plural() and singular() as words like "tax" would become ↵Phil Sturgeon1-48/+67
"taxs" and it was tough to code in new rules.
2011-08-13Fixed conflict in changelog.Phil Sturgeon2-1/+3
2011-08-13Merge changelog.Adam Jackett1-0/+2
2011-08-13Fixed mysql and mysqli drivers to set NOT NULL as default for creating ↵Adam Jackett2-4/+12
fields. All other drivers were correct.
2011-08-13Added having() fix to changelog.Adam Jackett1-0/+1
2011-08-13Fixed having method to insert quotes.Adam Jackett1-1/+1
2011-08-13Added note for fixed issue #199 in changelog.Phil Sturgeon1-1/+2
2011-08-13Fixed issue #199 - Attributes passed as string does not include a space ↵Eric Barnes1-0/+4
between it and the opening tag.
2011-08-13Fixed conflict in changelog.Phil Sturgeon3-0/+23
2011-08-13sync total items count and total amount price; by sum of quantity of each ↵MarcosCoelho1-1/+3
item in cart
2011-08-13Fixed conflicted changelog.Phil Sturgeon3-2/+24
2011-08-13Was working on this file so PHP5ified the method visibility scopes. ↵Phil Sturgeon1-154/+106
Pointless, but was adding...
2011-08-13Get php_sapi_name() == 'cli' involved in the 'is this the command line?' ↵Phil Sturgeon3-2/+3
decision.
2011-08-13Merged my GitHub mirror.Phil Sturgeon11-14/+1446
2011-08-13Merge branch 'develop' of ellislab.beanstalkapp.com:/codeigniter into developPhil Sturgeon14-35/+1199
2011-08-13If a config class was loaded first then a library with the same name is ↵Phil Sturgeon2-4/+5
loaded, the config would be ignored.
2011-08-13Big text area was big. Reduced the size a little.Phil Sturgeon1-1/+1
2011-08-13Improved logic for plural() and singular() as words like "tax" would become ↵Phil Sturgeon1-48/+67
"taxs" and it was tough to code in new rules.
2011-08-12Merging - fingers crossedPascal Kriete27-324/+766
Conflicts: system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/libraries/Email.php user_guide/changelog.html user_guide/database/configuration.html user_guide/helpers/url_helper.html user_guide/libraries/cart.html user_guide/libraries/form_validation.html
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-14 16:55:15 +0100