summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-11-12[ci skip] Remove some whitespace charsAndrey Andreev1-3/+2
2013-11-12Merge pull request #2719 from GDmac/developAndrey Andreev2-8/+9
Fix #2406 query builder cache
2013-11-11Cleanup PR #2719GDmac2-6/+3
for Fix #2406 query builder cache Signed-off-by: GDmac <grdalenoort@gmail.com>
2013-11-11Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developGDmac4-3/+53
2013-11-11Polish changes from PR #2712Andrey Andreev4-31/+16
2013-11-11Merge pull request #2718 from vkeranov/developAndrey Andreev1-2/+3
Update user_agents.php
2013-11-11Merge pull request #2712 from pveyes/developAndrey Andreev3-2/+66
Enable HTTP Verb in Routing
2013-11-09docs: get_compile_selectGDmac1-3/+3
get_compile_select(null,false) without reset also preserves LIMIT settings
2013-11-08Fix #2406 query builder cacheGDmac1-6/+10
Signed-off-by: GDmac <grdalenoort@gmail.com>
2013-11-08Update user_agents.phpvkeranov1-2/+3
Added Ubuntu Web Browser. More info here: http://www.omgubuntu.co.uk/2013/11/ubuntu-touch-browser-finally-given-unique-user-agent-string
2013-11-05Fix HTTP Verb Routing RulesFatih Kalifa3-18/+51
Fix code style, removed (:any) rule in http verb to avoid confusion, and add proposed documentation and changelog
2013-10-31Enable HTTP Verb in RoutingFatih Kalifa1-1/+32
Using array for HTTP Verb e.g: $route['(:any)']['POST'] = "controller/post_method"; $route['path']['GET'] = "controller/path_get_method"; $route['path']['(:any)'] = "controller/path_any_method"; Using (:any) or not will make same result e.g: $route['path']['(:any)'] == $route['path'] So it won't break existing route
2013-10-31Fix #2710Andrey Andreev1-2/+1
2013-10-31Merge branch 'feature/minify' into developAndrey Andreev1-132/+71
2013-10-31Merge branch 'develop' into feature/minifyAndrey Andreev8-16/+73
2013-10-31Apply trim() on the splitted code elementsAndrey Andreev1-164/+11
2013-10-30Escape PCRE delimitersAndrey Andreev1-2/+2
2013-10-29Fix a bug when multiple calls to QB's _compile_wh() or _compile_group_by() ↵Andrey Andreev1-1/+12
are required
2013-10-29Update sess_time_to_update description (rel #2397)Andrey Andreev2-3/+4
2013-10-29Merge pull request #2707 from sv3tli0/patch-1Andrey Andreev1-1/+2
add travis php 5.5
2013-10-29Merge pull request #2706 from manmath/patch-1Andrey Andreev1-3/+3
Update readme.rst
2013-10-29add travis php 5.5sv3tli01-1/+2
2013-10-29Update readme.rstMan Math1-3/+3
2013-10-29Merge pull request #2705 from kakysha/developAndrey Andreev3-9/+37
Better Redis connection handling
2013-10-29newline at the eofKakysha1-1/+1
2013-10-29Update caching.rstkakysha1-1/+1
2013-10-29typoskakysha1-1/+1
2013-10-29Spaces, log messageKakysha1-2/+2
2013-10-28Merge branch 'develop' of github.com:kakysha/CodeIgniter into developKakysha2-6/+18
2013-10-28Added changelog entrykakysha1-0/+1
2013-10-28Update Redis Caching blockkakysha1-6/+17
Added config options
2013-10-28Code cleanupKakysha1-2/+4
2013-10-28some code rewriteKakysha1-3/+3
2013-10-28Correct Redis connection troubleshootingKakysha1-4/+11
2013-10-28Added option to connect through unix socket in redis cache driverKakysha1-1/+8
2013-10-28Really fix #2703Andrey Andreev1-1/+1
2013-10-28Fix #2703Andrey Andreev1-1/+17
2013-10-28Merge branch 'develop' into feature/minifyAndrey Andreev1-1/+1
2013-10-28Fixing the dumbest parser error everAndrey Andreev1-1/+1
2013-10-28An alternative to CI_Output::_minify_script_style() using more efficient ↵Andrey Andreev1-5/+97
regexp patterns
2013-10-28Fix CI_DB_query_builder::_merge_cache() triggering E_WARNINGsAndrey Andreev1-3/+5
Kudos to kakysha for noting the bug & providing initial fix in PR #2698
2013-10-26Merge pull request #2699 from vlakoff/url-functionsAndrey Andreev3-23/+25
Implement $protocol parameter in Config base_url() and site_url() methods
2013-10-26Remove redundant changelog entryvlakoff1-1/+0
2013-10-25Implement $protocol parameter in Config base_url() and site_url() methodsvlakoff3-22/+25
Let's keep the implementation logic in one place. Improves 2023c3d05b042cf1322286d69557c2b8bf3bd8d5.
2013-10-23Fix issue #2695Andrey Andreev2-9/+45
2013-10-22Fix CSS minifierAndrey Andreev1-4/+4
2013-10-21Add CI_Upload:: optionAndrey Andreev3-1/+15
2013-10-21Add 'filename' to the return elements for create_captcha() (PR #2602)Andrey Andreev3-8/+10
2013-10-21Manually apply PR #2656Andrey Andreev1-2/+2
Fixes an 'Array to string conversion' notice in form_dropdown()
2013-10-21Fix #2515 (manually merge PR #2516)Andrey Andreev2-4/+26