Skip to content

Commit

Permalink
Merge branch '1.8/develop' into upstream-1.8-merge
Browse files Browse the repository at this point in the history 
 Conflicts:
	assets/js/combined.js
	classes/autoloader.html
	classes/session/usage.html
	classes/view.html
	contribute.html
	general/configuration.html
	general/tasks.html
	installation/tutorials.html
	installation/upgrade.html
	packages/orm/crud.html
	packages/orm/intro.html
	packages/orm/relations/intro.html
	packages/parser/intro.html
	toc.html
  • Loading branch information
@kenjis
kenjis committed Apr 5, 2016
2 parents 96ba9ca + 69311cd commit 99b1c7e
Show file tree
Hide file tree
Showing 167 changed files with 541 additions and 472 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ nbproject

#intellij
.idea

/change.php
17 changes: 7 additions & 10 deletions assets/css/combined.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,26 +505,23 @@ html{
font-weight: normal;
line-height: 66px;
font-size: 25px;
display: block;
height: 60px;
padding: 2px 0px 14px 0px;
color: #e3e3e3;
}

#header h1 img{
margin: 13px 10px 0px 0px;
vertical-align: top;
}

#header h1 strong{
display: inline-block;
height: 37px;
width: 147px;
background: url(../img/fuel.png) no-repeat;
text-indent: -7000px;
overflow: hidden;
position: relative;
top: 5px;
margin-right: 10px;
font-weight: normal;
}

#header h1 span{
font-size: 34px;
margin-right: 10px;
}

#header nav{
Expand Down
17 changes: 9 additions & 8 deletions assets/js/combined.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions classes/agent/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/agent/usage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/arr.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/asset/advanced.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/asset/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/asset/usage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
6 changes: 3 additions & 3 deletions classes/autoloader.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down Expand Up @@ -129,7 +129,7 @@ <h4 class="method" id="method_add_namespaces">add_namespaces($namespace, $prepen
<tr>
<th><kbd>$prepend</kbd></th>
<td><em>false</em></td>
<td class="description">配列冒頭に加えたいなら <em>true</em> にします。</td>
<td class="description">配列の先頭に加えたいなら <em>true</em> にします。</td>
</tr>
</table>
</td>
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/advanced.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/usage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/cli.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/cookie.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/crypt/advanced.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/crypt/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/crypt/usage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/db.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/dbutil.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/introduction.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/qb.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/qb_builder.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/qb_delete.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/qb_insert.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/qb_select.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/qb_update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/qb_where.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/database/usage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/date.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
4 changes: 2 additions & 2 deletions classes/debug.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<header id="header">
<div class="table">
<h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../assets/img/fuel.png" /></a>
<strong>Documentation</strong>
</h1>

<form id="google_search">
Expand Down
Loading

0 comments on commit 99b1c7e

Please sign in to comment.