Skip to content

Commit d00f337

Browse files
authored
Merge pull request #1774 from jim-parry/beta1/cleanup
Housekeeping for beta.1
2 parents 1da8157 + 88bb908 commit d00f337

6 files changed

Lines changed: 190 additions & 31 deletions

File tree

app/Views/welcome_message.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
height: 200px;
1313
width: 155px;
1414
display: inline-block;
15-
opacity: 0.08;
15+
opacity: 0.12;
1616
position: absolute;
17+
z-index: 0;
1718
top: 2rem;
1819
left: 50%;
1920
margin-left: -73px;
@@ -32,6 +33,8 @@
3233
margin-top: 145px;
3334
margin-bottom: 0;
3435
color: #222;
36+
position: relative;
37+
z-index: 1;
3538
}
3639
.wrap {
3740
max-width: 1024px;
@@ -81,15 +84,11 @@
8184

8285
<div class="wrap">
8386

84-
<h1>Welcome to CodeIgniter</h1>
85-
86-
<p class="version">version <?= CodeIgniter\CodeIgniter::CI_VERSION ?></p>
87-
8887
<div class="logo">
8988
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
9089
width="155.000000px" height="200.000000px" viewBox="0 0 155.000000 200.000000"
9190
preserveAspectRatio="xMidYMid meet">
92-
<g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)" fill="#000000" stroke="none">
91+
<g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)" fill="#ee2600" stroke="none">
9392
<path d="M737 1963 c22 -79 -7 -185 -78 -290 -18 -26 -107 -122 -197 -213
9493
-239 -240 -336 -371 -403 -544 -79 -206 -78 -408 5 -582 64 -134 212 -264 361
9594
-314 l60 -20 -30 22 c-210 152 -229 387 -48 588 25 27 48 50 51 50 4 0 7 -27
@@ -104,6 +103,10 @@
104103
</svg>
105104
</div>
106105

106+
<h1>Welcome to CodeIgniter</h1>
107+
108+
<p class="version">version <?= CodeIgniter\CodeIgniter::CI_VERSION ?></p>
109+
107110
<div class="guide">
108111
<p>The page you are looking at is being generated dynamically by CodeIgniter.</p>
109112

user_guide_src/source/changelogs/index.rst

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,23 @@ Release Date: Unreleased
99

1010
Highlights:
1111

12-
:doc:`See all the changes. </changelogs/next>`
12+
- New View Layouts provide simple way to create site site view templates.
13+
- Fixed user guide CSS for proper wide table display
14+
- Converted UploadedFile to use system messages
15+
- Numerous database, migration & model bugs fixed
16+
- Refactored unit testing for appstarter & framework distributions
1317

14-
Version 4.0.0-alpha.5
15-
====================================================
18+
New messages:
1619

17-
Release Date: Jan 30, 2019
20+
- Database.tableNotFound
21+
- HTTP.uploadErr...
1822

19-
**Next release of CodeIgniter4**
23+
App changes:
2024

25+
- app/Config/Cache has new setting: database
26+
- app/Views/welcome_message has logo tinted
27+
- composer.json has a case correction
28+
- env adds CI_ENVIRONMENT suggestion
2129

2230
:doc:`See all the changes. </changelogs/next>`
2331

user_guide_src/source/changelogs/next.rst

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,176 @@ Version |version|
44
Release Date: Not released
55

66
Highlights:
7+
78
- New View Layouts provide simple way to create site site view templates.
9+
- Fixed user guide CSS for proper wide table display
10+
- Converted UploadedFile to use system messages
11+
- Numerous database, migration & model bugs fixed
12+
- Refactored unit testing for appstarter & framework distributions
13+
14+
New messages:
15+
16+
- Database.tableNotFound
17+
- HTTP.uploadErr...
18+
19+
App changes:
820

21+
- app/Config/Cache has new setting: database
22+
- app/Views/welcome_message has logo tinted
23+
- composer.json has a case correction
24+
- env adds CI_ENVIRONMENT suggestion
925

