summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-02-11Merge branch 'develop' into patch-1Andrew82-5171/+8529
Conflicts: system/libraries/Calendar.php
2014-02-11updates per narfbg requestAndrew1-3/+1
I did a bunch of Git tutorials, and (i think) understand a lot more now. this update is to address narfbg comments, and add to pull request.
2014-02-10CI_Security: URL-decode until possibleAndrey Andreev1-1/+5
2014-02-10[ci skip] Fix a typoAndrey Andreev1-1/+1
2014-02-10CI_Security: Expect a backslash as a tag separatorAndrey Andreev1-2/+2
2014-02-10CI_Security: Filter jscript, wscript, vbs, confirm, prompt the same way as ↵Andrey Andreev1-6/+10
javascript, alert
2014-02-10Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev2-2/+2
2014-02-10CI_Encryption: Rename 'base64' parameter to 'raw_data' and add docsAndrey Andreev3-6/+563
2014-02-10Merge pull request #2867 from Chanthoeun/developAndrey Andreev1-1/+1
Correcting word "peforming" to "performing"
2014-02-10Remove bottom lineChanthoeun1-0/+1
2014-02-10Remove bottom lineChanthoeun1-1/+0
2014-02-10Remove bottom lineChanthoeun1-0/+1
2014-02-10Remove bottom lineChanthoeun1-1/+0
2014-02-10Correct word peforming to performingChanthoeun1-2/+2
2014-02-09updates per narfbg's commentsAndrew1-5/+6
2014-02-09Merge pull request #2861 from iolufemi/developAndrey Andreev1-1/+1
Fixed Typo in String Helper function
2014-02-09Removed new line at the end of file locally.iolufemi1-1/+1
2014-02-09template as array instead of stringAndrew1-39/+91
library accepts `$config['template']` as array and string, to perform template replacements. updated `$this->temp` var to `$this->replacements` to be less ambiguous about what it does
2014-02-09[ci skip] Some adjustments to the old Encrypt library docsAndrey Andreev1-13/+19
2014-02-09Merge branch 'develop' into 'feature/encryption'Andrey Andreev74-5068/+6497
2014-02-09Merge pull request #2866 from darwinel/developAndrey Andreev1-1/+1
Style guide
2014-02-09back to originaldarwinel1-2/+2
2014-02-09change back to originaldarwinel1-4/+4
2014-02-09Style Guidedarwinel1-1/+1
Logical Operators Use of || is discouraged as its clarity on some output devices is low (looking like the number 11 for instance). && is preferred over AND but either are acceptable, and a space should always precede and follow !
2014-02-09CodeIgniter support some basic web security by default!darwinel1-4/+4
I think its better to enable this basic security options by default. It’s more likely that users who build a new website or application from ground up, and use CodeIgniter can get used to this and eventually turn this off. From a web security perspective, we can support a more secure web, by default! Who agrees?
2014-02-08[ci skip] Deprecate the Javascript libraryAndrey Andreev3-2/+16
2014-02-08Deprecate CI_Config::system_url()Andrey Andreev3-1/+19
2014-02-08Add method chaining support to CI_TableAndrey Andreev3-40/+53
2014-02-08Add method chaining support to Calendar & Pagination libsAndrey Andreev5-7/+18
2014-02-08Method chaining support for FV set_data(), reset_validation()Andrey Andreev2-4/+9
2014-02-08CI_Input tweaksAndrey Andreev2-75/+30
- Make get_post(), post_get() and server()'s parameter mandatory. - Change default value of parameter to NULL for cookie(), input_stream() and _fetch_from_array() (for consistency with get(), post()). - Delegate Array-vs-single and parameter detection to _fetch_from_array() to overall simplify the code.
2014-02-08Make CI_Email::set_alt_message() parameter mandatory (optional doesn't make ↵Andrey Andreev3-3/+3
sense)
2014-02-08Merge branch 'feature/user-guide-cleanup' into developAndrey Andreev65-4956/+6369
2014-02-08simplify calendar libraryAndrew1-68/+35
it seemed quite strange that we ask users to pass in a template string the we parse with REGEX, to extract key/value pairs, when we can simply ask users for an array. the class still contains default variables for each part of the template. Users can simply pass in an array (instead of a string) when they initialize, $config['template'], which overwrites default values. this cuts down a little on file size by removing parse_template() function. I think arrays are much more straightforward and easy to read than 'encoded' strings. don't have to keep a running list of all template keys like in previous parse_template() function. gets rid of $this->temp[] property and changes it to $this->template[] which is more descriptive when generating output
2014-02-08[ci skip] Add return types to library docsAndrey Andreev28-666/+836
2014-02-08Merge pull request #2863 from darwinel/developAndrey Andreev1-1/+1
Small Style fix
2014-02-08Small Style fixdarwinel1-1/+1
General Style and Syntax
2014-02-07[ci skip] Add return types to common and error handling functions docsAndrey Andreev2-25/+25
2014-02-07[ci skip] Add return types to helper docs (+ some other formatting)Andrey Andreev21-326/+361
2014-02-07Removed new line at the end of the fileOlanipekun Femi0-0/+0
2014-02-07[ci skip] Fix class reference sections of Image_lib, Parser and User agent docsAndrey Andreev3-2/+9
2014-02-07[ci skip] Really fix wrong doc referencesAndrey Andreev1-2/+2
2014-02-07[ci skip] Really fix wrong doc referencesAndrey Andreev2-2/+2
2014-02-07Merge branch 'develop' into feature/user-guide-cleanupAndrey Andreev1-1/+1
2014-02-07[ci skip] Fix a wrong reference in the docsAndrey Andreev1-1/+1
2014-02-07Fixed Typo in String Helper functionOlanipekun Femi1-2/+2
alnum spelled as alunum in random_string function documentation comment.
2014-02-07[ci skip] Re-format changelog entriesAndrey Andreev1-93/+92
2014-02-07[ci skip] Replace :php:func: usage with just :func:Andrey Andreev3-14/+14
2014-02-07[ci skip] Some adjustments to the Javascript library docsAndrey Andreev1-28/+48
2014-02-07Merge branch 'develop' into 'feature/user-guide-cleanup'Andrey Andreev19-32/+70