summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2011-08-13Merge branch 'develop' of ellislab.beanstalkapp.com:/codeigniter into developPhil Sturgeon7-16/+1166
2011-08-13If a config class was loaded first then a library with the same name is ↵Phil Sturgeon1-4/+4
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 Kriete15-292/+660
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 Sturgeon1-2/+2
https://bitbucket.org/ellislab/codeigniter-reactor/issue/341/active-record-limit-function-have-sql#comment-597403
2011-08-10Fixed #378 Robots identified as regular browsers by the User Agent class.Phil Sturgeon1-1/+1
2011-08-10Fixed typo in ActiveRecord.Phil Sturgeon1-1/+1
2011-08-10Fixed a bug where Email library attachments with a . in the name would using ↵Phil Sturgeon1-1/+1
invalid MIME-types.
2011-08-10Fixed a bug where using this->db->select_max(), this->db->select_min(), etc ↵Phil Sturgeon1-1/+2
could throw notices. Thanks to w43l for the patch.
2011-08-09Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon2-4/+12
develop
2011-08-09Merge pull request #29 from darkhouse/developPhil Sturgeon2-4/+12
Minor change to MySQL and MySQLi drivers.
2011-08-09Merged conflict.Phil Sturgeon1-1/+1
2011-08-09Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon1-1/+1
develop
2011-07-23Fixed having method to insert quotes.Adam Jackett1-1/+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 Sturgeon1-0/+15
2011-07-20Changed Cart library to return the if inserted successfully. This will be ↵Phil Sturgeon1-4/+4
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 Sturgeon1-1/+3
develop
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 Sturgeon1-2/+2
develop
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-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 Sturgeon1-1/+1
2011-07-15... set_dbprefix(). Programatically set the prefix, great for multi-site ↵Phil Sturgeon1-0/+15
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-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 Jones11-135/+568
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones102-986/+986
broke the Typography class's string replacements, for instance
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones102-948/+948
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones102-986/+986
broke the Typography class's string replacements, for instance
2011-06-15Merged base_url changes.philsturgeon2-16/+53
2011-06-15Merged Alex Bilbies MSSQL changes.philsturgeon107-1636/+1980
2011-05-20modified the 'use_set_names' variable in the MySQL/i drivers to be a class ↵Derek Jones2-10/+12
property instead of static, in case multiple database servers are connected to in a single request. Also clarified description of the 'dbcollat' setting in the configuration files
2011-05-09Removed accidental whitespace.Phil Sturgeon1-1/+1
2011-05-09Added 'is_unique' which is a brilliant feature I came up with all by myself. ↵Phil Sturgeon2-52/+70
Not based on code and ideas from Michael Wales, Burak Guzel, Zack Kitzmiller or Dan Horrigan at all. If they say any differently they are lying.
2011-05-08Merged tip.Phil Sturgeon104-1589/+1836
2011-05-08Wrapped all common functions to check if it already exists. This allows ↵Dan Horrigan1-13/+48
anyone to override a lot more of the core by simply defining these function prior to loading them.
2011-05-06Fix #275 -- regression in db::_compile_select(). Thanks @patwork for the patchGreg Aker1-11/+15
2011-05-04Made a few uniform changes to Migrations.Phil Sturgeon1-10/+9
2011-05-04Reverted partial MySQL driver change which double-escaped some fields.Phil Sturgeon1-3/+3
2011-05-04Fixed conflict with migrations merge.Phil Sturgeon3-3/+355
2011-05-04Added Migration class and language file.Phil Sturgeon2-46/+62
2011-04-27merging in changesGreg Aker102-1004/+1010
2011-04-27Added insert_batch() function to the PostgreSQL database driver. Thanks to ↵Greg Aker1-0/+18
epallerols for the patch.