summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-02-20Merge pull request #2896 from ivantcholakov/developAndrey Andreev1-1/+0
Method CI_URI::_fetch_uri_string() has been removed.
2014-02-20Method CI_URI::_fetch_uri_string() has been removed, removal of reference.Ivan Tcholakov1-1/+0
2014-02-20Try to fix Travis not excluding pgsql,mysqli for HHVMAndrey Andreev1-0/+2
2014-02-20Don't use error suppression on ini_get() eitherAndrey Andreev6-11/+9
2014-02-20CI_Utf8-related changesAndrey Andreev5-14/+86
- Give priority to mb_convert_encoding() over iconv() in clean_string() (partially fixes #261) - Add more proper unit tests
2014-02-20Remove a few empty 'mock' classesAndrey Andreev12-24/+6
2014-02-20Fix CI_Calendar testsAndrey Andreev2-7/+27
2014-02-20[ci skip] Fix date helper loading in CI_Calendar::get_total_days()Andrey Andreev1-1/+1
2014-02-20Date helper days_in_month(), CI_Calendar::get_total_days() changesAndrey Andreev5-19/+17
- days_in_month() now uses cal_days_in_month(), if available. - CI_Calendar::get_total_days() is now an alias for days_in_month().
2014-02-20Don't use error suppression with ini_set()Andrey Andreev2-2/+2
2014-02-19Add compatibility layer for array_column(), array_replace(), ↵Andrey Andreev7-3/+736
array_replace_recursive()
2014-02-19Merge pull request #2892 from jacobtabak/developAndrey Andreev1-2/+2
Fixed typos in Migration library documentation
2014-02-19Fixed typos in Migration library documentationJacob Tabak1-2/+2
Signed-off-by: Jacob Tabak <Jacob.Tabak@HelloWorld.com>
2014-02-19Merge pull request #2891 from cristik/developAndrey Andreev1-3/+2
Moved $_error load statement lower.
2014-02-19Moved $_error load statement lower.Cristian Kocza1-3/+2
This prevents a possible recursion when an error is trigerred by one of the config file. Also since the variable is used only later in the code it makes sense to move it lower.
2014-02-18Don't load password hashing compat for HHVMAndrey Andreev2-1/+7
2014-02-18Merge pull request #2889 from noskov/developAndrey Andreev1-21/+21
Correct typo for directory helper docs
2014-02-18Merge pull request #2888 from aanbar/developAndrey Andreev1-1/+1
Fixed variable scope.
2014-02-18Correct typoSerge Noskov1-21/+21
2014-02-18Fixed variable scope.Ahmad Anbar1-1/+1
2014-02-18CI_Encryption::hkdf() to follow RFC5869 more strictlyAndrey Andreev1-1/+1
2014-02-18[ci skip] Clean-up following PR #2864Andrey Andreev3-54/+58
2014-02-18Add an ext/hash compatibility layer (just hash_pbkdf2(), for now)Andrey Andreev6-1/+227
2014-02-17Merge pull request #2864 from browner12/patch-1Andrey Andreev3-44/+71
simplify calendar library
2014-02-17Merge pull request #2881 from brenjt/form_helperAndrey Andreev1-10/+16
form_dropdown array as first param fix
2014-02-17Removed extra space, condensed $defaultsBrennan Thompson1-4/+3
2014-02-17documentation for calendar updatesAndrew2-2/+15
change log and user guide updates for calendar update
2014-02-17Merge branch 'develop' into patch-1Andrew225-786/+1648
2014-02-17Removed extra spaces and irrelevant conditionBrennan Thompson1-11/+11
2014-02-17Micro-optimizationsAndrey Andreev3-56/+56
2014-02-17[ci skip] Minor tests adjustmentsAndrey Andreev5-33/+36
2014-02-17Fix #2884Andrey Andreev1-1/+1
2014-02-17Enable write_file() testAndrey Andreev1-39/+35
2014-02-17Updated code to match style guideBrennan Thompson1-3/+3
2014-02-17Removed non permitted changesBrennan Thompson1-3/+1
2014-02-16Dropdown should match style guide now.Brennan Thompson1-2/+8
2014-02-15[ci skip] Don't use output buffering in URL helper safe_mailto()Andrey Andreev1-17/+18
2014-02-15[ci skip] Micro-optimizationAndrey Andreev1-1/+1
2014-02-15Rename CI_Utf8::_is_ascii() to is_ascii() and make it publicAndrey Andreev4-11/+5
No reason for it to be protected.
2014-02-14Actual fix for extra whitespaceBrennan Thompson1-1/+1
2014-02-14Removed space for travis ci checksBrennan Thompson1-1/+1
2014-02-14Fix for selected being NULL from set_valueBrennan Thompson1-1/+1
2014-02-14Made form_dropdown compatible with the other form helper methodsBrennan Thompson1-19/+22
2014-02-14Merge remote-tracking branch 'upstream/develop' into developBrennan Thompson303-7257/+13002
Conflicts: system/helpers/form_helper.php
2014-02-13[ci skip] Add compatibility functions documentation + Sphinx build fixes for ↵Andrey Andreev4-22/+180
Cart
2014-02-13Fix #2878Andrey Andreev1-1/+1
2014-02-13Try to avoid 'zend_mm_heap corrupted' failures with phpunitAndrey Andreev1-1/+1
2014-02-13Fix #2364Andrey Andreev2-19/+22
2014-02-13Add pagination translation fileAndrey Andreev1-0/+35
2014-02-13Add language translation support to CI_Pagination (#1589)Andrey Andreev3-9/+25