summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-10-14REALLY fixed merge problem.Kyle Farris1-43/+0
2011-10-14Fixed merge error.Kyle Farris1-1/+0
2011-10-14Merged with developmentKyle Farris376-28450/+24921
2011-10-14trying to resolve some merge issuesKyle Farris1-41/+41
2011-10-14Merge pull request #575 from ounziw/developEric Barnes1-1/+2
Line Break for L165
2011-10-14Line Break for L165 Fumito Mizuno1-1/+2
$mysql = '20061124092345'; $unix = mysql_to_unix($mysql);
2011-10-13Merge pull request #566 from appleboy/bugGreg Aker1-1/+1
Fix typo error #564
2011-10-13Update: fix typo error #564Bo-Yi Wu1-1/+1
2011-10-11Merge pull request #559 from timw4mail/developPhil Sturgeon1-7/+7
Fixed some formatting issues with the changelog.
2011-10-11Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren8-69/+69
2011-10-11removed 'index' listing from tutorial index tocDerek Jones1-1/+0
2011-10-10unhid general topics ToC for navigationDerek Jones1-1/+0
2011-10-10Merge branch 'feature/userguide-toc' into developDerek Jones7-67/+69
Conflicts: user_guide_src/source/_themes/eldocs/layout.html user_guide_src/source/general/index.rst user_guide_src/source/index.rst
2011-10-10Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren6-1/+612
2011-10-10incremental improvement to user guide ToCDerek Jones7-36/+71
2011-10-10Merge pull request #266 from joelcox/feature/tutorialEric Barnes6-1/+612
User guide tutorial
2011-10-10Fixed markup glitches from HTML to RST parser.Joël Cox7-99/+74
2011-10-10Fixed an extraneous new lineTimothy Warren1-2/+1
2011-10-10Fixed some formatting issues with the changelogTimothy Warren1-7/+8
2011-10-10Merge pull request #558 from timw4mail/developPhil Sturgeon5-6/+6
PHP5 Database constructors.
2011-10-10Converted database constructors to PHP5 typeTimothy Warren5-6/+6
2011-10-10Revert "Removed blue background from code examples to improve readability"Timothy Warren1-4/+0
This reverts commit 6f61fb2456efcb2a815f6f02f6b207f0303b24b7.
2011-10-09Initial conversion of the HTML to RST using pandoc.Joël Cox12-965/+636
2011-10-09Merged develop branch in tutorial.Joël Cox224-435/+24352
2011-10-09Moved tutorial to new user guide directory.Joël Cox162-27927/+0
2011-10-07Removed blue background from code examples to improve readabilityTimothy Warren1-0/+4
2011-10-07added last updated date to footerDerek Jones2-2/+2
2011-10-07Merge pull request #547 from purwandi/developDerek Jones6-48/+72
Fix some user guide style
2011-10-07Merge pull request #527 from timw4mail/developPhil Sturgeon1-10/+111
PDO Driver improvements.
2011-10-07if statment code style updateTimothy Warren1-6/+6
2011-10-07Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren25-391/+625
2011-10-07Added check for quote markTimothy Warren1-2/+5
2011-10-07Revert "Added check for quote mark"Timothy Warren1-5/+21
This reverts commit 0e762b32a003dd8a9b805fb95ee7aeb3616c41e3.
2011-10-07Revert "Changed all db constructors to newer syntax, made insert_id() ↵Timothy Warren5-6/+6
function more convenient for postgres on pdo driver" This reverts commit f7a8d86dbc6805a4e52964bbea76738df75b5f35.
2011-10-07Added check for quote markTimothy Warren1-21/+5
2011-10-07Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developpurwandi2-2/+3
2011-10-07Fix some user guide stylepurwandi6-48/+72
2011-10-07Merge pull request #546 from purwandi/developPhil Sturgeon3-25/+23
Fix CodeIgniter URLs, Controller and Views on User Guide
2011-10-07Merge pull request #545 from appleboy/configPhil Sturgeon2-2/+3
Fix #537 issue: replace new wav mimetype
2011-10-07Fix Views on User Guidepurwandi1-14/+14
2011-10-07Fix Controllers on User Guidepurwandi1-5/+4
2011-10-07Fix CodeIgniter URLs on User Guidepurwandi1-6/+5
2011-10-07Update: add changelogBo-Yi Wu1-0/+1
2011-10-07Fix #537 issue: replace new wav mimetypeBo-Yi Wu1-2/+2
2011-10-07Merge pull request #544 from purwandi/developGreg Aker1-28/+24
Fix Encryption Class User Guide
2011-10-07Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developpurwandi13-117/+446
2011-10-07Fix Encryption Class User Guidepurwandi1-28/+24
2011-10-07Merge branch 'user_guide' of https://github.com/jwensley2/CodeIgniter into ↵Greg Aker13-117/+446
jwensley2-user_guide Conflicts: user_guide_src/source/database/configuration.rst
2011-10-07Merge pull request #542 from purwandi/developGreg Aker1-50/+69
Fix Database Configuration on User Guider
2011-10-07cleaning up and formatting database pagesJoseph Wensley13-111/+412
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-03 01:31:03 +0100