merge master#1

Open

some81 wants to merge 2656 commits intowilliamhrs:masterfrom

This pull request is big! We're only showing the most recent 250 commits

Commits on Mar 15, 2011

Missed tiny change from last commit.
Phil Sturgeon
committed
Missed tiny change from last commit.
Phil Sturgeon
committed
release date and tag to changelog for 2.0.1
Derek Jones
committed
release date and tag to changelog for 2.0.1
Derek Jones
committed
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Derek Jones
committed
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Derek Jones
committed
tagging v2.0.1
Derek Jones
committed
tagging v2.0.1
Derek Jones
committed
Removed migrations folder, accidentally sneaked in during a bad merge.
Phil Sturgeon
committed
Removed migrations folder, accidentally sneaked in during a bad merge.
Phil Sturgeon
committed
constants.php will be loaded from the environment specific config folder if available.
Phil Sturgeon
committed
constants.php will be loaded from the environment specific config folder if available.
Phil Sturgeon
committed

Commits on Mar 16, 2011

Standardized newlines even more extensively in Input class.
Phil Sturgeon
committed
Standardized newlines even more extensively in Input class.
Phil Sturgeon
committed

Commits on Mar 17, 2011

Added form_validation_lang entries for decimal, greater_than, less_than.
Phil Sturgeon
committed
Added form_validation_lang entries for decimal, greater_than, less_than.
Phil Sturgeon
committed
load config files from environment specific locations in core classes, helpers and libraries
bubbafoley
committed
load config files from environment specific locations in core classes, helpers and libraries
bubbafoley
committed

Commits on Mar 22, 2011

Commits on Mar 25, 2011

Fixed merge.
Phil Sturgeon
committed
Fixed merge.
Phil Sturgeon
committed

Commits on Apr 1, 2011

Merged changes.
Phil Sturgeon
committed
Merged changes.
Phil Sturgeon
committed

Commits on Apr 2, 2011

Fixed type in the JavaScript documentation for animate().
Phil Sturgeon
committed
Fixed type in the JavaScript documentation for animate().
Phil Sturgeon
committed
Fixed issue #153 Escape Str Bug in MSSQL driver
Phil Sturgeon
committed
Fixed issue #153 Escape Str Bug in MSSQL driver
Phil Sturgeon
committed
Updated captcha helper example in the documentation to use the correct db field.
Phil Sturgeon
committed
Updated captcha helper example in the documentation to use the correct db field.
Phil Sturgeon
committed
Removed double-spacing from ftp_lang.php sentances.
Phil Sturgeon
committed
Removed double-spacing from ftp_lang.php sentances.
Phil Sturgeon
committed
Added is_cli_request() method to documentation for Input class.
Phil Sturgeon
committed
Added is_cli_request() method to documentation for Input class.
Phil Sturgeon
committed
Added CI_ Prefix to the Cache driver.
Phil Sturgeon
committed
Added CI_ Prefix to the Cache driver.
Phil Sturgeon
committed
Updated .hgignore to include application/logs/ and application/cache
Phil Sturgeon
committed
Updated .hgignore to include application/logs/ and application/cache
Phil Sturgeon
committed

Commits on Apr 3, 2011

Fixed loading an array of libraries.
Phil Sturgeon
committed
Fixed loading an array of libraries.
Phil Sturgeon
committed

Commits on Apr 5, 2011

Improving parameter security in xss clean
Pascal Kriete
committed
Improving parameter security in xss clean
Pascal Kriete
committed
tweaking remove_invisible_characters to make urlencoded character stripping optional
Pascal Kriete
committed
tweaking remove_invisible_characters to make urlencoded character stripping optional
Pascal Kriete
committed
Moving security to core.
Pascal Kriete
committed
Moving security to core.
Pascal Kriete
committed
Removing security loading calls.
Pascal Kriete
committed
Removing security loading calls.
Pascal Kriete
committed
Tightening up control character handling in urls
Pascal Kriete
committed
Tightening up control character handling in urls
Pascal Kriete
committed
Removing dohash and deprecating CI_SHA
Pascal Kriete
committed
Removing dohash and deprecating CI_SHA
Pascal Kriete
committed
Fixed a bug in the Javascript Library where improperly escaped characters could result in arbitrary javascript execution.
Pascal Kriete
committed
Fixed a bug in the Javascript Library where improperly escaped characters could result in arbitrary javascript execution.
Pascal Kriete
committed
Changelogging
Pascal Kriete
committed
Changelogging
Pascal Kriete
committed
Removed tag v2.0.1
Pascal Kriete
committed
Removed tag v2.0.1
Pascal Kriete
committed
Added tag v2.0.1 for changeset f97a33039a37
Pascal Kriete
committed
Added tag v2.0.1 for changeset f97a33039a37
Pascal Kriete
committed

