Skip to content

Commit

Permalink
Merge pull request #1248 from jim-parry/release/prep
Browse files Browse the repository at this point in the history
Release prep part 1
  • Loading branch information
jim-parry authored Sep 27, 2018
2 parents f562cdd + cddddd9 commit cfaaef8
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 455 deletions.
1 change: 1 addition & 0 deletions admin/release
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ echo -e "${BOLD}Creating $which $branch to $action ${NORMAL}"
git checkout develop
git branch -d $branch # remove the branch if there
git checkout -b $branch
composer update

#---------------------------------------------------
# Update version dependencies
Expand Down
5 changes: 0 additions & 5 deletions system/View/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
*
* ClassFormerlyKnownAsTemplateParser
*
* @todo Views\Parser_Test
* @tofo Common::parse
* @todo user guide
* @todo options -> delimiters
*
* @package CodeIgniter\View
*/
class Parser extends View
Expand Down
2 changes: 1 addition & 1 deletion tests/_support/HTTP/MockResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function setCookie(
$_COOKIE[$prefix . $name] = $value;

/*
TODO: Find a way to use setcookie()
@todo: Find a way to use setcookie()
without it throwing header issues.
setcookie
(
Expand Down
333 changes: 0 additions & 333 deletions user_guide_src/autodoc.php

This file was deleted.

7 changes: 5 additions & 2 deletions user_guide_src/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ Release Date: Not Released

**Rewrite of the CodeIgniter framework**

Non-code changes:
- User Guide adapted or rewritten
- [System message translations repository](https://github.com/bcit-ci/CodeIgniter4-translations)
- [Roadmap subforum](https://forum.codeigniter.com/forum-33.html) for more transparent planning

New core classes:
- CodeIgniter (bootstrap)
- Common (shared functions)
Expand Down Expand Up @@ -101,5 +106,3 @@ New packages:
- \\ CreditCardRules, FileRules, FormatRules, Rules, Validation, ValidationInterface
- View
- \\ Cell, Filters, Parser, Plugins, RendererInterface, View

User Guide adapted or rewritten.
2 changes: 1 addition & 1 deletion user_guide_src/source/general/helpers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ URI to the controller/method you wish to link to.
"Extending" Helpers
===================

TODO: Determine how these can be extended... namespaces, etc?
@todo: Determine how these can be extended... namespaces, etc?

To "extend" Helpers, create a file in your **application/helpers/** folder
with an identical name to the existing Helper, but prefixed with **MY\_**
Expand Down
1 change: 0 additions & 1 deletion user_guide_src/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Getting Started
***************

.. toctree::
:includehidden:
:maxdepth: 2
:titlesonly:

Expand Down
Loading

0 comments on commit cfaaef8

Please sign in to comment.