summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-15Merge pull request #1 from nopesled/nopesled-patch-1nopesled1-1/+1
Update path_helper.php
2016-07-07Update path_helper.phpnopesled1-1/+1
2016-07-07Update path_helper.phpnopesled1-1/+1
Protect against RFI via php:// wrapper
2016-07-06Merge pull request #4691 from chestnutprog/developAndrey Andreev1-1/+1
[ci skip] Fix a bug in CI_Upload::data()
2016-07-06Update Upload.phpchestnutprog1-1/+1
特殊文件名可能会引起bug
2016-06-28Merge pull request #4678 from kenjis/fix-oci8_forgeAndrey Andreev2-4/+69
DBForge adjustments for Oracle
2016-06-28Remove duplicated $_create_table_ifkenjis1-7/+0
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2016-06-27Fix oci8_forgekenjis2-0/+72
* Oracle does not have `create table if exists` * Oracle has only NUMBER for integer Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2016-06-06Merge branch 'feature/email-attachments' into developAndrey Andreev1-77/+117
2016-06-06Merge pull request #4660 from r4ngy4l/patch-1Andrey Andreev1-6/+6
[ci skip] Fix issues in feaure/email-attachmens
2016-06-04Update Email.phpRobert Angyal1-6/+6
2016-05-26Merge pull request #4648 from el-ma/developAndrey Andreev1-1/+3
[ci skip] Add two more robots to config/user_agents.php
2016-05-26Update robots in config/user_agents.phpel-ma1-1/+3
Added Majestic-12 and Uptimebot
2016-05-25Merge pull request #4646 from el-ma/developAndrey Andreev1-1/+2
[ci skip] Add "Alexa Crawler" to robots
2016-05-25added "Alexa Crawler"el-ma1-1/+2
2016-05-25[ci skip] Refactor changes from PR #4585Andrey Andreev1-95/+70
Related: #4583
2016-05-20Merge pull request #4638 from kasimtan/phpdoc_fixesAndrey Andreev13-13/+8
[ci skip] Fixed PHPDoc parameter name and type discrepancies
2016-05-20Removed an extra space charKasim Tan1-1/+1
2016-05-19Fixed PHPDoc parameter name and type discrepanciesKasim Tan13-13/+8
2016-05-19Merge pull request #4635 from jim-parry/fix-userguideAndrey Andreev1-1/+1
[ci skip] Fix a typo in inflector helper docs
2016-05-19Fix typo in inflector helper writeup.Master Yoda1-1/+1
Reported by email from Jessie Rubi Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2016-05-11Merge pull request #4625 from rochefort/missing_parenthesisAndrey Andreev2-5/+5
[ci skip] Minor documentation fixes
2016-05-10Fix docs [ci skip]rochefort2-5/+5
- Fix missing parenthesis of function - Fix incorrect place of a sentence - Fix a missing doc link
2016-05-10Merge pull request #4620 from jim-parry/faviconAndrey Andreev1-0/+0
[ci skip] Add missing favicon to user guide source
2016-05-09Add favicon to user guide source (it was missing).Master Yoda1-0/+0
This was mentioned in a tweet. The user guide currently has a configuraiton setting with a favicon link, but it referenced a non-existant file. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2016-05-09Stop testing 3.1.0-dev on PHP 5.2, 5.3Andrey Andreev1-8/+1
2016-05-09[ci skip] Remove unnecessary backslash from user guideAndrey Andreev1-1/+1
[ci skip] Remove unnecessary backslash from user guide
2016-05-06Remove unnecessary backslash from user guide.kadoppe1-1/+1
Signed-off-by: kadoppe <kadoppe@me.com>
2016-05-04#4583 Refactor according to the suggestions commented on Pull RequestRobert Angyal1-9/+7
Signed-off-by: Robert Angyal <robertonline.81@gmail.com>
2016-04-28#4583 Refactor according to the suggestions commented on Pull RequestRobert Angyal1-38/+30
Signed-off-by: Robert Angyal <robertonline.81@gmail.com>
2016-04-28Merge pull request #4603 from rochefort/fix-typeAndrey Andreev1-2/+2
[ci skip] Fix a parameter type in url_title() docs
2016-04-27Fix a type of parameter in url_title [ci skip]rochefort1-2/+2
2016-04-20#4583 Fix code style issuesRobert Angyal1-8/+16
Signed-off-by: Robert Angyal <robertonline.81@gmail.com>
2016-04-17Fixes #4583 by separating attachments to related and mixed multipartsRobert Angyal1-34/+101
Signed-off-by: Robert Angyal <robertonline.81@gmail.com>
2016-04-12Merge pull request #4579 from mokalovesoulmate/developAndrey Andreev1-1/+1
[ci skip] Fix a CI_Email documentation example
2016-04-12Removed double quotes on $cid because if we using quotes, the embedded image ↵Moses Kurniawan1-1/+1
will not appear.
2016-03-21Merge branch '3.0-stable' into developAndrey Andreev10-110/+231
Resolved conflicts: user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst
2016-03-21[ci skip] Mark the start of 3.0.7 developmentAndrey Andreev6-4/+26
2016-03-21[ci skip] Prepare for 3.0.6 releaseAndrey Andreev4-5/+5
2016-03-17Merge pull request #4544 from fulopm/developAndrey Andreev1-1/+1
[ci skip] Fix codeblock formatting in Zip library docs
2016-03-17Merge pull request #4544 from fulopm/developAndrey Andreev1-1/+1
[ci skip] Fix codeblock formatting in Zip library docs
2016-03-17adding code format on line 29Fülöp Márk1-1/+1
2016-03-16A small Migrations tweakAndrey Andreev1-1/+6
2016-03-16Fix #4539Andrey Andreev2-34/+65
2016-03-16[ci skip] Add upgrade instructions for CI_Cache changesAndrey Andreev1-2/+29
2016-03-16[ci skip] Add changelog entries for recent CI_Cache changes to redis, memcachedAndrey Andreev1-1/+7
2016-03-16[ci skip] Add (detection-based) UNIX sockets support to Cache_memcachedAndrey Andreev1-3/+15
2016-03-16Fix a Form_validation bug that unnecessarily modifes $_POSTAndrey Andreev2-1/+2
2016-03-16Simplify a bit of internal code in CI_Form_validationAndrey Andreev1-18/+2
2016-03-15Add __isset() to CI_SessionAndrey Andreev2-0/+19