summaryrefslogtreecommitdiffstats
path: root/user_guide_src
AgeCommit message (Collapse)AuthorFilesLines
2011-11-29changed much to many in the documentationFelix Balfoort1-1/+1
2011-11-29Updated change log and and database configuration to include failoverFelix Balfoort2-0/+23
2011-11-27Merge pull request #690 from Repox/developPhil Sturgeon1-4/+5
Proposal for an updated mod_rewrite suggestion. The existing mod_rewrite example in the documentation led to confusion with new users about how to include CSS, JS and image files.
2011-11-27Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into ↵Eric Barnes1-4/+4
has2k1-patch-1 Conflicts: user_guide_src/source/changelog.rst
2011-11-27Updated docs for increment_string example.Eric Barnes1-1/+1
2011-11-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developRepox1-0/+1
2011-11-23Reworded new attach() section in email user guidetrit1-1/+1
2011-11-23Added an entry for the new Email::attach parameterstrit1-1/+5
2011-11-23Added a couple of style tweaks and a note about function change in changelogtrit1-1/+2
2011-11-22Updated changelog with _trans_depth fix.Jacob Terry1-0/+1
2011-11-22Altered the explenation of the rewrite rules to better fit the actual result.Repox1-1/+1
2011-11-22Altered the suggested mod_rewrite rules for removing index.php from URL to ↵Repox1-4/+5
better fit the needs between CI routing and asset files. This suggestion addresses issue #684
2011-11-21Typo in "Watermarking Preferences". Configuration parameter is "wm_padding", ↵David Dotson1-1/+1
but it is listed as "padding".
2011-11-21Updated syntax in changewlog.Phil Sturgeon1-1/+1
2011-11-20Update user_guide_src/source/changelog.rsthas2k11-0/+1
2011-11-13Fixed conflicts.Phil Sturgeon1-4/+19
2011-11-13Changelog tweaking the Sphinx docs to match old HTML docs for 2.1 and ↵Phil Sturgeon1-22/+52
accurately describe what 3.0 has added so far.
2011-11-12Merge pull request #639 from timw4mail/patch-3Eric Barnes1-4/+19
Fixed one-liner code on Database Connection page of userguide
2011-11-11Merge pull request #653 from mpmont/developGreg Aker1-0/+1
Added the mime type for pptx.
2011-11-08Changelog update.mpmont1-0/+1
2011-11-08Update user_guide_src/source/tutorial/static_pages.rstAleksandras Ragovskis1-1/+1
2011-11-07Adding auto-detection of best redirect method in url_helper.Brandon Jones1-10/+11
2011-11-07Syntax errorpolyetilen1-1/+1
2011-10-31Fixed one-liner code on Database Connection page of userguideTimothy Warren1-4/+19
2011-10-26fix user guide active_record.rst formatting, remove old PHP 5 note, now only ↵kenjis1-6/+4
PHP 5 is supported.
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones6-66/+303
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-10-20fix RST format and typokenjis2-15/+15
2011-10-18Merge pull request #592 from kenjis/fix_changelogDerek Jones1-8/+2
fix changelog difference between HTML and RST
2011-10-18fix changelog difference between HTML and RSTkenjis1-8/+2
2011-10-18Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch-2Timothy Warren4-14/+179
2011-10-18updated Directory helper docs to use proper PHP method Sphinx rolesDerek Jones1-14/+13
2011-10-18fixed typo in AR docs. NOTE: Sphinx gives a ReST error for unknown title ↵Derek Jones1-1/+2
targets, but they do exist, and links are built properly
2011-10-18added some additional notes to the 2.0.0 update notes to highlight some of ↵Derek Jones2-0/+54
the potential gotchas, fixes #588
2011-10-18Merge pull request #307 from kylefarris/isue-276Derek Jones2-0/+111
Fix for Issue #276 - Thanks Kyle!
2011-10-17Added changelog itemTimothy Warren1-1/+1
2011-10-17Added changelog itemTimothy Warren1-1/+2
2011-10-17Added changelog itemTimothy Warren1-1/+1
2011-10-15Merge pull request #579 from appleboy/bug/cacheGreg Aker1-0/+1
Fix #576: using ini_get() to detect if apc is enabled or not
2011-10-15Fix #576: using ini_get() to detect if apc is enabled or notBo-Yi Wu1-0/+1
2011-10-14Updated changelog to new changelog format.Kyle Farris1-0/+3
2011-10-14Updated to new documentation for new active record methods.Kyle Farris1-0/+108
2011-10-14Line Break for L165 Fumito Mizuno1-1/+2
$mysql = '20061124092345'; $unix = mysql_to_unix($mysql);
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-10Fixed markup glitches from HTML to RST parser.Joël Cox7-99/+74
2011-10-10Fixed an extraneous new lineTimothy Warren1-2/+1