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

Commit

Permalink
v2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@rijkvanzanten
rijkvanzanten committed Oct 13, 2018
1 parent 1178d97 commit 2cb604a
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 21 deletions.
9 changes: 4 additions & 5 deletions migrations/db/seeds/FieldsSeeder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@ public function run()
'America/Anchorage' => 'Anchorage (Alaska)',
'Pacific/Honolulu' => 'Honolulu (Hawaii)'
],
'placeholder' => 'Choose a language...'
'placeholder' => 'Choose a timezone...'
]),
'locked' => 1,
'sort' => 10,
Expand Down Expand Up @@ -1138,6 +1138,7 @@ public function run()
'interface' => 'code',
'locked' => 1,
'hidden_browse' => 1,
'hidden_detail' => 1,
'sort' => 12
],
[
Expand Down Expand Up @@ -1222,10 +1223,8 @@ public function run()
'collection' => 'directus_users',
'field' => 'roles',
'type' => \Directus\Database\Schema\DataTypes::TYPE_O2M,
'interface' => 'many-to-many',
'locked' => 1,
'hidden_detail' => 1,
'hidden_browse' => 1
'interface' => 'user-roles',
'locked' => 1
],
[
'collection' => 'directus_users',
Expand Down
2 changes: 1 addition & 1 deletion public/extensions/core/interfaces/status/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"$t:status","version":"1.0.0","types":["status"],"recommended":{"defaultValue":"draft","length":20},"fieldset":true,"icon":"outlined_flag","options":{"simpleBadge":{"name":"$t:simple_badge","comment":"$t:simple_badge_comment","interface":"toggle","type":"BOOLEAN","default":true},"status_mapping":{"name":"$t:status_mapping","comment":"$t:status_mapping_comment","interface":"code","type":"JSON","options":{"language":"application/json","template":{"published":{"name":"$t:published","text_color":"white","background_color":"accent","browse_subdued":false,"browse_badge":false,"soft_delete":false,"published":true},"under-review":{"name":"$t:under_review","text_color":"white","background_color":"amber","browse_subdued":true,"browse_badge":true,"soft_delete":false,"published":false},"draft":{"name":"$t:draft","text_color":"white","background_color":"blue-grey-200","browse_subdued":true,"browse_badge":true,"soft_delete":false,"published":false},"deleted":{"name":"$t:deleted","text_color":"white","background_color":"red","browse_subdued":true,"browse_badge":true,"soft_delete":true,"published":false}}},"default":{"published":{"name":"$t:published","text_color":"white","background_color":"accent","browse_subdued":false,"browse_badge":false,"soft_delete":false,"published":true},"draft":{"name":"$t:draft","text_color":"white","background_color":"blue-grey-200","browse_subdued":true,"browse_badge":true,"soft_delete":false,"published":false},"deleted":{"name":"$t:deleted","text_color":"white","background_color":"red","browse_subdued":true,"browse_badge":true,"soft_delete":true,"published":false}}}},"translation":{"en-US":{"status":"Status","status_mapping":"Status Mapping","status_mapping_comment":"Enter JSON status options","simple_badge":"Simple Badge","simple_badge_comment":"Displays a colored dot on the item listing page.","published":"Published","under_review":"Under Review","draft":"Draft","deleted":"Deleted"}}}
{"name":"$t:status","version":"1.0.1","types":["status"],"recommended":{"defaultValue":"draft","length":20},"fieldset":true,"icon":"outlined_flag","options":{"simpleBadge":{"name":"$t:simple_badge","comment":"$t:simple_badge_comment","interface":"toggle","type":"BOOLEAN","default":true},"status_mapping":{"name":"$t:status_mapping","comment":"$t:status_mapping_comment","interface":"code","type":"JSON","options":{"language":"application/json","template":{"published":{"name":"$t:published","text_color":"white","background_color":"accent","browse_subdued":false,"browse_badge":true,"soft_delete":false,"published":true},"under-review":{"name":"$t:under_review","text_color":"white","background_color":"amber","browse_subdued":true,"browse_badge":true,"soft_delete":false,"published":false},"draft":{"name":"$t:draft","text_color":"white","background_color":"blue-grey-200","browse_subdued":true,"browse_badge":true,"soft_delete":false,"published":false},"deleted":{"name":"$t:deleted","text_color":"white","background_color":"red","browse_subdued":true,"browse_badge":true,"soft_delete":true,"published":false}}},"default":{"published":{"name":"$t:published","text_color":"white","background_color":"accent","browse_subdued":false,"browse_badge":true,"soft_delete":false,"published":true},"draft":{"name":"$t:draft","text_color":"white","background_color":"blue-grey-200","browse_subdued":true,"browse_badge":true,"soft_delete":false,"published":false},"deleted":{"name":"$t:deleted","text_color":"white","background_color":"red","browse_subdued":true,"browse_badge":true,"soft_delete":true,"published":false}}}},"translation":{"en-US":{"status":"Status","status_mapping":"Status Mapping","status_mapping_comment":"Enter JSON status options","simple_badge":"Simple Badge","simple_badge_comment":"Displays a colored dot on the item listing page.","published":"Published","under_review":"Under Review","draft":"Draft","deleted":"Deleted"}}}
6 changes: 6 additions & 0 deletions public/extensions/core/interfaces/user-roles/display.js
View file

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

6 changes: 6 additions & 0 deletions public/extensions/core/interfaces/user-roles/input.js
View file

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

