v2.0.10

bin/build_subtree.sh

@@ -1,27 +1,33 @@
-git subsplit init [email protected]:directus/directus.git
+git subsplit init [email protected]:directus/api.git
 
 # Collection
-git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Collection:[email protected]:directus/directus-collection.git
+git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Collection:[email protected]:directus/directus-collection.git
 
 # Config
-git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Config:[email protected]:directus/directus-config.git
-
-# Permissions
-git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Permissions:[email protected]:directus/directus-permissions.git
+git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Config:[email protected]:directus/directus-config.git
 
 # Database
-git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Database:[email protected]:directus/directus-database.git
+git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Database:[email protected]:directus/directus-database.git
+
+# Exception
+git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Exception:[email protected]:directus/directus-php-exception.git
 
 # Filesystem
-git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Filesystem:[email protected]:directus/directus-filesystem.git
+git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Filesystem:[email protected]:directus/directus-filesystem.git
 
 # Hash
-git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Hash:[email protected]:directus/directus-hash.git
+git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Hash:[email protected]:directus/directus-hash.git
+
+# Helpers
+git subsplit publish --heads="master" --no-tags --debug src/helpers:[email protected]:directus/directus-php-helpers.git
 
 # Hooks
-git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Hook:[email protected]:directus/directus-hook.git
+git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Hook:[email protected]:directus/directus-hook.git
+
+# Permissions
+git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Permissions:[email protected]:directus/directus-permissions.git
 
 # Utils
-git subsplit publish --heads="version/6.4" --no-tags --debug api/core/Directus/Util:[email protected]:directus/directus-php-utils.git
+git subsplit publish --heads="master" --no-tags --debug src/core/Directus/Util:[email protected]:directus/directus-php-utils.git
 
 rm -rf .subsplit

config/api_sample.php

@@ -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' => [

migrations/db/schemas/20180220023243_create_settings_table.php

@@ -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
@@ -41,7 +37,7 @@ public function change()
             'default' => null
         ]);
 
-        $table->addIndex(['scope', 'key'], [
+        $table->addIndex(['key'], [
             'unique' => true,
             'name' => 'idx_scope_name'
         ]);

migrations/upgrades/schemas/20181123171520_remove_scope.php

@@ -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();
+    }
+}

public/extensions/core/interfaces/activity-icon/display.css

@@ -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
 }

public/extensions/core/interfaces/activity-icon/input.css

@@ -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)
 }

public/extensions/core/interfaces/button-group/input.css

@@ -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
 }
 }