Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2011-08-20 | added 'planned' to version number in changelog | Derek Jones | 1 | -1/+1 | |
2011-08-20 | Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniter | Derek Jones | 1 | -1/+1 | |
2011-08-20 | Merge branch 'release/v2.0.3' into develop | Derek Jones | 130 | -133/+133 | |
Conflicts: user_guide/changelog.html | |||||
2011-08-20 | Merge branch 'release/v2.0.3' | Derek Jones | 142 | -348/+387 | |
2011-08-20 | updated version number in user guide, removed some stray merge markers found ↵ | Derek Jones | 130 | -137/+131 | |
in the change log | |||||
2011-08-15 | Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵ | Phil Sturgeon | 12 | -74/+423 | |
develop | |||||
2011-08-15 | Merge pull request #52 from waldmeister/develop | Phil Sturgeon | 5 | -49/+224 | |
Added some docs to CI core files | |||||
2011-08-15 | Added some docs to CI core files | David Behler | 5 | -49/+224 | |
2011-08-15 | Merge pull request #51 from waldmeister/develop | Phil Sturgeon | 5 | -13/+110 | |
Added some docs to CI core files | |||||
2011-08-14 | Added some docs to CI core files | David Behler | 5 | -13/+110 | |
2011-08-14 | Merge pull request #50 from waldmeister/develop | Phil Sturgeon | 1 | -0/+14 | |
Develop - Added some docs to CI core files | |||||
2011-08-14 | Added some docs to CI core files | David Behler | 1 | -0/+14 | |
2011-08-14 | Merge pull request #49 from waldmeister/develop | Phil Sturgeon | 5 | -13/+96 | |
Added some doc blocks to some CI core files | |||||
2011-08-14 | Added some docs to CI core files | David Behler | 2 | -13/+64 | |
2011-08-14 | Added some docs to CI core files | David Behler | 3 | -0/+32 | |
2011-08-14 | Added increment_string() docs and changelog. | Phil Sturgeon | 3 | -1/+15 | |
2011-08-14 | Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniter | Phil Sturgeon | 3 | -15/+9 | |
2011-08-14 | Fixed conflict. | Phil Sturgeon | 5 | -17/+54 | |
2011-08-14 | Merge pull request #46 from waldmeister/master | Phil Sturgeon | 3 | -7/+40 | |
Added some docs to CI core files | |||||
2011-08-14 | Added some docs to CI core files | David Behler | 1 | -7/+22 | |
2011-08-14 | Added some docs to CI core files | root | 2 | -0/+18 | |
2011-08-14 | Driver children can be located in any package path. Thanks Namaless. | Phil Sturgeon | 2 | -2/+3 | |
2011-08-14 | Fixed a bug (Reactor #89) where MySQL export would fail if the table had ↵ | Phil Sturgeon | 2 | -4/+5 | |
hyphens or other non alphanumeric/underscore characters. | |||||
2011-08-13 | Got changelog in sync with changes after v2.0.3 release branch merged a ↵ | Phil Sturgeon | 2 | -9/+40 | |
bunch of stuff. Anyone moving a develop change into v2.0.3 should move the changelog item too. | |||||
2011-08-13 | Bumped the version number. Can somebody with a working find and replace fix ↵ | Phil Sturgeon | 1 | -1/+1 | |
up the docs? | |||||
2011-08-13 | Fixed conflicts in changelog. | Phil Sturgeon | 2 | -2/+8 | |
2011-08-13 | Fixed conflicts. | Phil Sturgeon | 2 | -1/+3 | |
2011-08-13 | Fixed conflicts. | Phil Sturgeon | 3 | -2/+3 | |
2011-08-13 | Improved logic for plural() and singular() as words like "tax" would become ↵ | Phil Sturgeon | 1 | -48/+67 | |
"taxs" and it was tough to code in new rules. | |||||
2011-08-13 | Fixed conflict in changelog. | Phil Sturgeon | 2 | -1/+3 | |
2011-08-13 | Merge changelog. | Adam Jackett | 1 | -0/+2 | |
2011-08-13 | Fixed mysql and mysqli drivers to set NOT NULL as default for creating ↵ | Adam Jackett | 2 | -4/+12 | |
fields. All other drivers were correct. | |||||
2011-08-13 | Added having() fix to changelog. | Adam Jackett | 1 | -0/+1 | |
2011-08-13 | Fixed having method to insert quotes. | Adam Jackett | 1 | -1/+1 | |
2011-08-13 | Added note for fixed issue #199 in changelog. | Phil Sturgeon | 1 | -1/+2 | |
2011-08-13 | Fixed issue #199 - Attributes passed as string does not include a space ↵ | Eric Barnes | 1 | -0/+4 | |
between it and the opening tag. | |||||
2011-08-13 | Fixed conflict in changelog. | Phil Sturgeon | 3 | -0/+23 | |
2011-08-13 | sync total items count and total amount price; by sum of quantity of each ↵ | MarcosCoelho | 1 | -1/+3 | |
item in cart | |||||
2011-08-13 | Fixed conflicted changelog. | Phil Sturgeon | 3 | -2/+24 | |
2011-08-13 | Was working on this file so PHP5ified the method visibility scopes. ↵ | Phil Sturgeon | 1 | -154/+106 | |
Pointless, but was adding... | |||||
2011-08-13 | Get php_sapi_name() == 'cli' involved in the 'is this the command line?' ↵ | Phil Sturgeon | 3 | -2/+3 | |
decision. | |||||
2011-08-13 | Merged my GitHub mirror. | Phil Sturgeon | 11 | -14/+1446 | |
2011-08-13 | Merge branch 'develop' of ellislab.beanstalkapp.com:/codeigniter into develop | Phil Sturgeon | 14 | -35/+1199 | |
2011-08-13 | If a config class was loaded first then a library with the same name is ↵ | Phil Sturgeon | 2 | -4/+5 | |
loaded, the config would be ignored. | |||||
2011-08-13 | Big text area was big. Reduced the size a little. | Phil Sturgeon | 1 | -1/+1 | |
2011-08-13 | Improved logic for plural() and singular() as words like "tax" would become ↵ | Phil Sturgeon | 1 | -48/+67 | |
"taxs" and it was tough to code in new rules. | |||||
2011-08-12 | Merging - fingers crossed | Pascal Kriete | 27 | -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 | |||||
2011-08-12 | Merge pull request #42 from CUBRID/develop | Phil Sturgeon | 6 | -1/+1400 | |
CUBRID Database Driver for CI. | |||||
2011-08-12 | Added back the /application/config/migration.php and updated the ↵ | Esen Sagynov | 2 | -1/+44 | |
/applciation/config/database.php file which was incorrectly replaced in previous commit. | |||||
2011-08-11 | Added back /application/* files (removed in previous commit accidently). ↵ | Esen Sagynov | 37 | -59/+1628 | |
Corrected formatting/indenting in CUBRID Driver classes. Added myself as the driver author. Applied the MySQL fix, previously accepted in pull request #29, to CUBRID Driver. |