1 change: 1 addition & 0 deletions public/extensions/core/interfaces/user-roles/meta.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"$t:user-roles","version":"1.0.0","types":["o2m"],"relation":"m2m","icon":"perm_identity","options":{"relational":{"name":"$t:relational","comment":"$t:relational_comment","interface":"toggle","default":true}},"translation":{"en-US":{"user-roles":"User Role","relational":"Relational","relational_comment":"Save as M2M value to directus_user_roles"}}}
2 changes: 1 addition & 1 deletion src/core/Directus/Application/Application.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Application extends App
*
* @var string
*/
const DIRECTUS_VERSION = '2.0.0';
const DIRECTUS_VERSION = '2.0.1';

/**
* NOT USED
Expand Down
2 changes: 1 addition & 1 deletion src/schema.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ VALUES
(112,'directus_users','password','string','password',NULL,1,NULL,1,0,0,0,7,4,NULL,NULL,NULL),
(113,'directus_users','company','string','text-input','{\"placeholder\":\"Enter your company or organization name...\"}',0,NULL,0,0,0,0,8,2,NULL,NULL,NULL),
(114,'directus_users','title','string','text-input','{\"placeholder\":\"Enter your title or role...\"}',0,NULL,0,0,0,0,9,2,NULL,NULL,NULL),
(115,'directus_users','timezone','string','dropdown','{\"choices\":{\"America\\/Puerto_Rico\":\"Puerto Rico (Atlantic)\",\"America\\/New_York\":\"New York (Eastern)\",\"America\\/Chicago\":\"Chicago (Central)\",\"America\\/Denver\":\"Denver (Mountain)\",\"America\\/Phoenix\":\"Phoenix (MST)\",\"America\\/Los_Angeles\":\"Los Angeles (Pacific)\",\"America\\/Anchorage\":\"Anchorage (Alaska)\",\"Pacific\\/Honolulu\":\"Honolulu (Hawaii)\"},\"placeholder\":\"Choose a language...\"}',1,NULL,0,0,0,0,10,2,NULL,NULL,NULL),
(115,'directus_users','timezone','string','dropdown','{\"choices\":{\"America\\/Puerto_Rico\":\"Puerto Rico (Atlantic)\",\"America\\/New_York\":\"New York (Eastern)\",\"America\\/Chicago\":\"Chicago (Central)\",\"America\\/Denver\":\"Denver (Mountain)\",\"America\\/Phoenix\":\"Phoenix (MST)\",\"America\\/Los_Angeles\":\"Los Angeles (Pacific)\",\"America\\/Anchorage\":\"Anchorage (Alaska)\",\"Pacific\\/Honolulu\":\"Honolulu (Hawaii)\"},\"placeholder\":\"Choose a timezone...\"}',1,NULL,0,0,0,0,10,2,NULL,NULL,NULL),
(116,'directus_users','locale','string','dropdown','{\"choices\":{\"en-US\":\"English (US)\",\"nl-NL\":\"Dutch (Nederlands)\",\"de-DE\":\"German (Deutsche)\"},\"placeholder\":\"Choose a language...\"}',1,NULL,0,0,0,0,11,2,NULL,NULL,NULL),
(117,'directus_users','locale_options','json','code',NULL,1,NULL,0,0,0,1,12,4,NULL,NULL,NULL),
(118,'directus_users','token','string','text-input',NULL,1,NULL,0,0,1,1,13,4,NULL,NULL,NULL),
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit7efdf560d85835ce68b3bf895988d9a9::getLoader();
return ComposerAutoloaderInitb2b27809cbddad073e874349bb612c18::getLoader();
14 changes: 7 additions & 7 deletions vendor/composer/autoload_real.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit7efdf560d85835ce68b3bf895988d9a9
class ComposerAutoloaderInitb2b27809cbddad073e874349bb612c18
{
private static $loader;

Expand All @@ -19,15 +19,15 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInit7efdf560d85835ce68b3bf895988d9a9', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitb2b27809cbddad073e874349bb612c18', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit7efdf560d85835ce68b3bf895988d9a9', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitb2b27809cbddad073e874349bb612c18', 'loadClassLoader'));

$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';

call_user_func(\Composer\Autoload\ComposerStaticInit7efdf560d85835ce68b3bf895988d9a9::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitb2b27809cbddad073e874349bb612c18::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
Expand All @@ -39,19 +39,19 @@ public static function getLoader()
$loader->register(true);

if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit7efdf560d85835ce68b3bf895988d9a9::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitb2b27809cbddad073e874349bb612c18::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire7efdf560d85835ce68b3bf895988d9a9($fileIdentifier, $file);
composerRequireb2b27809cbddad073e874349bb612c18($fileIdentifier, $file);
}

return $loader;
}
}

function composerRequire7efdf560d85835ce68b3bf895988d9a9($fileIdentifier, $file)
function composerRequireb2b27809cbddad073e874349bb612c18($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
Expand Down
10 changes: 5 additions & 5 deletions vendor/composer/autoload_static.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInit7efdf560d85835ce68b3bf895988d9a9
class ComposerStaticInitb2b27809cbddad073e874349bb612c18
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
Expand Down Expand Up @@ -2963,10 +2963,10 @@ class ComposerStaticInit7efdf560d85835ce68b3bf895988d9a9
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit7efdf560d85835ce68b3bf895988d9a9::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit7efdf560d85835ce68b3bf895988d9a9::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit7efdf560d85835ce68b3bf895988d9a9::$prefixesPsr0;
$loader->classMap = ComposerStaticInit7efdf560d85835ce68b3bf895988d9a9::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitb2b27809cbddad073e874349bb612c18::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb2b27809cbddad073e874349bb612c18::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInitb2b27809cbddad073e874349bb612c18::$prefixesPsr0;
$loader->classMap = ComposerStaticInitb2b27809cbddad073e874349bb612c18::$classMap;

}, null, ClassLoader::class);
}
Expand Down

0 comments on commit 2cb604a

Please sign in to comment.