Skip to content

Commit

Permalink
Merge branch '4.0-dev' into ns-admin-languages
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianteeman
brianteeman authored Jul 22, 2018
2 parents ea830b5 + 623c2c1 commit d6c5e5a
Show file tree
Hide file tree
Showing 297 changed files with 28,163 additions and 2,600 deletions.
7 changes: 2 additions & 5 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# A list of files to ignore from linting
# TODO: Fix the webcomponents codestyle then also allow linting on them
*.js
!*.es6.js
build/**/**/*.js ## Exclude webcomponents till we fix the CS!
*.vue
build/incompatible_page/*.js
media/system/webcomponents/js/*.js ## The linted files are in build/webcomponents!
media/com_media/js/edit-images.js ## TODO: Fix this file
media/mod_menu/js/admin-menu.js ## TODO: Fix this file
1 change: 1 addition & 0 deletions administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-03.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS `#__csp` (
`document_uri` varchar(500) NOT NULL DEFAULT '',
`blocked_uri` varchar(500) NOT NULL DEFAULT '',
`directive` varchar(500) NOT NULL DEFAULT '',
`client` varchar(500) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`published` tinyint(1) NOT NULL DEFAULT 0,
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-03.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS "#__csp" (
"document_uri" varchar(500) NOT NULL DEFAULT '',
"blocked_uri" varchar(500) NOT NULL DEFAULT '',
"directive" varchar(500) NOT NULL DEFAULT '',
"client" varchar(500) NOT NULL DEFAULT '',
"created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
"modified" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
"published" smallint DEFAULT 0 NOT NULL,
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_admin/tmpl/sysinfo/default_config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
<table class="table">
<thead>
<tr>
<th style="width:300px">
<th scope="col" style="width:300px">
<?php echo Text::_('COM_ADMIN_SETTING'); ?>
</th>
<th>
<th scope="col">
<?php echo Text::_('COM_ADMIN_VALUE'); ?>
</th>
</tr>
Expand All @@ -33,9 +33,9 @@
<tbody>
<?php foreach ($this->config as $key => $value) : ?>
<tr>
<td>
<th scope="row">
<?php echo $key; ?>
</td>
</th>
<td>
<?php echo htmlspecialchars($value, ENT_QUOTES); ?>
</td>
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_admin/tmpl/sysinfo/default_directory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<table class="table">
<thead>
<tr>
<th style="width:650px">
<th scope="col" style="width:650px">
<?php echo Text::_('COM_ADMIN_DIRECTORY'); ?>
</th>
<th>
<th scope="col">
<?php echo Text::_('COM_ADMIN_STATUS'); ?>
</th>
</tr>
Expand All @@ -34,9 +34,9 @@
<tbody>
<?php foreach ($this->directory as $dir => $info) : ?>
<tr>
<td>
<th scope="row">
<?php echo HTMLHelper::_('directory.message', $dir, $info['message']); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('directory.writable', $info['writable']); ?>
</td>
Expand Down
60 changes: 30 additions & 30 deletions administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<table class="table">
<thead>
<tr>
<th style="width:250px">
<th scope="col" style="width:250px">
<?php echo Text::_('COM_ADMIN_SETTING'); ?>
</th>
<th>
<th scope="col">
<?php echo Text::_('COM_ADMIN_VALUE'); ?>
</th>
</tr>
Expand All @@ -34,113 +34,113 @@
</tfoot>
<tbody>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_OPEN_BASEDIR'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.string', $this->php_settings['open_basedir']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DISPLAY_ERRORS'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.boolean', $this->php_settings['display_errors']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_SHORT_OPEN_TAGS'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.boolean', $this->php_settings['short_open_tag']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_FILE_UPLOADS'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.boolean', $this->php_settings['file_uploads']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_OUTPUT_BUFFERING'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.boolean', $this->php_settings['output_buffering']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_SESSION_SAVE_PATH'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.string', $this->php_settings['session.save_path']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_SESSION_AUTO_START'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.integer', $this->php_settings['session.auto_start']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_XML_ENABLED'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.set', $this->php_settings['xml']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_ZLIB_ENABLED'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.set', $this->php_settings['zlib']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_ZIP_ENABLED'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.set', $this->php_settings['zip']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DISABLED_FUNCTIONS'); ?>
</td>
</th>
<td class="break-word">
<?php echo HTMLHelper::_('phpsetting.string', $this->php_settings['disable_functions']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_MBSTRING_ENABLED'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.set', $this->php_settings['mbstring']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_ICONV_AVAILABLE'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.set', $this->php_settings['iconv']); ?>
</td>
</tr>
<tr>
<td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_MAX_INPUT_VARS'); ?>
</td>
</th>
<td>
<?php echo HTMLHelper::_('phpsetting.integer', $this->php_settings['max_input_vars']); ?>
</td>
Expand Down
64 changes: 32 additions & 32 deletions administrator/components/com_admin/tmpl/sysinfo/default_system.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<table class="table">
<thead>
<tr>
<th style="width:25%">
<th scope="col" style="width:25%">
<?php echo Text::_('COM_ADMIN_SETTING'); ?>
</th>
<th>
<th scope="col">
<?php echo Text::_('COM_ADMIN_VALUE'); ?>
</th>
</tr>
Expand All @@ -33,81 +33,81 @@
</tfoot>
<tbody>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_PHP_BUILT_ON'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_PHP_BUILT_ON'); ?>
</th>
<td>
<?php echo $this->info['php']; ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_DATABASE_TYPE'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DATABASE_TYPE'); ?>
</th>
<td>
<?php echo $this->info['dbserver']; ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_DATABASE_VERSION'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DATABASE_VERSION'); ?>
</th>
<td>
<?php echo $this->info['dbversion']; ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_DATABASE_COLLATION'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DATABASE_COLLATION'); ?>
</th>
<td>
<?php echo $this->info['dbcollation']; ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_COLLATION'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_COLLATION'); ?>
</th>
<td>
<?php echo $this->info['dbconnectioncollation']; ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
</th>
<td>
<?php echo $this->info['phpversion']; ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_WEB_SERVER'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_WEB_SERVER'); ?>
</th>
<td>
<?php echo HTMLHelper::_('system.server', $this->info['server']); ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?>
</th>
<td>
<?php echo $this->info['sapi_name']; ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_JOOMLA_VERSION'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_JOOMLA_VERSION'); ?>
</th>
<td>
<?php echo $this->info['version']; ?>
</td>
</tr>
<tr>
<td>
<strong><?php echo Text::_('COM_ADMIN_USER_AGENT'); ?></strong>
</td>
<th scope="row">
<?php echo Text::_('COM_ADMIN_USER_AGENT'); ?>
</th>
<td>
<?php echo htmlspecialchars($this->info['useragent'], ENT_COMPAT, 'UTF-8'); ?>
</td>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_associations/tmpl/association/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

HTMLHelper::_('behavior.formvalidator');
HTMLHelper::_('behavior.keepalive');
HTMLHelper::_('formbehavior.chosen', 'select');
HTMLHelper::_('jquery.framework');

HTMLHelper::_('script', 'com_associations/sidebyside.js', false, true);
HTMLHelper::_('stylesheet', 'com_associations/sidebyside.css', array(), true);
Expand Down
Loading

0 comments on commit d6c5e5a

Please sign in to comment.