1026
The list of changed files follows, with PR numbers shown.
1127

28+
- app/
29+
- Config/
30+
- Cache #1719
31+
- Views/
32+
- welome_message #1774
33+
34+
- system/
35+
- Cache/Handlers/
36+
- RedisHandler #1719, #1723
37+
- Config/
38+
- Config #37dbc1
39+
- Services #1704, #37dbc1
40+
- Database/
41+
- Exceptions/DatabaseException #1739
42+
- Postgre/
43+
- Builder #1733
44+
- SQLite3/
45+
- Connection #1739
46+
- Forge #1739
47+
- Table #1739
48+
- BaseBuilder #36fbb8, #549d7d
49+
- BaseConnection #549d7d, #1739
50+
- Forge #1739
51+
- MigrationRunner #1743
52+
- Query #36fbb8
53+
- Seeder #1722
54+
- Debug/
55+
- Exceptions #1704
56+
- Files/
57+
- UploadedFile #1708
58+
- Helpers/
59+
- date_helper #1768
60+
- number_helper #1768
61+
- security_helper #1768
62+
- text_helper #1768
63+
- url_helper #1768
64+
- HTTP/
65+
- Request #1725
66+
- Language/en/
67+
- Database #1739
68+
- HTTP #1708
69+
- View #1757
70+
- Router/
71+
- RouteCollection #1709, #1732
72+
- Router #1764
73+
- Test/
74+
- ControllerResponse #1740
75+
- ControllerTester #1740
76+
- DOMParser #1740
77+
- FeatureResponse #1740
78+
- Validation/
79+
- Rules #1738, #1743
80+
- Validation #37dbc1, #1763
81+
- View/
82+
- View #1729
83+
- Common #1741
84+
- Entity #6e549a, #1739
85+
- Model #4f4a37, #6e549a, #37dbc1, #1712, #1763
86+
87+
- tests/system/
88+
- Database/
89+
- BaseQueryTest #36fbb8
90+
- Live/
91+
- SQLite3/AlterTableTest #1739, #1740
92+
- ForgeTest #1739, #1745
93+
- ModelTest #37dbc1, #4ff1f5, #1763
94+
- Migrations/MigrationRunnerTest #1743
95+
- Helpers/
96+
- FilesystemHelperTest #1740
97+
- I18n/
98+
- TimeTest # 1736
99+
- Test/
100+
- DOMParserTest #1740
101+
- Validation/
102+
- ValidationTest #1763
103+
- View/
104+
- ViewTest #1729
105+
- EntityTest #6e549a, #1736
106+
107+
- user_guide_src/
108+
- _themes/.../
109+
- citheme.css #1696
110+
- changelogs/
111+
- v4.0.0-alpha.5 #1699
112+
- database/
113+
- migrate #1696
114+
- dbmgmt/
115+
- forge #1751
116+
- installation/
117+
- install_manual #1699
118+
- running #1750
119+
- intro/
120+
- psr #1752
121+
- libraries/
122+
- caching #1719
123+
- validation #1742
124+
- models/
125+
- entities #1744
126+
- outgoing/
127+
- index #1729
128+
- view_layouts #1729
129+
- testing/
130+
- controllers #1740
131+
- tutorial/
132+
- static_pages #1763
133+
134+
- composer.json #1755
135+
- .env #1749
12136

13137
PRs merged:
14138
-----------
15139

