Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Commit

Permalink
v2.0.12
Browse files Browse the repository at this point in the history
  • Loading branch information
rijkvanzanten committed Dec 19, 2018
1 parent ed86728 commit e2be26e
Show file tree
Hide file tree
Showing 211 changed files with 1,392 additions and 1,095 deletions.
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<a href="https://directus.io">Website</a> •
<a href="https://docs.directus.io">Docs</a> •
<a href="https://docs.directus.io/api/reference.html">API Reference</a> •
<a href="https://docs.directus.io/app/user-guide.html">User Guide</a> •
<a href="https://docs.directus.io/guides/user-guide.html">User Guide</a> •
<a href="https://directus.app">Demo</a> •
<a href="https://docs.directus.io/supporting-directus.html">Contribute</a>
<a href="https://docs.directus.io/getting-started/supporting-directus.html">Contribute</a>
</h3>

<p>&nbsp;</p>
Expand All @@ -43,17 +43,17 @@ Directus is an open-source suite of software for managing content in projects of

## 📖 Documentation

* [What is Directus?](https://docs.directus.io/what-is-directus.html)
* [Installing the Directus Suite](https://docs.directus.io/install.html)
* [What is Directus?](https://docs.directus.io/getting-started/introduction.html#what-is-directus)
* [Installing the Directus Suite](https://docs.directus.io/getting-started/installation.html)
* [Extending Directus](https://docs.directus.io/extensions/)
* Directus App
* [App Docs](https://docs.directus.io/app/admin/)
* [User Guide](https://docs.directus.io/app/user-guide.html)
* [Install the App](https://docs.directus.io/app/admin/install.html)
* [App Docs](https://docs.directus.io/advanced/app/standalone.html)
* [User Guide](https://docs.directus.io/guides/user-guide.html)
* [Install the App](https://docs.directus.io/advanced/app/standalone.html#installation)
* Directus API
* [API Docs](https://docs.directus.io/api/admin/)
* [API Docs](https://docs.directus.io/advanced/api/standalone.html)
* [API Reference](https://docs.directus.io/api/reference.html)
* [Install the API](https://docs.directus.io/api/admin/install.html)
* [Install the API](https://docs.directus.io/advanced/api/standalone.html#installation)
* Tutorials
* [Tutorials](https://medium.com/directus)
* [Videos](https://www.youtube.com/playlist?list=PLD--x9rY3ZL31stRPkA4FdGC4idIM-8-d)
Expand Down Expand Up @@ -90,8 +90,8 @@ Feature requests are managed as GitHub issues within the appropriate Directus re

We love pull-requests! To work on Directus you'll need to install it locally from source by following the instructions below. Submit all pull-requests to the `development` branch of our `api` and `app` repositories.

* [Setup API Development Environment](https://docs.directus.io/api/contributor/install-dev.html)
* [Setup App Development Environment](https://docs.directus.io/app/contributor/install-dev.html)
* [Setup API Development Environment](https://docs.directus.io/advanced/source.html#api-source)
* [Setup App Development Environment](https://docs.directus.io/advanced/source.html#application-source)

### Online Demos

Expand All @@ -105,7 +105,7 @@ Directus is a GPLv3-licensed open source project with development made possible

* [Become a backer or sponsor through Patreon](https://www.patreon.com/directus)
* [One-time donation through PayPal](https://www.paypal.me/supportdirectus)
* [Other ways to help](https://docs.directus.io/supporting-directus.html)
* [Other ways to help](https://docs.directus.io/getting-started/supporting-directus.html)

### Sponsors

Expand Down Expand Up @@ -133,7 +133,7 @@ Directus is a GPLv3-licensed open source project with development made possible
</tr>
</table>

**Other Key Contributors: [coolov](https://github.com/coolov), [freen](https://github.com/freen), [jel-massih](https://github.com/jel-massih), [Lasha](https://github.com/Lasha)**
**[Advisors, Sponsors, Partners, and Key Contributors](https://directus.io/organization.html#the-team)**

<p>&nbsp;</p>

Expand Down
2 changes: 2 additions & 0 deletions config/api_sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
// 'version' => 's3-version',
// 'bucket' => 's3-bucket',
// 'options' => ['ACL' => 'public-read', 'Cache-Control' => 'max-age=604800']
// Set custom S3 endpoint
// 'endpoint' => 's3-endpoint',
],

'mail' => [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function change()

$table->addIndex(['key'], [
'unique' => true,
'name' => 'idx_scope_name'
'name' => 'idx_key'
]);

$table->create();
Expand Down
7 changes: 7 additions & 0 deletions migrations/db/seeds/FieldsSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,13 @@ public function run()
'interface' => 'color-palette',
'locked' => 1
],
[
'collection' => 'directus_settings',
'field' => 'trusted_proxies',
'type' => \Directus\Database\Schema\DataTypes::TYPE_ARRAY,
'interface' => 'tags',
'locked' => 1
],


// Users
Expand Down
18 changes: 16 additions & 2 deletions migrations/upgrades/schemas/20181123171520_remove_scope.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,21 @@ class RemoveScope extends AbstractMigration
public function up()
{
$table = $this->table('directus_settings');
$table->removeColumn('scope')
->save();

if ($table->hasColumn('scope')) {
$oldIndexName = 'idx_scope_name';
// NOTE: Update to a more recent version of Phinx
// It implements the $table->hasIndexByName($oldIndexName);
if ($table->getAdapter()->hasIndexByName($table->getName(), $oldIndexName)) {
$table->removeIndexByName($oldIndexName);
}

$table->removeColumn('scope')
->save();
$table->addIndex(['key'], [
'unique' => true,
'name' => 'idx_key'
]);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php


use Phinx\Migration\AbstractMigration;

class AddTrustedProxiesSettingField extends AbstractMigration
{
public function up()
{
$result = $this->query('SELECT 1 FROM `directus_settings` WHERE `key` = "trusted_proxies";')->fetch();

if (!$result) {
$this->execute("INSERT INTO `directus_settings` (`key`, `value`) VALUES ('trusted_proxies', '');");
}
}
}
8 changes: 1 addition & 7 deletions public/extensions/core/interfaces/activity-icon/display.css

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

2 changes: 1 addition & 1 deletion public/extensions/core/interfaces/activity-icon/display.js

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

4 changes: 1 addition & 3 deletions public/extensions/core/interfaces/activity-icon/input.css
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@

.small[data-v-57a84c]{width:100%;max-width:var(--width-medium)
}
.small[data-v-26a8b1]{width:100%;max-width:var(--width-medium)}
2 changes: 1 addition & 1 deletion public/extensions/core/interfaces/activity-icon/input.js

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

60 changes: 1 addition & 59 deletions public/extensions/core/interfaces/button-group/input.css

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

Loading

0 comments on commit e2be26e

Please sign in to comment.