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

Commit

Permalink
v2.0.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@rijkvanzanten
rijkvanzanten committed Dec 3, 2018
1 parent e0fc48f commit 3d5ec05
Show file tree
Hide file tree
Showing 355 changed files with 5,509 additions and 3,619 deletions.
28 changes: 17 additions & 11 deletions bin/build_subtree.sh
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
git subsplit init git@github.com:directus/directus.git
git subsplit init git@github.com:directus/api.git

# Collection
git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Collection:git@github.com:directus/directus-collection.git
git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Collection:git@github.com:directus/directus-collection.git

# Config
git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Config:git@github.com:directus/directus-config.git

# Permissions
git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Permissions:git@github.com:directus/directus-permissions.git
git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Config:git@github.com:directus/directus-config.git

# Database
git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Database:git@github.com:directus/directus-database.git
git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Database:git@github.com:directus/directus-database.git

# Exception
git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Exception:git@github.com:directus/directus-php-exception.git

# Filesystem
git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Filesystem:git@github.com:directus/directus-filesystem.git
git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Filesystem:git@github.com:directus/directus-filesystem.git

# Hash
git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Hash:git@github.com:directus/directus-hash.git
git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Hash:git@github.com:directus/directus-hash.git

# Helpers
git subsplit publish --heads="master" --no-tags --debug src/helpers:git@github.com:directus/directus-php-helpers.git

# Hooks
git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Hook:git@github.com:directus/directus-hook.git
git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Hook:git@github.com:directus/directus-hook.git

# Permissions
git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Permissions:git@github.com:directus/directus-permissions.git

# Utils
git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Util:git@github.com:directus/directus-php-utils.git
git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Util:git@github.com:directus/directus-php-utils.git

rm -rf .subsplit
3 changes: 2 additions & 1 deletion config/api_sample.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
// 'secret' => 's3-secret',
// 'region' => 's3-region',
// 'version' => 's3-version',
// 'bucket' => 's3-bucket'
// 'bucket' => 's3-bucket',
// 'options' => ['ACL' => 'public-read', 'Cache-Control' => 'max-age=604800']
],