140+
- #1774 Housekeeping for beta.1
141+
- #1768 Helper changes - signatures & typos
142+
- #1764 Fix routing when no default route has been specified. Fixes #1758
143+
- #1763 Ensure validation works in Model with errors as part of rules. Fixes #1574
144+
- #1757 Correct the unneeded double-quote (typo)
145+
- #1755 lowercase 'vfsStream' in composer files
146+
- #1752 Fixed typo preventing link format
147+
- #1751 Guide: Moving misplaced text under correct heading
148+
- #1750 Remove reference to Encryption Key in User Guide
149+
- #1749 Adding environment to .env
150+
- #1745 Updated composite key tests for SQLite3 support. Fixes #1478
151+
- #1744 Update entity docs for current framework state. Fixes #1727
152+
- #1743 Manually sort migrations found instead of relying on the OS. Fixes #1666
153+
- #1742 Fix required_without rule bug.
154+
- #1741 Helpers with a specific namespace can be loaded now. Fixes #1726
155+
- #1740 Refactor test support for app starter
156+
- #1739 Fix typo
157+
- #1738 Fix required_with rule bug. Fixes #1728
158+
- #1737 Added support for dropTable and modifyTable with SQLite driver
159+
- #1736 Accommodate long travis execution times
160+
- #1733 Fix increment and decrement errors with Postgres
161+
- #1732 Don't check from CLI in Routes. Fixes #1724
162+
- #1729 New View Layout functionality for simple template
163+
- #1725 Update Request.php
164+
- #1723 Log an error if redis authentication is failed
165+
- #1722 Seeder adds default namespace to seeds
166+
- #1719 Update Cache RedisHandler to support select database
167+
- #4ff1f5 Additional tests for inserts and required validation failing (#1717)
168+
- #549d7d Another try at getting escaping working correctly both when in and out of models
169+
- #1712 Minor readability changes
170+
- #37dbc1 Ensure Model validation rules can be a group name
171+
- #1709 Fix resource routing websafe method order checking
172+
- #1708 Language for UploadedFile
173+
- #36fbb8 BaseBuilder should only turn off Connection's setEscapeFlags when running a query...
174+
- #6e549a Provide default baseURL that works with the development server for easier first time setup (Fixes #1646)
175+
- #1704 Fix viewsDirectory bug (#1701)
176+
- #4f4a37 remove debugging from Model.
177+
- #1699 Fix install link in user guide
178+
- #1696 Fix page structure etc
179+
- #1695 Tidy up code blocks in the user guide

user_guide_src/source/installation/installing_composer.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Installation
3232

3333
In the folder above your project root::
3434

35-
composer create-project codeigniter4/appstarter -s alpha
35+
composer create-project codeigniter4/appstarter -s beta
3636

3737
Setup
3838
-------------------------------------------------------
@@ -139,7 +139,7 @@ will be your document root.
139139

140140
In your project root::
141141

142-
composer require codeigniter4/framework @alpha
142+
composer require codeigniter4/framework @beta
143143

144144
Setup
145145
-------------------------------------------------------
@@ -190,6 +190,6 @@ they can be added to your project in a similar fashion.
190190

191191
From the command line inside your project root::
192192

193-
composer require codeigniter4/translations
193+
composer require codeigniter4/translations @beta
194194

195195
These will be updated along with the framework whenever you do a ``composer update``.

user_guide_src/source/installation/installing_git.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ This is bound and installed automatically as part of the
8080
codebase installation.
8181

8282
If you wish to use it inside your project too,
83-
``composer require codeigniter4/translations @alpha``
83+
``composer require codeigniter4/translations @beta``

user_guide_src/source/installation/running.rst

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,6 @@ With the above configuration, your webapp would be accessed with the URL ``http:
131131

132132
Apache needs to be restarted whenever you change its configuration.
133133

134-
Hosting with NGINX
135-
=================================================
136-
137-
Directions coming soon?
138-
139134
Hosting with Vagrant
140135
=================================================
141136

@@ -169,14 +164,3 @@ Once setup, you can then launch your webapp inside a VM, with the command::
169164
Your webapp will be accessible at ``http://localhost:8080``, with the code coverage
170165
report for your build at ``http://localhost:8081`` and the user guide for
171166
it at ``http://localhost:8082``.
172-
173-
Hosting with Docker
174-
=================================================
175-
176-
Directions coming soon?
177-
178-
Hosting on the Cloud
179-
=================================================
180-
181-
Directions coming soon?
182-

0 commit comments

Comments
 (0)