summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-08-13Fix typo in commentsClaudio Galdiolo1-1/+1
2015-08-13Merge branch '3.0-stable' into developAndrey Andreev1-2/+5
2015-08-13Update config/constants.php with defined() checksAndrey Andreev3-34/+58
Allows for easier override with an environment-based configs. Close #4045
2015-08-13Update config/constants.php with defined() checksAndrey Andreev3-34/+48
Allows for easier override with an environment-based configs. Close #4045
2015-08-10Fix path for CLI error templates in upgrade docMat Whitney1-1/+1
2015-08-10Merge pull request #4042 from mwhitneysdsu/patch-1Andrey Andreev1-1/+1
[ci skip] Fix path for CLI error templates in upgrade docs
2015-08-10Fix path for CLI error templates in upgrade docMat Whitney1-1/+1
2015-08-07[ci skip] Partial patch for #2284Andrey Andreev2-2/+9
The issue description is about update_string(), which I'm not sure if can be fixed at all. This patch only addresses protect_identifiers().
2015-08-07[ci skip] Add 3.1.0 upgrade instructions fileAndrey Andreev2-0/+15
2015-08-07[ci skip] Add 3.0.2 upgrade instructions fileAndrey Andreev2-0/+15
2015-08-07[ci skip] Add 3.0.2 upgrade instructions fileAndrey Andreev2-0/+15
2015-08-07[ci skip] Start of 3.1.0-devAndrey Andreev4-4/+11
2015-08-07[ci skip] Start of 3.0.2-devAndrey Andreev4-4/+11
2015-08-07[ci skip] Add 3.0.1 release date to changelogAndrey Andreev1-1/+1
2015-08-07[ci skip] Add 3.0.1 release date to changelogAndrey Andreev1-1/+1
2015-08-07[ci skip] Add a note about string helpersAndrey Andreev1-0/+3
2015-08-07Fix #4023Andrey Andreev2-1/+2
Close #4024
2015-08-07Fix ReDoS-bug in string_helper.phpKevin Morssink1-1/+1
Fix for ReDoS (Regular Expression Denial of Service) / Code Injection Risk
2015-08-05Fix #4026Andrey Andreev2-1/+5
2015-08-05Merge pull request #4028 from bjjay/patch-1Andrey Andreev1-6/+0
Remove a redundant piece of code from Profiler
2015-08-05Reduce once $config['query_toggle_count'] checkingbjjay1-6/+0
This checking can be done by calling set_sections method when initialize profiler .
2015-08-05Fix #4027Andrey Andreev2-8/+13
2015-08-03Fix #4015Andrey Andreev2-1/+3
2015-08-03[ci skip] Normalize tabs/spacesAndrey Andreev12-25/+26
Partial changes from PR #4016
2015-07-31[ci skip] Add a note about form helper set_value()Andrey Andreev1-0/+5
2015-07-31[ci skip] Alter 3.0 upgrade instructions titleAndrey Andreev1-1/+1
They'd be valid for all 3.0.x versions, not just for 3.0.0
2015-07-31Fix #4012Andrey Andreev2-1/+5
2015-07-31Merge pull request #4010 from aneasystone/html_helperAndrey Andreev1-1/+1
[ci skip] Correct description of HTML helper function ul()
2015-07-31Correct the notes of html_helper ul functionaneasystone1-1/+1
Signed-off-by: aneasystone <aneasystone@gmail.com>
2015-07-30[ci skip] Fix a changelog typoAndrey Andreev1-1/+1
2015-07-29[ci skip] QB docs, consistent bool vs booleanAndrey Andreev1-6/+6
2015-07-29Revert "[ci skip] Fix where_in() docs"Andrey Andreev1-4/+4
This reverts commit c749bfbca99291fe64ca98d45a20d0735cb4e461. Related to #3989, #4001
2015-07-29Fix a 'counter-#3989' bugAndrey Andreev2-5/+16
The issue described in #3989 is actually the opposite of what has beent the intended behavior for the parameter in all Query Builder methods. Unfortunately, there's been a huge misunderstanding about that and half the methods worked properly, while the other half did not ... fixing that here. Also related: #4001
2015-07-29Merge pull request #4009 from aneasystone/doc-proAndrey Andreev1-2/+2
[ci skip] Correct notes about database_exists(), optimize_database() utils
2015-07-29fix mixed-up database and tableaneasystone1-2/+2
Signed-off-by: aneasystone <aneasystone@gmail.com>
2015-07-28Fix #4005Andrey Andreev1-1/+1
2015-07-28[ci skip] Remove a redundant example from DB result docsAndrey Andreev1-12/+0
2015-07-27Close #4004Andrey Andreev2-1/+4
2015-07-27Revert "[ci skip] Add a changelog entry for last commit"Andrey Andreev1-1/+0
This reverts commit 72774470d435b18fac6cb90bc4e4ff2b9e8684a2. Conflicts: user_guide_src/source/changelog.rst
2015-07-27Revert "Fix an internal bug in QB where() escaping"Andrey Andreev1-1/+4
This reverts commit 43afc71b777b00cfc2638add6fa3c47d333c5e04.
2015-07-27Revert "Fix #3989"Andrey Andreev2-5/+12
This reverts commit e1a94d30e2f30cee36f71c246136fb2db34d25df.
2015-07-27[ci skip] Update some query builder examplesAndrey Andreev1-11/+21
Related: #4001
2015-07-26Fix #4000Andrey Andreev2-1/+3
2015-07-26[ci skip] Add a note about CI_Form_validation::set_data()Andrey Andreev1-2/+6
2015-07-26Merge pull request #3999 from aneasystone/doc-proAndrey Andreev1-1/+5
[ci skip] Clarify word_wrap() text helper docs
2015-07-26fix word_wrap produce not clearaneasystone1-1/+5
Signed-off-by: aneasystone <aneasystone@gmail.com>
2015-07-25Merge pull request #3988 from kenjis/fix-views-errors-cliAndrey Andreev2-11/+11
[ci skip] Improve readability in CLI error templates
2015-07-25Fix alignmentkenjis2-6/+6
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2015-07-24[ci skip] Remove some whitespaceAndrey Andreev1-7/+7
2015-07-24Merge pull request #3993 from lonnieezell/f/dbnumrowsAndrey Andreev1-16/+13
[ci skip] Removing use of num_rows() in DB results docs