Commits on Apr 6, 2011

Adding a note about security to the upgrade docs
Pascal Kriete
committed
Adding a note about security to the upgrade docs
Pascal Kriete
committed
Hat tip to the reactor team in the credits
Pascal Kriete
committed
Hat tip to the reactor team in the credits
Pascal Kriete
committed
Removed tag v2.0.1
Pascal Kriete
committed
Removed tag v2.0.1
Pascal Kriete
committed
Added tag v2.0.1 for changeset 52cd3ed4a9ea
Pascal Kriete
committed
Added tag v2.0.1 for changeset 52cd3ed4a9ea
Pascal Kriete
committed
Made Environment Support optional. Comment out or delete the constant to stop environment checks.
Phil Sturgeon
committed
Made Environment Support optional. Comment out or delete the constant to stop environment checks.
Phil Sturgeon
committed
Made Environment Support optional. Comment out or delete the constant to stop environment checks.
Phil Sturgeon
committed
Made Environment Support optional. Comment out or delete the constant to stop environment checks.
Phil Sturgeon
committed
Changed the 'plural' function so that it doesn't ruin the captalization of your string. It also take into consideration acronyms which are all caps.
Phil Sturgeon
committed
Changed the 'plural' function so that it doesn't ruin the captalization of your string. It also take into consideration acronyms which are all caps.
Phil Sturgeon
committed
Made in Output protected again, it was only ever made public by Eric to fix an issue with the Dwoo MY_Parser, which is no reason to change core files. That Parser doesn't really even need the acess.
Phil Sturgeon
committed
Made in Output protected again, it was only ever made public by Eric to fix an issue with the Dwoo MY_Parser, which is no reason to change core files. That Parser doesn't really even need the acess.
Phil Sturgeon
committed

Commits on Apr 7, 2011

Added CLI documentation.
Phil Sturgeon
committed
Added CLI documentation.
Phil Sturgeon
committed
Wow, I screwed that up, Reactor is going to 2.0.2 not 2.0.1
Pascal Kriete
committed
Wow, I screwed that up, Reactor is going to 2.0.2 not 2.0.1
Pascal Kriete
committed
Removed tag v2.0.1, should've been 2.0.2
Pascal Kriete
committed
Removed tag v2.0.1, should've been 2.0.2
Pascal Kriete
committed
Putting the v2.0.1 tag back to where it belongs
Pascal Kriete
committed
Putting the v2.0.1 tag back to where it belongs
Pascal Kriete
committed
And now properly prepped for 2.0.2, sigh
Pascal Kriete
committed
And now properly prepped for 2.0.2, sigh
Pascal Kriete
committed
Added tag v2.0.2 for changeset 521076012037
Pascal Kriete
committed
Added tag v2.0.2 for changeset 521076012037
Pascal Kriete
committed
Fixing a bug in the form_helper where csrf_token_name and csrf_hash were referencing class properties in the Security class that were moved.
gaker
committed
Fixing a bug in the form_helper where csrf_token_name and csrf_hash were referencing class properties in the Security class that were moved.
gaker
committed
Fix: #192 CI version constant incorrect in core/CodeIgniter
gaker
committed
Fix: #192 CI version constant incorrect in core/CodeIgniter
gaker
committed

Commits on Apr 8, 2011

Commits on Apr 9, 2011

Fix: codeigniter-reactor/199 CSRF config in Security class is no longer ignored
patwork
committed

Commits on Apr 11, 2011

Commits on Apr 15, 2011

Commits on Apr 18, 2011

Commits on Apr 19, 2011

Commits on Apr 20, 2011

Commits on Apr 21, 2011

Commits on Apr 22, 2011

Commits on Apr 23, 2011

Removing debug code accidentally committed.
gaker
committed

Commits on Apr 25, 2011

