summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2011-08-10Typecast limit and offset in the Database Driver to integers. Fixes ↵Phil Sturgeon2-2/+3
https://bitbucket.org/ellislab/codeigniter-reactor/issue/341/active-record-limit-function-have-sql#comment-597403
2011-08-10Added application/x-csv as a mime.Phil Sturgeon2-1/+2
2011-08-10Fixed #378 Robots identified as regular browsers by the User Agent class.Phil Sturgeon2-6/+7
2011-08-10Fixed typo in ActiveRecord.Phil Sturgeon1-1/+1
2011-08-10Disabled migrations by default.Phil Sturgeon1-1/+1
2011-08-10Fixed a bug where Email library attachments with a . in the name would using ↵Phil Sturgeon2-1/+2
invalid MIME-types.
2011-08-10Fixed a bug where using this->db->select_max(), this->db->select_min(), etc ↵Phil Sturgeon2-1/+3
could throw notices. Thanks to w43l for the patch.
2011-08-09Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon3-4/+13
develop
2011-08-09Merge pull request #29 from darkhouse/developPhil Sturgeon3-4/+13
Minor change to MySQL and MySQLi drivers.
2011-08-09Merged conflict.Phil Sturgeon3-9/+7
2011-08-09Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon2-1/+2
develop
2011-08-09Merge pull request #30 from darkhouse/feature/having_fixPhil Sturgeon2-1/+2
Having method wasn't adding quotes for dates.
2011-07-23Added having() fix to changelog.Adam Jackett1-0/+1
2011-07-23Fixed having method to insert quotes.Adam Jackett1-1/+1
2011-07-23Added bug fix to changelog.Adam Jackett1-0/+1
2011-07-23Fixed mysql and mysqli drivers to set NOT NULL as default for creating ↵Adam Jackett2-4/+12
fields. All other drivers were correct.
2011-07-23Merge branch 'develop' of ellislab.beanstalkapp.com:/codeigniter into developPhil Sturgeon1-0/+4
2011-07-23Added ->load->get_var() to check against ->load->_ci_cached_vars[].Phil Sturgeon3-0/+22
2011-07-20Changed Cart library to return the if inserted successfully. This will be ↵Phil Sturgeon3-17/+17
fine for anyone using () == true. http://codeigniter.uservoice.com/forums/40508-codeigniter-reactor/suggestions/2055829-last-rowid-of-cart
2011-07-20Updated Email class to use protected instead of private: ↵Phil Sturgeon1-59/+59
http://codeigniter.uservoice.com/forums/40508-codeigniter-reactor/suggestions/2056113-private-functions-suck
2011-07-20Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon2-1/+4
develop
2011-07-19Merge pull request #28 from marcoscoelho/cart_total_itemsPhil Sturgeon1-0/+1
Log change on method total_items from cart library
2011-07-19Log change on method total_items from cart libraryMarcosCoelho1-0/+1
2011-07-19Merge pull request #26 from marcoscoelho/cart_total_itemsPhil Sturgeon1-1/+3
Count items in the cart based on quantity, not on how many different things are in there.
2011-07-18sync total items count and total amount price; by sum of quantity of each ↵MarcosCoelho1-1/+3
item in cart
2011-07-18Fixed issue #199 - Attributes passed as string does not include a space ↵Eric Barnes1-0/+4
between it and the opening tag.
2011-07-17Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon2-2/+3
develop
2011-07-17Merge pull request #24 from joelcox/issue-165cPhil Sturgeon2-2/+3
CSRF field for internal POST only. Issue #165
2011-07-16Updated change logJoël Cox1-0/+1
2011-07-16CSRF field is only added when post method is used and action is internal. ↵Joël Cox1-2/+2
Closes #165
2011-07-16updating the change logMarcosCoelho1-0/+1
2011-07-16explains how use a parameter/argument (optional) in your callback rule ↵MarcosCoelho1-8/+5
declaration
2011-07-16enable use of param in a callback rule; it's a sugestion of solution, ↵Marcos Coelho1-2/+2
another way can be used, this feature seems forgotten;
2011-07-16enable use of param in a callback rule, on behalf of marcoscoelho.Phil Sturgeon2-1/+2
2011-07-15... set_dbprefix(). Programatically set the prefix, great for multi-site ↵Phil Sturgeon3-2/+23
systems that "namespace" with prefixes.
2011-07-15Was working on this file so PHP5ified the method visibility scopes. ↵Phil Sturgeon1-154/+106
Pointless, but was adding...
2011-07-15added .gitignore, removed .hg filesDerek Jones3-15/+9
2011-07-03reverted texb.ttf font which had been compromised in 982b43c3590a by another ↵Derek Jones1-0/+0
massive whitespace 'cleanup' commit
2011-07-03reverted texb.ttf font which had been compromised in 982b43c3590a by a ↵Derek Jones1-0/+0
another massive whitespace 'cleanup' commit
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones31-168/+660
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones230-2110/+2110
broke the Typography class's string replacements, for instance
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones229-2046/+2045
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones230-2110/+2110
broke the Typography class's string replacements, for instance
2011-06-22completed doc change for user_agent length increaseDerek Jones1-1/+1
2011-06-22completed doc change for user_agent length increaseDerek Jones1-1/+1