summaryrefslogtreecommitdiffstats
path: root/system/language/english
AgeCommit message (Collapse)AuthorFilesLines
2013-02-04Cleaned up for pull request.Sajan Parikh1-5/+5
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-01-01[ci skip] Happy new yearAndrey Andreev12-12/+12
2012-12-14Fix issue #539Andrey Andreev1-26/+26
Form validation language line keys were not prefixed. They are now prefixed with 'form_validation_' in order to avoid collisions. The old keys will still work if a prefixed match is not found, but are DEPRECATED and will be removed in the next major version. Also added upgrade notes and changelog entries for the new error message format from PR #961.
2012-12-12Find/replace oopsie.Eric Roberts1-2/+2
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-12Merge branch 'refs/heads/develop' into feature/form_error_msgsEric Roberts12-194/+201
Conflicts: system/language/english/form_validation_lang.php user_guide_src/source/libraries/form_validation.rst Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-03Add min_width and min_height options to the Upload classAndrey Andreev1-1/+1
(manually implementing outdated PR #636)
2012-12-03[ci skip] Cleaned some spacesAndrey Andreev2-6/+6
2012-11-12Merge remote-tracking branch 'upstream/develop' into developJonathon Hill12-3/+14
Conflicts: user_guide_src/source/changelog.rst Signed-off-by: Jonathon Hill <jhill@brandmovers.com>
2012-11-06Fix a lang key typoAndrey Andreev1-2/+2
2012-11-01Manually apply PR #1594 (fixing phpdoc page-level generation/warnings)Andrey Andreev12-1/+12
Also partially fixes issue #1295, fixes inconsistencies in some page-level docblocks and adds include checks in language files.
2012-10-31Added support for timestamp-based migrationsJonathon Hill1-0/+1
Signed-off-by: Jonathon Hill <jhill@brandmovers.com>
2012-10-11New form_validation rule: 'differs'Raul Baldner Junior1-0/+1
Added new validation rule 'differs'. It checks if the value of a field differs from the value of another field.
2012-10-05Fix issue #935 [ci skip]Andrey Andreev1-2/+2
2012-09-01A few forgotten double quotes in language stringsvlakoff1-14/+14
Follow-up to commit 0875d69dc7b5138cc40ea2f248024b2a886a0d82 from 2012-07-15
2012-07-15Changed double quotes to single quotes to meet style guidelinesAlex Bilbie7-141/+141
2012-07-12Update developvkeranov1-1/+0
2012-07-12Update developvkeranov1-1/+0
2012-07-12Fix some spaces herevkeranov1-6/+5
2012-07-12again... new linesvkeranov1-1/+0
2012-07-12Too many new lines here :)vkeranov1-2/+1
2012-07-12Cleaning againvkeranov1-4/+3
2012-07-12Cleaning...vkeranov1-1/+0
2012-07-12Cleaning time...vkeranov1-1/+0
2012-07-11Fixing typo in error for multiple migration conflict.lee Tengum1-1/+1
Signed-off-by: lee Tengum <lee@thatleeguy.com>
2012-06-19Fixed Migrations and an incorrect strict comparison.Phil Sturgeon1-1/+1
2012-06-07Resolve description docblock differences in system/language/Andrey Andreev12-29/+29
2012-04-15Combine this feature with Fix Issue #935 in another pull request.Eric Roberts1-2/+2
2012-04-15Fix a merge oopsie in the language file.Eric Roberts1-28/+0
2012-04-15Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Eric Roberts12-14/+42
feature/form_error_msgs Conflicts: system/language/english/form_validation_lang.php
2012-03-12Fixed typo in English language file for upload library.Seb Pollard1-1/+1
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon12-12/+12
Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway...
2012-02-08Fix #1009 documentation fixedJohn Crepezzi1-3/+3
2012-02-07Renaming equal_to_greater_than to greater_than_equal_to, equal_to_less_than ↵Nick Busey1-2/+2
to less_than_equal_to
2012-02-02Adding equal to greater than, equal to less than form validators.Nick Busey1-23/+25
2012-01-24Better support for using field names and rule parameters in error messages.Eric Roberts1-23/+23
2012-01-02Updating copyright date to 2012Greg Aker12-12/+12
2011-12-28Updating Moscow and Samoa timezonesBrandon Jones1-4/+4
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones12-0/+300
added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change
2011-09-03Changed up to down for down method error lineThomas Traub1-1/+1
2011-08-20Fixed a bug (#181) where a mis-spelling was in the form validation language ↵Greg Aker1-1/+1
file.
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones2-0/+14
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones2-8/+8
broke the Typography class's string replacements, for instance
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 Sturgeon1-1/+2
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 Sturgeon3-8/+11
2011-05-04Fixed conflict with migrations merge.Phil Sturgeon1-0/+13
2011-05-04Added Migration class and language file.Phil Sturgeon1-0/+13
2011-04-25Fixed double-space typo.Razican2-8/+8
2011-04-18Added Session Class userdata to the output profiler. Additionally, added a ↵Greg Aker1-0/+3
show/hide toggle on HTTP Headers, Session Data and Config Variables.