'mail' => [
Expand Down
6 changes: 1 addition & 5 deletions migrations/db/schemas/20180220023243_create_settings_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ public function change()
{
$table = $this->table('directus_settings', ['signed' => false]);

$table->addColumn('scope', 'string', [
'limit' => 64,
'default' => null
]);
$table->addColumn('key', 'string', [
'limit' => 64,
'null' => false
Expand All @@ -41,7 +37,7 @@ public function change()
'default' => null
]);

$table->addIndex(['scope', 'key'], [
$table->addIndex(['key'], [
'unique' => true,
'name' => 'idx_scope_name'
]);
Expand Down
14 changes: 14 additions & 0 deletions migrations/upgrades/schemas/20181123171520_remove_scope.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php


use Phinx\Migration\AbstractMigration;

class RemoveScope extends AbstractMigration
{
public function up()
{
$table = $this->table('directus_settings');
$table->removeColumn('scope')
->save();
}
}
6 changes: 3 additions & 3 deletions public/extensions/core/interfaces/activity-icon/display.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

.v-progress-ring[data-v-42a624]{display:inline-block;vertical-align:top
.v-progress-ring[data-v-8de398]{display:inline-block;vertical-align:top
}
.label[data-v-42a624]{display:inline-block;margin-left:4px;height:34px
.label[data-v-8de398]{display:inline-block;margin-left:4px;height:34px
}
.label div[data-v-42a624]{margin-top:9px
.label div[data-v-8de398]{margin-top:9px
}
2 changes: 1 addition & 1 deletion public/extensions/core/interfaces/activity-icon/display.js
View file

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/input.css
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

.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
View file

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

54 changes: 27 additions & 27 deletions public/extensions/core/interfaces/button-group/input.css
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@

.button-group-subgroup[data-v-34f76f]{display:inline-flex;flex-wrap:wrap;margin-right:10px
.button-group-subgroup[data-v-7962a0]{display:inline-flex;flex-wrap:wrap;margin-right:10px
}
.button-group-button[data-v-34f76f]{border:var(--input-border-width) solid var(--action);cursor:pointer;transition:var(--fast) var(--transition);transition-property:border-color,background-color,color;display:flex;align-items:center;justify-content:center;padding:0 20px;height:40px;line-height:40px;white-space:nowrap;color:var(--action-dark)
.button-group-button[data-v-7962a0]{border:var(--input-border-width) solid var(--action);cursor:pointer;transition:var(--fast) var(--transition);transition-property:border-color,background-color,color;display:flex;align-items:center;justify-content:center;padding:0 20px;height:40px;line-height:40px;white-space:nowrap;color:var(--action-dark)
}
.button-group-button[data-v-34f76f]:hover{background-color:var(--light-blue-50)
.button-group-button[data-v-7962a0]:hover{background-color:var(--light-blue-50)
}
.button-group-button i[data-v-34f76f]{font-size:18px
.button-group-button i[data-v-7962a0]{font-size:18px
}
.button-group-button i+span[data-v-34f76f]{margin-left:4px
.button-group-button i+span[data-v-7962a0]{margin-left:4px
}
.button-group-item input[type=radio][data-v-34f76f]{height:0;position:absolute;opacity:0
.button-group-item input[type=radio][data-v-7962a0]{height:0;position:absolute;opacity:0
}
.button-group-item input[type=radio]:focus+.button-group-button[data-v-34f76f]{background-color:var(--light-blue-50)
.button-group-item input[type=radio]:focus+.button-group-button[data-v-7962a0]{background-color:var(--light-blue-50)
}
.button-group-item input[type=radio]:checked+.button-group-button[data-v-34f76f]{background-color:var(--accent);color:var(--white)
.button-group-item input[type=radio]:checked+.button-group-button[data-v-7962a0]{background-color:var(--accent);color:var(--white)
}
.button-group-item input[type=radio]:disabled+.button-group-button[data-v-34f76f]{border-color:var(--lighter-gray);background-color:var(--lightest-gray);color:var(--gray);cursor:not-allowed
.button-group-item input[type=radio]:disabled+.button-group-button[data-v-7962a0]{border-color:var(--lighter-gray);background-color:var(--lightest-gray);color:var(--gray);cursor:not-allowed
}
.button-group-item input[type=radio]:disabled:checked+.button-group-button[data-v-34f76f]{background-color:var(--lighter-gray);color:var(--gray)
.button-group-item input[type=radio]:disabled:checked+.button-group-button[data-v-7962a0]{background-color:var(--lighter-gray);color:var(--gray)
}
.button-group-item+.button-group-item .button-group-button[data-v-34f76f]{margin-left:calc(-1*var(--input-border-width))
.button-group-item+.button-group-item .button-group-button[data-v-7962a0]{margin-left:calc(-1*var(--input-border-width))
}
.button-group-item:first-child .button-group-button[data-v-34f76f]{border-radius:var(--border-radius) 0 0 var(--border-radius)
.button-group-item:first-child .button-group-button[data-v-7962a0]{border-radius:var(--border-radius) 0 0 var(--border-radius)
}
.button-group-item:last-child .button-group-button[data-v-34f76f]{border-radius:0 var(--border-radius) var(--border-radius) 0
.button-group-item:last-child .button-group-button[data-v-7962a0]{border-radius:0 var(--border-radius) var(--border-radius) 0
}
@media only screen and (max-width:800px){
.button-group-subgroup[data-v-34f76f],.interface-button-group[data-v-34f76f]{display:inline-flex;flex-direction:column
.button-group-subgroup[data-v-7962a0],.interface-button-group[data-v-7962a0]{display:inline-flex;flex-direction:column
}
.button-group-subgroup[data-v-34f76f]{margin:0
.button-group-subgroup[data-v-7962a0]{margin:0
}
.button-group-subgroup+.button-group-subgroup[data-v-34f76f]{margin:10px 0 0
.button-group-subgroup+.button-group-subgroup[data-v-7962a0]{margin:10px 0 0
}
.button-group-item+.button-group-item .button-group-button[data-v-34f76f]{margin-left:0;margin-top:calc(-1*var(--input-border-width))
.button-group-item+.button-group-item .button-group-button[data-v-7962a0]{margin-left:0;margin-top:calc(-1*var(--input-border-width))
}
.button-group-item:first-child .button-group-button[data-v-34f76f]{border-radius:var(--border-radius) var(--border-radius) 0 0
.button-group-item:first-child .button-group-button[data-v-7962a0]{border-radius:var(--border-radius) var(--border-radius) 0 0
}
.button-group-item:last-child .button-group-button[data-v-34f76f]{border-radius:0 0 var(--border-radius) var(--border-radius)
.button-group-item:last-child .button-group-button[data-v-7962a0]{border-radius:0 0 var(--border-radius) var(--border-radius)
}
}
.button-group-solid .button-group-button[data-v-34f76f]{border:none;background-color:var(--dark-gray);color:var(--white)
.button-group-solid .button-group-button[data-v-7962a0]{border:none;background-color:var(--dark-gray);color:var(--white)
}
.button-group-solid .button-group-button[data-v-34f76f]:hover{background-color:var(--darker-gray);color:var(--white)
.button-group-solid .button-group-button[data-v-7962a0]:hover{background-color:var(--darker-gray);color:var(--white)
}
.button-group-solid .button-group-item input[type=radio]:focus+.button-group-button[data-v-34f76f]{background-color:var(--darker-gray)
.button-group-solid .button-group-item input[type=radio]:focus+.button-group-button[data-v-7962a0]{background-color:var(--darker-gray)
}
.button-group-solid .button-group-item input[type=radio]:checked+.button-group-button[data-v-34f76f]{background-color:var(--accent)
.button-group-solid .button-group-item input[type=radio]:checked+.button-group-button[data-v-7962a0]{background-color:var(--accent)
}
.button-group-solid .button-group-item input[type=radio]:disabled+.button-group-button[data-v-34f76f]{background-color:var(--lighter-gray);color:var(--light-gray)
.button-group-solid .button-group-item input[type=radio]:disabled+.button-group-button[data-v-7962a0]{background-color:var(--lighter-gray);color:var(--light-gray)
}
.button-group-solid .button-group-item input[type=radio]:disabled:checked+.button-group-button[data-v-34f76f]{background-color:var(--blue-grey-200);color:var(--gray)
.button-group-solid .button-group-item input[type=radio]:disabled:checked+.button-group-button[data-v-7962a0]{background-color:var(--blue-grey-200);color:var(--gray)
}
.button-group-solid .button-group-item+.button-group-item .button-group-button[data-v-34f76f]{margin-left:0
.button-group-solid .button-group-item+.button-group-item .button-group-button[data-v-7962a0]{margin-left:0
}
@media only screen and (max-width:800px){
.button-group-solid .button-group-item+.button-group-item .button-group-button[data-v-34f76f]{margin-top:0
.button-group-solid .button-group-item+.button-group-item .button-group-button[data-v-7962a0]{margin-top:0
}
}
2 changes: 1 addition & 1 deletion public/extensions/core/interfaces/button-group/input.js
View file

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/calendar/input.css
View file

Large diffs are not rendered by default.

0 comments on commit 3d5ec05

Please sign in to comment.