From f4a4bd8fac188ebc9cda822ffc811c218fd92b45 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 20 Oct 2011 12:18:42 -0500 Subject: adding new license file (OSL 3.0) and updating readme to ReST 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 --- readme.rst | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 readme.rst (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst new file mode 100644 index 000000000..eff6b00b4 --- /dev/null +++ b/readme.rst @@ -0,0 +1,196 @@ +################### +What is CodeIgniter +################### + +CodeIgniter is an Application Development Framework - a toolkit - for people +who build web sites using PHP. Its goal is to enable you to develop projects +much faster than you could if you were writing code from scratch, by providing +a rich set of libraries for commonly needed tasks, as well as a simple +interface and logical structure to access these libraries. CodeIgniter lets +you creatively focus on your project by minimizing the amount of code needed +for a given task. + +******************* +Release Information +******************* + +This repo contains in development code for future releases. To download the +latest stable release please visit the `CodeIgniter Downloads +`_ page. + +************************** +Changelog and New Features +************************** + +You can find a list of all changes for each release in the `user +guide change log `_. + +******************* +Server Requirements +******************* + +- PHP version 5.1.6 or newer. + +************ +Installation +************ + +Please see the `installation section `_ +of the CodeIgniter User Guide. + +************ +Contributing +************ + +CodeIgniter is a community driven project and accepts contributions of code +and documentation from the community. These contributions are made in the form +of Issues or `Pull Requests `_ on +the `EllisLab CodeIgniter repository +`_ on GitHub. + +Issues are a quick way to point out a bug. If you find a bug or documentation +error in CodeIgniter then please check a few things first: + +- There is not already an open Issue +- The issue has already been fixed (check the develop branch, or look for + closed Issues) +- Is it something really obvious that you fix it yourself? + +Reporting issues is helpful but an even better approach is to send a Pull +Request, which is done by "Forking" the main repository and committing to your +own copy. This will require you to use the version control system called Git. + +********** +Guidelines +********** + +Before we look into how, here are the guidelines. If your Pull Requests fail +to pass these guidelines it will be declined and you will need to re-submit +when you’ve made the changes. This might sound a bit tough, but it is required +for us to maintain quality of the code-base. + +PHP Style +========= + +All code must meet the `Style Guide +`_, which is +essentially the `Allman indent style +`_, underscores and +readable operators. This makes certain that all code is the same format as the +existing code and means it will be as readable as possible. + +Documentation +============= + +If you change anything that requires a change to documentation then you will +need to add it. New classes, methods, parameters, changing default values, etc +are all things that will require a change to documentation. The change-log +must also be updated for every change. Also PHPDoc blocks must be maintained. + +Compatibility +============= + +CodeIgniter is compatible with PHP 5.1.6 so all code supplied must stick to +this requirement. If PHP 5.2 or 5.3 functions or features are used then there +must be a fallback for PHP 5.1.6. + +Branching +========= + +CodeIgniter uses the `Git-Flow +`_ branching model +which requires all pull requests to be sent to the "develop" branch. This is +where the next planned version will be developed. The "master" branch will +always contain the latest stable version and is kept clean so a "hotfix" (e.g: +an emergency security patch) can be applied to master to create a new version, +without worrying about other features holding it up. For this reason all +commits need to be made to "develop" and any sent to "master" will be closed +automatically. If you have multiple changes to submit, please place all +changes into their own branch on your fork. + +One thing at a time: A pull request should only contain one change. That does +not mean only one commit, but one change - however many commits it took. The +reason for this is that if you change X and Y but send a pull request for both +at the same time, we might really want X but disagree with Y, meaning we +cannot merge the request. Using the Git-Flow branching model you can create +new branches for both of these features and send two requests. + +************ +How-to Guide +************ + +There are two ways to make changes, the easy way and the hard way. Either way +you will need to `create a GitHub account `_. + +Easy way GitHub allows in-line editing of files for making simple typo changes +and quick-fixes. This is not the best way as you are unable to test the code +works. If you do this you could be introducing syntax errors, etc, but for a +Git-phobic user this is good for a quick-fix. + +Hard way The best way to contribute is to "clone" your fork of CodeIgniter to +your development area. That sounds like some jargon, but "forking" on GitHub +means "making a copy of that repo to your account" and "cloning" means +"copying that code to your environment so you can work on it". + +# Set up Git (Windows, Mac & Linux) +# Go to the CodeIgniter repo +# Fork it +# Clone your CodeIgniter repo: git@github.com:/CodeIgniter.git +# Checkout the "develop" branch At this point you are ready to start making + changes. +# Fix existing bugs on the Issue tracker after taking a look to see nobody + else is working on them. +# Commit the files +# Push your develop branch to your fork +# Send a pull request http://help.github.com/send-pull-requests/ + +The Reactor Engineers will now be alerted about the change and at least one of +the team will respond. If your change fails to meet the guidelines it will be +bounced, or feedback will be provided to help you improve it. + +Once the Reactor Engineer handling your pull request is happy with it they +will post it to the internal EllisLab discussion area to be double checked by +the other Engineers and EllisLab developers. If nobody has a problem with the +change then it will be merged into develop and will be part of the next +release. Keeping your fork up-to-date + +Unlike systems like Subversion, Git can have multiple remotes. A remote is the +name for a URL of a Git repository. By default your fork will have a remote +named "origin" which points to your fork, but you can add another remote named +"codeigniter" which points to git://github.com/EllisLab/CodeIgniter.git. This +is a read-only remote but you can pull from this develop branch to update your +own. + +If you are using command-line you can do the following: + +# git remote add codeigniter git://github.com/EllisLab/CodeIgniter.git +# git pull codeigniter develop +# git push origin develop + +Now your fork is up to date. This should be done regularly, or before you send +a pull request at least. + +******* +License +******* + +Please see the `license +agreement `_ + +********* +Resources +********* + +- `User Guide `_ +- `Community Forums `_ +- `User + Voice `_ +- `Community Wiki `_ +- `Community IRC `_ + +*************** +Acknowledgement +*************** + +The EllisLab team and The Reactor Engineers would like to thank all the +contributors to the CodeIgniter project and you, the CodeIgniter user. \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 3e6286c814ed740c7e38ab92a8b1046a363f8446 Mon Sep 17 00:00:00 2001 From: Ilias Van Peer Date: Mon, 14 Nov 2011 21:17:20 +0100 Subject: Use `#.` instead of simply `#` to activate github's auto-enumerator --- readme.rst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index eff6b00b4..26e04ceac 100644 --- a/readme.rst +++ b/readme.rst @@ -132,17 +132,17 @@ your development area. That sounds like some jargon, but "forking" on GitHub means "making a copy of that repo to your account" and "cloning" means "copying that code to your environment so you can work on it". -# Set up Git (Windows, Mac & Linux) -# Go to the CodeIgniter repo -# Fork it -# Clone your CodeIgniter repo: git@github.com:/CodeIgniter.git -# Checkout the "develop" branch At this point you are ready to start making - changes. -# Fix existing bugs on the Issue tracker after taking a look to see nobody - else is working on them. -# Commit the files -# Push your develop branch to your fork -# Send a pull request http://help.github.com/send-pull-requests/ +#. Set up Git (Windows, Mac & Linux) +#. Go to the CodeIgniter repo +#. Fork it +#. Clone your CodeIgniter repo: git@github.com:/CodeIgniter.git +#. Checkout the "develop" branch At this point you are ready to start making + changes. +#. Fix existing bugs on the Issue tracker after taking a look to see nobody + else is working on them. +#. Commit the files +#. Push your develop branch to your fork +#. Send a pull request http://help.github.com/send-pull-requests/ The Reactor Engineers will now be alerted about the change and at least one of the team will respond. If your change fails to meet the guidelines it will be @@ -163,9 +163,9 @@ own. If you are using command-line you can do the following: -# git remote add codeigniter git://github.com/EllisLab/CodeIgniter.git -# git pull codeigniter develop -# git push origin develop +#. git remote add codeigniter git://github.com/EllisLab/CodeIgniter.git +#. git pull codeigniter develop +#. git push origin develop Now your fork is up to date. This should be done regularly, or before you send a pull request at least. -- cgit v1.2.3-24-g4f1b From 1d477608fa700ec67c6553212b5de2447e4dd675 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 9 Feb 2012 23:17:26 +0200 Subject: Fix link to changelog --- readme.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 26e04ceac..2369a8ddb 100644 --- a/readme.rst +++ b/readme.rst @@ -23,7 +23,7 @@ Changelog and New Features ************************** You can find a list of all changes for each release in the `user -guide change log `_. +guide change log `_. ******************* Server Requirements @@ -193,4 +193,4 @@ Acknowledgement *************** The EllisLab team and The Reactor Engineers would like to thank all the -contributors to the CodeIgniter project and you, the CodeIgniter user. \ No newline at end of file +contributors to the CodeIgniter project and you, the CodeIgniter user. -- cgit v1.2.3-24-g4f1b From 07c1ac830b4e98aa40f48baef3dd05fb68c0a836 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 9 Mar 2012 17:03:37 +0000 Subject: Bumped CodeIgniter's PHP requirement to 5.2.4. 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... --- readme.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 2369a8ddb..4707847c7 100644 --- a/readme.rst +++ b/readme.rst @@ -29,7 +29,7 @@ guide change log Date: Thu, 7 Jun 2012 18:42:17 +0300 Subject: Removed UserVoice link --- readme.rst | 2 -- 1 file changed, 2 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 4707847c7..7b718febb 100644 --- a/readme.rst +++ b/readme.rst @@ -183,8 +183,6 @@ Resources - `User Guide `_ - `Community Forums `_ -- `User - Voice `_ - `Community Wiki `_ - `Community IRC `_ -- cgit v1.2.3-24-g4f1b From f3ab257d9f4efdb9658135fae89f3c3eec6b6a47 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 2 Jul 2012 11:12:44 -0700 Subject: Adding contribution guidelines to user guide, including new Developer's Certificate of Origin --- readme.rst | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 7b718febb..b211ad7cd 100644 --- a/readme.rst +++ b/readme.rst @@ -115,6 +115,34 @@ at the same time, we might really want X but disagree with Y, meaning we cannot merge the request. Using the Git-Flow branching model you can create new branches for both of these features and send two requests. +Signing +======= +You must sign your work, certifying that you either wrote the work or +otherwise have the right to pass it on to an open source project. git makes +this trivial as you merely have to use `--signoff` on your commits to your +CodeIgniter fork. + +:: + + git commit --signoff + +or simply:: + + git commit -s + +This will sign your commits with the information setup in your git config, e.g. + + Signed-off-by: John Q Public + +If you are using Tower there is a "Sign-Off" checkbox in the commit window. You +could even alias git commit to use the -s flag so you don’t have to think about +it. + +By signing your work in this manner, you certify to a "Developer's Certificate +or Origin". The current version of this certificate is in the `DCO.txt` file +in the root of this repository. + + ************ How-to Guide ************ -- cgit v1.2.3-24-g4f1b From 8d6e0c568657064a23a60d286124b81ff3e37dcc Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Wed, 19 Sep 2012 16:20:53 +0100 Subject: Added a contributing file to appear in pull requests and issues https://github.com/blog/1184-contributing-guidelines Signed-off-by: Alex Bilbie --- readme.rst | 160 ------------------------------------------------------------- 1 file changed, 160 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index b211ad7cd..8628645c6 100644 --- a/readme.rst +++ b/readme.rst @@ -38,166 +38,6 @@ Installation Please see the `installation section `_ of the CodeIgniter User Guide. -************ -Contributing -************ - -CodeIgniter is a community driven project and accepts contributions of code -and documentation from the community. These contributions are made in the form -of Issues or `Pull Requests `_ on -the `EllisLab CodeIgniter repository -`_ on GitHub. - -Issues are a quick way to point out a bug. If you find a bug or documentation -error in CodeIgniter then please check a few things first: - -- There is not already an open Issue -- The issue has already been fixed (check the develop branch, or look for - closed Issues) -- Is it something really obvious that you fix it yourself? - -Reporting issues is helpful but an even better approach is to send a Pull -Request, which is done by "Forking" the main repository and committing to your -own copy. This will require you to use the version control system called Git. - -********** -Guidelines -********** - -Before we look into how, here are the guidelines. If your Pull Requests fail -to pass these guidelines it will be declined and you will need to re-submit -when you’ve made the changes. This might sound a bit tough, but it is required -for us to maintain quality of the code-base. - -PHP Style -========= - -All code must meet the `Style Guide -`_, which is -essentially the `Allman indent style -`_, underscores and -readable operators. This makes certain that all code is the same format as the -existing code and means it will be as readable as possible. - -Documentation -============= - -If you change anything that requires a change to documentation then you will -need to add it. New classes, methods, parameters, changing default values, etc -are all things that will require a change to documentation. The change-log -must also be updated for every change. Also PHPDoc blocks must be maintained. - -Compatibility -============= - -CodeIgniter is compatible with PHP 5.2.4 so all code supplied must stick to -this requirement. If PHP 5.3 or 5.4 functions or features are used then there -must be a fallback for PHP 5.2.4. - -Branching -========= - -CodeIgniter uses the `Git-Flow -`_ branching model -which requires all pull requests to be sent to the "develop" branch. This is -where the next planned version will be developed. The "master" branch will -always contain the latest stable version and is kept clean so a "hotfix" (e.g: -an emergency security patch) can be applied to master to create a new version, -without worrying about other features holding it up. For this reason all -commits need to be made to "develop" and any sent to "master" will be closed -automatically. If you have multiple changes to submit, please place all -changes into their own branch on your fork. - -One thing at a time: A pull request should only contain one change. That does -not mean only one commit, but one change - however many commits it took. The -reason for this is that if you change X and Y but send a pull request for both -at the same time, we might really want X but disagree with Y, meaning we -cannot merge the request. Using the Git-Flow branching model you can create -new branches for both of these features and send two requests. - -Signing -======= -You must sign your work, certifying that you either wrote the work or -otherwise have the right to pass it on to an open source project. git makes -this trivial as you merely have to use `--signoff` on your commits to your -CodeIgniter fork. - -:: - - git commit --signoff - -or simply:: - - git commit -s - -This will sign your commits with the information setup in your git config, e.g. - - Signed-off-by: John Q Public - -If you are using Tower there is a "Sign-Off" checkbox in the commit window. You -could even alias git commit to use the -s flag so you don’t have to think about -it. - -By signing your work in this manner, you certify to a "Developer's Certificate -or Origin". The current version of this certificate is in the `DCO.txt` file -in the root of this repository. - - -************ -How-to Guide -************ - -There are two ways to make changes, the easy way and the hard way. Either way -you will need to `create a GitHub account `_. - -Easy way GitHub allows in-line editing of files for making simple typo changes -and quick-fixes. This is not the best way as you are unable to test the code -works. If you do this you could be introducing syntax errors, etc, but for a -Git-phobic user this is good for a quick-fix. - -Hard way The best way to contribute is to "clone" your fork of CodeIgniter to -your development area. That sounds like some jargon, but "forking" on GitHub -means "making a copy of that repo to your account" and "cloning" means -"copying that code to your environment so you can work on it". - -#. Set up Git (Windows, Mac & Linux) -#. Go to the CodeIgniter repo -#. Fork it -#. Clone your CodeIgniter repo: git@github.com:/CodeIgniter.git -#. Checkout the "develop" branch At this point you are ready to start making - changes. -#. Fix existing bugs on the Issue tracker after taking a look to see nobody - else is working on them. -#. Commit the files -#. Push your develop branch to your fork -#. Send a pull request http://help.github.com/send-pull-requests/ - -The Reactor Engineers will now be alerted about the change and at least one of -the team will respond. If your change fails to meet the guidelines it will be -bounced, or feedback will be provided to help you improve it. - -Once the Reactor Engineer handling your pull request is happy with it they -will post it to the internal EllisLab discussion area to be double checked by -the other Engineers and EllisLab developers. If nobody has a problem with the -change then it will be merged into develop and will be part of the next -release. Keeping your fork up-to-date - -Unlike systems like Subversion, Git can have multiple remotes. A remote is the -name for a URL of a Git repository. By default your fork will have a remote -named "origin" which points to your fork, but you can add another remote named -"codeigniter" which points to git://github.com/EllisLab/CodeIgniter.git. This -is a read-only remote but you can pull from this develop branch to update your -own. - -If you are using command-line you can do the following: - -#. git remote add codeigniter git://github.com/EllisLab/CodeIgniter.git -#. git pull codeigniter develop -#. git push origin develop - -Now your fork is up to date. This should be done regularly, or before you send -a pull request at least. - ******* License ******* -- cgit v1.2.3-24-g4f1b From a0d6f8176fc7b31f1e45923bc84a3750a7a18773 Mon Sep 17 00:00:00 2001 From: Cory Date: Fri, 4 Jan 2013 10:21:20 -0500 Subject: Update readme.rst The IRC link no longer works since the website has been updated. --- readme.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 8628645c6..d76816237 100644 --- a/readme.rst +++ b/readme.rst @@ -52,7 +52,7 @@ Resources - `User Guide `_ - `Community Forums `_ - `Community Wiki `_ -- `Community IRC `_ +- `Community IRC `_ *************** Acknowledgement -- cgit v1.2.3-24-g4f1b From 3b96a17ba85d34186dfc9aa32b761eb4be642d91 Mon Sep 17 00:00:00 2001 From: James Swift Date: Fri, 23 Aug 2013 23:13:07 +0100 Subject: Made "Release Information" more readable. The first time I read that paragraph it made no sense. The addition of a hyphen makes it easier to read at a glance. --- readme.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index d76816237..5857558c2 100644 --- a/readme.rst +++ b/readme.rst @@ -14,7 +14,7 @@ for a given task. Release Information ******************* -This repo contains in development code for future releases. To download the +This repo contains in-development code for future releases. To download the latest stable release please visit the `CodeIgniter Downloads `_ page. -- cgit v1.2.3-24-g4f1b From 0bdd21e68626925dadcfacf0204d5cf76d8a7c56 Mon Sep 17 00:00:00 2001 From: Man Math Date: Tue, 29 Oct 2013 14:01:14 +0700 Subject: Update readme.rst --- readme.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 5857558c2..619c7ae54 100644 --- a/readme.rst +++ b/readme.rst @@ -49,9 +49,9 @@ agreement `_ Resources ********* -- `User Guide `_ -- `Community Forums `_ -- `Community Wiki `_ +- `User Guide `_ +- `Community Forums `_ +- `Community Wiki `_ - `Community IRC `_ *************** -- cgit v1.2.3-24-g4f1b From 1d107b8d131d7b065ae388a74136177f15b4c90b Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Tue, 24 Dec 2013 11:12:50 -0800 Subject: Update Forum and Wiki links in Readme Old links were 404ing --- readme.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 619c7ae54..b4984eaff 100644 --- a/readme.rst +++ b/readme.rst @@ -50,8 +50,8 @@ Resources ********* - `User Guide `_ -- `Community Forums `_ -- `Community Wiki `_ +- `Community Forums `_ +- `Community Wiki `_ - `Community IRC `_ *************** -- cgit v1.2.3-24-g4f1b From de6a63bd4bd5dcb52ed05224b5ad65800b3812da Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 29 Jan 2014 13:44:56 +0200 Subject: [ci skip] Fix /readme.rst links --- readme.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index b4984eaff..aa07d6e12 100644 --- a/readme.rst +++ b/readme.rst @@ -35,7 +35,7 @@ Server Requirements Installation ************ -Please see the `installation section `_ +Please see the `installation section `_ of the CodeIgniter User Guide. ******* @@ -43,7 +43,7 @@ License ******* Please see the `license -agreement `_ +agreement `_ ********* Resources -- cgit v1.2.3-24-g4f1b From 9f8a5f0708147d0e61e09415071be50cbc25169b Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 25 Oct 2014 13:34:10 +0800 Subject: update some link. New version of CodeIgniter website http://www.codeigniter.com/ --- readme.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index aa07d6e12..114320d63 100644 --- a/readme.rst +++ b/readme.rst @@ -16,14 +16,14 @@ Release Information This repo contains in-development code for future releases. To download the latest stable release please visit the `CodeIgniter Downloads -`_ page. +`_ page. ************************** Changelog and New Features ************************** You can find a list of all changes for each release in the `user -guide change log `_. +guide change log `_. ******************* Server Requirements @@ -35,7 +35,7 @@ Server Requirements Installation ************ -Please see the `installation section `_ +Please see the `installation section `_ of the CodeIgniter User Guide. ******* @@ -43,16 +43,16 @@ License ******* Please see the `license -agreement `_ +agreement `_ ********* Resources ********* -- `User Guide `_ -- `Community Forums `_ -- `Community Wiki `_ -- `Community IRC `_ +- `User Guide `_ +- `Community Forums `_ +- `Community Wiki `_ +- `Community IRC `_ *************** Acknowledgement -- cgit v1.2.3-24-g4f1b From dc63a029180d552a57493496456aa24db163cf9f Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 28 Oct 2014 00:27:40 +0200 Subject: [ci skip] Update link to the license in readme.rst --- readme.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 114320d63..c32961448 100644 --- a/readme.rst +++ b/readme.rst @@ -43,7 +43,7 @@ License ******* Please see the `license -agreement `_ +agreement `_. ********* Resources @@ -59,4 +59,4 @@ Acknowledgement *************** The EllisLab team and The Reactor Engineers would like to thank all the -contributors to the CodeIgniter project and you, the CodeIgniter user. +contributors to the CodeIgniter project and you, the CodeIgniter user. \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 934d6d9797f4dadd4e4d05b12bc4d7309fedb6c3 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 12 Jan 2015 15:03:10 +0200 Subject: [ci skip] Make it clear that PHP <5.4 usage is discouraged Related: #3450 --- readme.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index c32961448..dd59fd8c1 100644 --- a/readme.rst +++ b/readme.rst @@ -29,7 +29,11 @@ guide change log Date: Fri, 6 Mar 2015 16:08:59 -0800 Subject: Housekeeping. Corrected typo in user guide for sessions, corrected misepelled key in calendar language file, added two links & updated wording on the repo readme. Signed-off-by:Master Yoda --- readme.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index dd59fd8c1..640dd241b 100644 --- a/readme.rst +++ b/readme.rst @@ -54,13 +54,16 @@ Resources ********* - `User Guide `_ +- `Language File Translations `_ - `Community Forums `_ - `Community Wiki `_ - `Community IRC `_ +Report security issues to our `Security Panel `_, thank you. + *************** Acknowledgement *************** -The EllisLab team and The Reactor Engineers would like to thank all the +The CodeIgniter team would like to thank EllisLab, all the contributors to the CodeIgniter project and you, the CodeIgniter user. \ No newline at end of file -- cgit v1.2.3-24-g4f1b From b2d2535cc0326acea4722f7be9819cf58fd155da Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 23 Oct 2015 14:11:47 +0300 Subject: [ci skip] Link HackerOne page in the readme --- readme.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 640dd241b..2e35d7223 100644 --- a/readme.rst +++ b/readme.rst @@ -59,7 +59,8 @@ Resources - `Community Wiki `_ - `Community IRC `_ -Report security issues to our `Security Panel `_, thank you. +Report security issues to our `Security Panel `_ +or via our `page on HackerOne `_, thank you. *************** Acknowledgement -- cgit v1.2.3-24-g4f1b From 09124f5961c7a6c9a54b5e87ff59e8e9315471b9 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 11 Jan 2016 12:40:05 +0200 Subject: [ci skip] Update webchat link in readme --- readme.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 2e35d7223..6ddee9410 100644 --- a/readme.rst +++ b/readme.rst @@ -57,7 +57,7 @@ Resources - `Language File Translations `_ - `Community Forums `_ - `Community Wiki `_ -- `Community IRC `_ +- `Community IRC `_ Report security issues to our `Security Panel `_ or via our `page on HackerOne `_, thank you. -- cgit v1.2.3-24-g4f1b From bd202c91b0e9cf0a8c93bcaa71df9574f5909346 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 11 Jan 2016 12:50:18 +0200 Subject: [ci skip] Update codeigniter.com links to https --- readme.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 6ddee9410..526950e67 100644 --- a/readme.rst +++ b/readme.rst @@ -16,7 +16,7 @@ Release Information This repo contains in-development code for future releases. To download the latest stable release please visit the `CodeIgniter Downloads -`_ page. +`_ page. ************************** Changelog and New Features @@ -39,7 +39,7 @@ issues, as well as missing features. Installation ************ -Please see the `installation section `_ +Please see the `installation section `_ of the CodeIgniter User Guide. ******* @@ -53,7 +53,7 @@ agreement `_ +- `User Guide `_ - `Language File Translations `_ - `Community Forums `_ - `Community Wiki `_ -- cgit v1.2.3-24-g4f1b From 606ad654dcbc9f0fc30f00ce6574918790ee0d1e Mon Sep 17 00:00:00 2001 From: Claudio Galdiolo Date: Thu, 7 Jul 2016 15:32:12 -0400 Subject: Prepare for 3.1.0 release --- readme.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 526950e67..7a376322d 100644 --- a/readme.rst +++ b/readme.rst @@ -29,7 +29,7 @@ guide change log Date: Tue, 26 Jul 2016 20:21:39 +0300 Subject: [ci skip] Officially drop PHP 5.2.x --- readme.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'readme.rst') diff --git a/readme.rst b/readme.rst index 7a376322d..f5d737028 100644 --- a/readme.rst +++ b/readme.rst @@ -31,7 +31,7 @@ Server Requirements PHP version 5.6 or newer is recommended. -It should work on 5.2.4 as well, but we strongly advise you NOT to run +It should work on 5.3.7 as well, but we strongly advise you NOT to run such old versions of PHP, because of potential security and performance issues, as well as missing features. -- cgit v1.2.3-24-g4f1b