summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-02-15Fix some stuff from recent pull requestsAndrey Andreev5-17/+29
2013-02-15Merge pull request #2245 from maltzurra/patch-1Andrey Andreev1-2/+2
Fixed is_https() to avoid incorrect detection.
2013-02-15Merge pull request #2243 from chrispassas/developAndrey Andreev3-1/+18
Update system/core/Log.php
2013-02-15Revert "Update system/core/Common.php"Chris Passas1-2/+2
This reverts commit 8af05ac97513764cc539919e179794df87352c30.
2013-02-15Revert "Update system/core/Log.php"Chris Passas1-9/+2
This reverts commit bbc6ab4736a896be83e3e3d5f8856374ffa2984c.
2013-02-15Revert "Revert "Update system/core/Common.php""Chris Passas1-2/+2
This reverts commit 3de57eaea8510ea9cfd70f063565c24904669c4c.
2013-02-15Revert "Update system/core/Common.php"Chris Passas1-2/+2
This reverts commit 8af05ac97513764cc539919e179794df87352c30.
2013-02-15Update system/core/Common.phpChris Passas1-2/+2
If using nginx instead of apache by default nginx will not populate the $_SERVER['HTTPS'] value.  This change allows falling back to checking the port number of the request to determine if your on SSL or not. The other option is adding the following to your nginx config. fastcgi_param HTTPS on; #some php apps require this to detent https
2013-02-15Update system/core/Log.phpChris Passas1-1/+1
Added a space after the comma on the ltrim().
2013-02-15Merge pull request #2248 from vlakoff/developAndrey Andreev11-14/+14
Various cosmetic fixes
2013-02-15Various cosmetic fixesvlakoff11-14/+14
2013-02-14Update system/core/Common.phpmaltzurra1-2/+1
2013-02-14Update system/core/Common.phpmaltzurra1-1/+2
2013-02-14Update system/core/Log.phpChris Passas1-1/+4
Don't print no script access code into log file if log file is not .php anymore.
2013-02-14Update system/core/Log.phpChris Passas1-1/+1
Added ltrim() as requested to strip '.' incase it's added by mistake.
2013-02-14Merge pull request #2241 from TimHas/developAndrey Andreev3-2/+7
Added small feature to profiler: total execution time count
2013-02-14Update system/core/Common.phpmaltzurra1-2/+2
Updated is_https() to avoid "NULL" or "0" values to set HTTPS.
2013-02-14changes according to narfbg's requestTim2-3/+3
2013-02-13changes according to narfbg's requestTim3-4/+7
2013-02-13Added support for changing the default log file extension from .php to ↵Chris Passas3-0/+14
whatever is preferred. example (.log) This is a follow up to this pull request. https://github.com/EllisLab/CodeIgniter/pull/2243
2013-02-13Update system/core/Log.phpChris Passas1-2/+9
Updated Log.php so that a developer can extend it and change the log file extension. It makes sense to default to .php when logs are in the public web folder.  It would be nice if a developer moves the log file path we have the option to use a standard extension like .log
2013-02-13Added small feature to profiler: total execution time countTim1-2/+4
adds additional information to profiler like: DATABASE:  test   QUERIES: 3 (0.0016s)  (Hide)
2013-02-08Fix issue #2230Andrey Andreev1-3/+3
2013-02-08[ci skip] Remove unnecessary string casts in PaginationAndrey Andreev2-4/+3
2013-02-08Merge pull request #2199 from cryode/feature/paginationAndrey Andreev1-83/+116
Multiple pagination bug fixes & optimizations.
2013-02-08[ci skip] Add a missing spaceAndrey Andreev1-1/+1
2013-02-08Allow non-string values to be used as captcha words (issue #2215)Andrey Andreev1-1/+5
2013-02-05Merge pull request #2227 from Lasha/patch-1Andrey Andreev1-2/+2
Added 'application/x-zip' mimetype for docx
2013-02-05Added 'application/x-zip' mimetype for docxLasha Krikheli1-2/+2
2013-02-04Merge pull request #2220 from sajanNOPPIX/developAndrey Andreev4-1/+18
New Form Validation Rule: alpha_numeric_spaces
2013-02-04Add entry in user guide changelog.Sajan Parikh1-0/+1
Signed-off-by: Sajan Parikh <sajan@noppix.com>
2013-02-04Cleaned up for pull request.Sajan Parikh3-10/+8
Signed-off-by: Sajan Parikh <sajan@noppix.com>
2013-02-02Added error message in lang file.Sajan Parikh1-5/+6
Signed-off-by: Sajan Parikh <sajan@noppix.com>
2013-02-02Fixed documentation.Sajan Parikh1-2/+4
Signed-off-by: Sajan Parikh <sajan@noppix.com>
2013-02-02Added Form Validation rule for alphanum + spaces.Sajan Parikh1-0/+15
Signed-off-by: Sajan Parikh <sajan@noppix.com>
2013-02-01Merge pull request #2216 from kaoz70/developAndrey Andreev1-3/+3
Added some mime types, for newer or older files.
2013-02-01Added some mime types, for newer or older files.kaoz701-3/+3
2013-01-30Merge pull request #2213 from appleboy/coreAndrey Andreev1-1/+1
core comment error.
2013-01-30core comment error.Bo-Yi Wu1-1/+1
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2013-01-30Remove tests for now non-existent method CI_Upload::clean_file_name()Andrey Andreev1-6/+0
See 7e5597782a589e4171ca08abdd9ce1a185542ff4
2013-01-30Fix/improve #2211Andrey Andreev2-2/+3
2013-01-29Merge pull request #2208 from appleboy/userguideAndrey Andreev1-2/+2
fixed #2207 user guide error
2013-01-29fixed #2207 user guide errorBo-Yi Wu1-2/+2
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2013-01-29Replace CI_Upload::clean_file_name() usage with CI_Security::sanitize_filename()Andrey Andreev3-49/+13
Also applied @xeptor's fix (a big thanks) to the sanitize_filename() method and added a changelog entry for it - fixes issue #73.
2013-01-29[ci skip] Add some changelog entriesAndrey Andreev1-3/+9
2013-01-29Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev4-2/+5
2013-01-29Replace is_file() with the faster file_exists()Andrey Andreev8-38/+65
(where it makes sense) Also: - Implemented caching of configuration arrays for smileys, foreign characters and doctypes. - Implemented cascading-style loading of configuration files (except for library configs, DB and constants.php).
2013-01-29Replace is_numeric() with ctype_digit()Eric Roberts1-6/+13
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-29Merge pull request #2204 from starsquare/developAndrey Andreev3-0/+3
Fix list_fields seek bug
2013-01-29Move $get assignment to if/else.Eric Roberts1-2/+4
Signed-off-by: Eric Roberts <eric@cryode.com>