Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.0] New installer #17964

Merged
merged 57 commits into from Nov 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
cf6854d
Squashed commit of the following:
dgrammatiko Sep 3, 2017
3be0b3f
fixes
dgrammatiko Sep 3, 2017
66916e4
Namespace application
laoneo Sep 4, 2017
9797168
Namespace JSON response
laoneo Sep 4, 2017
0eaa400
Namespace router
laoneo Sep 4, 2017
f83feaf
Namespace service providers
laoneo Sep 4, 2017
99c65fe
Namespace error renderer
laoneo Sep 4, 2017
1fd19aa
Namespace database helper
laoneo Sep 4, 2017
e355264
Namespace form fields
laoneo Sep 4, 2017
6ef57a2
Namespace form rule
laoneo Sep 4, 2017
d52cd0f
Make the subprefix work
laoneo Sep 4, 2017
7a94090
Squashed commit of the following:
dgrammatiko Sep 3, 2017
4069a03
fixes
dgrammatiko Sep 3, 2017
0f9fcc0
do not install all the languages
dgrammatiko Sep 3, 2017
5bfeb99
Remove crap from joomla
dgrammatiko Sep 15, 2017
b7ca19d
Merge branch '§§§4.0-dev-installation' into 4.0-dev-installation-PR
laoneo Sep 15, 2017
1b37a07
Revert workaround
laoneo Sep 15, 2017
24b55ac
Remove console log
wilsonge Sep 17, 2017
e9336d2
fix php notice
dgrammatiko Sep 17, 2017
74db086
fixes
dgrammatiko Sep 17, 2017
2cf57b0
more fixes
dgrammatiko Sep 17, 2017
e3474ed
Merge remote-tracking branch 'remotes/upstream/4.0-dev' into 4.0-dev-…
laoneo Oct 5, 2017
9a20bb2
Move MVC to namespace
laoneo Oct 5, 2017
3ae5dca
Support json controllers
laoneo Oct 5, 2017
3f1a6c0
Languages
laoneo Oct 5, 2017
84b769b
Models
laoneo Oct 5, 2017
db5f7a9
Installation controller
laoneo Oct 5, 2017
5710b4a
Fix the new controllers
laoneo Oct 5, 2017
7335849
Fix the new controllers
laoneo Oct 5, 2017
1b088cd
fix js
laoneo Oct 5, 2017
e684670
Rename function
laoneo Oct 5, 2017
bbf1a8e
docs
laoneo Oct 5, 2017
c2ae326
Delete not needed files
laoneo Oct 5, 2017
83c843a
Merge pull request #66 from dgt41/allon/installation/mvc
Oct 5, 2017
01165d5
Enable session token check
laoneo Oct 6, 2017
933c4fc
Rename to includes
laoneo Oct 6, 2017
b4f4824
Docs
laoneo Oct 6, 2017
942c927
Fix install sample data request
laoneo Oct 18, 2017
6e6878e
Delete installation server part
laoneo Oct 21, 2017
81b2bba
Fix language installation
laoneo Oct 21, 2017
4121216
Enable session check
laoneo Oct 21, 2017
73a9433
bugs
dgrammatiko Oct 21, 2017
e705557
fieldset, legend
dgrammatiko Oct 21, 2017
e553ec3
install the sample data
dgrammatiko Oct 21, 2017
4ae15a2
more
dgrammatiko Oct 21, 2017
64b0665
fix extra languages
dgrammatiko Oct 21, 2017
bfdbfc7
extra languages
dgrammatiko Oct 21, 2017
3ffa7f5
cs
dgrammatiko Oct 22, 2017
47ef51a
don’t fail on js tests
dgrammatiko Oct 22, 2017
6dd5284
not needed
dgrammatiko Oct 22, 2017
aa4764c
languages
dgrammatiko Oct 22, 2017
2993ac5
Init the application with the global config if available
laoneo Oct 23, 2017
88ffa4a
fix the languages part
dgrammatiko Oct 23, 2017
45b3652
fix the languages part
dgrammatiko Oct 23, 2017
8130168
Merge branch '4.0-dev' into 4.0-dev-installation-PR
Oct 26, 2017
baa682e
Fixes for various issues
wilsonge Nov 2, 2017
4ab901f
Merge pull request #68 from wilsonge/new_installer
Nov 2, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 18 additions & 1 deletion Gruntfile.js
Expand Up @@ -42,6 +42,7 @@ module.exports = function(grunt) {
puny : 'media/vendor/punycode/js',
codemirror : 'media/vendor/codemirror',
adminTemplate : 'administrator/templates/atum',
installTemplate : 'installation/template',
siteTemplate : 'templates/cassiopeia',
node_module : 'build/assets_tmp/node_modules/',
},
Expand Down Expand Up @@ -238,6 +239,7 @@ module.exports = function(grunt) {
sourceMap: true // SHOULD BE FALSE FOR DIST
},
files: {
'<%= folder.adminTemplate %>/css/template.css': '<%= folder.adminTemplate %>/scss/template.scss',
'<%= folder.siteTemplate %>/css/template.css' : '<%= folder.siteTemplate %>/scss/template.scss',
}
},
Expand Down Expand Up @@ -445,7 +447,21 @@ module.exports = function(grunt) {
dest: '<%= folder.siteTemplate %>/css',
}]
},
admin: {
installTemplate: {
files: [{
expand: true,
matchBase: true,
ext: '.min.css',
cwd: '<%= folder.installTemplate %>/css',
src: [
'*.css',
'!*.min.css',
'!theme/*.css'
],
dest: '<%= folder.installTemplate %>/css',
}]
},
siteTemplate: {
files: [{
expand: true,
matchBase: true,
Expand All @@ -465,6 +481,7 @@ module.exports = function(grunt) {
watch: {
siteTemplate: {
files: [
'<%= folder.adminTemplate %>/**/*.scss',
'<%= folder.siteTemplate %>/**/*.scss',
'media/system/scss/**/*.scss',
],
Expand Down
1 change: 1 addition & 0 deletions administrator/templates/atum/scss/scss-lint-report.xml
@@ -0,0 +1 @@
<?xml version="1.0"?><testsuites errors="0"><testsuite name="scss-lint" timestamp="2017-03-20T12:23:24"/></testsuites>
53 changes: 0 additions & 53 deletions installation/controller/database.php

This file was deleted.

110 changes: 0 additions & 110 deletions installation/controller/default.php

This file was deleted.

56 changes: 0 additions & 56 deletions installation/controller/detectftproot.php

This file was deleted.

43 changes: 0 additions & 43 deletions installation/controller/ftp.php

This file was deleted.

49 changes: 0 additions & 49 deletions installation/controller/install/config.php

This file was deleted.