Duplicate this->db->insert_batch in documentation. Fixes #202
ericlbarnes
committed
Fixed #243 - Changed php version in the style guide to match requirements.
ericlbarnes
committed
Fixed typo error in toc.html in documentation.
Razican
committed
Fixed #60.
Razican
committed
Fixed #74.
Razican
committed
Fixed double-space typo.
Razican
committed
Fixing up a tabs vs spaces inconsistency in DB_Result
gaker
committed
Added redis cache driver.
Anton Lindqvist
committed
swapping out preg_replace() in the driver library where str_replace() works just fine.
gaker
committed
Adapted codeigniter coding standard.
Anton Lindqvist
committed

Commits on Apr 26, 2011

Automatic base_url generation was missing a ending slash.
ericlbarnes
committed

Commits on Apr 28, 2011

hg flow init, add .hgflow file
Phil Sturgeon
committed
Closed migrations branch in favour of new hg-flow branch.
Phil Sturgeon
committed

Commits on May 4, 2011

Added Migration class and language file.
Phil Sturgeon
committed
Fixed conflict with migrations merge.
Phil Sturgeon
committed
Reverted partial MySQL driver change which double-escaped some fields.
Phil Sturgeon
committed
Made a few uniform changes to Migrations.
Phil Sturgeon
committed
updated application flow image. Fixes #273 - thanks @InsiteFx
Derek Jones
committed

Commits on May 6, 2011

Fix #275 -- regression in db::_compile_select(). Thanks @patwork for the patch
gaker
committed

Commits on May 8, 2011

Commits on May 9, 2011

Commits on May 20, 2011

Commits on Jun 22, 2011

completed doc change for user_agent length increase
Derek Jones
committed

Commits on Jul 1, 2011

Commits on Jul 3, 2011

reverted texb.ttf font which had been compromised in 982b43c3590a by another massive whitespace 'cleanup' commit
Derek Jones
committed

Commits on Jul 15, 2011

Commits on Jul 16, 2011

Commits on Jul 17, 2011

Merge pull request #24 from joelcox/issue-165c
Phil Sturgeon
committed
Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into develop
Phil Sturgeon
committed

Commits on Jul 18, 2011

sync total items count and total amount price; by sum of quantity of each item in cart
MarcosCoelho
committed

Commits on Jul 19, 2011

Merge pull request #26 from marcoscoelho/cart_total_items
Phil Sturgeon
committed
Log change on method total_items from cart library
MarcosCoelho
committed
Merge pull request #28 from marcoscoelho/cart_total_items
Phil Sturgeon
committed

Commits on Jul 20, 2011

Commits on Jul 22, 2011

Added ->load->get_var() to check against ->load->_ci_cached_vars[].
Phil Sturgeon
committed

Commits on Jul 23, 2011

Fixed mysql and mysqli drivers to set NOT NULL as default for creating fields. All other drivers were correct.
Adam Jackett
committed
Added bug fix to changelog.
Adam Jackett
committed
Fixed having method to insert quotes.
Adam Jackett
committed
Added having() fix to changelog.
Adam Jackett
committed

Commits on Aug 9, 2011

Merge pull request #30 from darkhouse/feature/having_fix
Phil Sturgeon
committed
Merge pull request #29 from darkhouse/develop
Phil Sturgeon
committed

Commits on Aug 10, 2011

Commits on Aug 11, 2011

Commits on Aug 14, 2011

Added some docs to CI core files
David Behler
committed
Added some docs to CI core files
David Behler
committed
Merge pull request #49 from waldmeister/develop
Phil Sturgeon
committed
Added some docs to CI core files
David Behler
committed
Merge pull request #50 from waldmeister/develop
Phil Sturgeon
committed
Added some docs to CI core files
David Behler
committed
Merge pull request #51 from waldmeister/develop
Phil Sturgeon
committed
Added some docs to CI core files
David Behler
committed
Merge pull request #52 from waldmeister/develop
Phil Sturgeon
committed

Commits on Aug 15, 2011

Merge branch 'develop'
Anton Lindqvist
committed
Readded redis to valid cache drivers.
Anton Lindqvist
committed

Commits on Aug 17, 2011

Merge pull request #37 from jondavidjohn/develop
Phil Sturgeon
committed
Merge branch 'develop'
Anton Lindqvist
committed
Only call the error_reporting function is it's active and present.
Anton Lindqvist
committed