Merge pull request #3225 from appwrite/fix-0-14-review
fix: 0.14.x review
This commit is contained in:
commit
60ca400f05
|
@ -208,9 +208,9 @@ $cli
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Console::log("Running \"docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes\"");
|
Console::log("Running \"docker compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes\"");
|
||||||
|
|
||||||
$exit = Console::execute("${env} docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
|
$exit = Console::execute("${env} docker compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
|
||||||
|
|
||||||
if ($exit !== 0) {
|
if ($exit !== 0) {
|
||||||
$message = 'Failed to install Appwrite dockers';
|
$message = 'Failed to install Appwrite dockers';
|
||||||
|
|
|
@ -420,12 +420,11 @@ sort($patterns);
|
||||||
|
|
||||||
<h1>STDOUT</h1>
|
<h1>STDOUT</h1>
|
||||||
|
|
||||||
<div class="margin-bottom ide" data-ls-if="({{execution.stdout.length}})">
|
<div class="margin-bottom ide" data-ls-if="({{execution.response.length}})">
|
||||||
<pre data-ls-bind="{{execution.stdout}}"></pre>
|
<pre data-ls-bind="{{execution.response}}"></pre>
|
||||||
<!-- <input type="hidden" data-ls-bind="{{execution.stdout}}" data-forms-code="bash" /> -->
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="margin-bottom" data-ls-if="(!{{execution.stdout.length}})">
|
<div class="margin-bottom" data-ls-if="(!{{execution.response.length}})">
|
||||||
<p>No output was logged.</p>
|
<p>No output was logged.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -636,12 +635,12 @@ sort($patterns);
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</select>
|
</select>
|
||||||
<div x-show="hasResource">
|
<div x-show="hasResource">
|
||||||
<label x-text="'Select ' + resourceName + ' (optional)'" for="resource"></label>
|
<label x-text="resourceName + ' (optional)'" for="resource"></label>
|
||||||
<input id="resource" type="text" :placeholder="resourceName" x-model="resource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
|
<input id="resource" type="text" :placeholder="resourceName" x-model="resource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
|
||||||
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
|
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
|
||||||
</div>
|
</div>
|
||||||
<div x-show="hasSubResource">
|
<div x-show="hasSubResource">
|
||||||
<label x-text="'Select ' + subResourceName + ' (optional)'" for="subResource"></label>
|
<label x-text="subResourceName + ' (optional)'" for="subResource"></label>
|
||||||
<input id="subResource" type="text" :placeholder="subResourceName" x-model="subResource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
|
<input id="subResource" type="text" :placeholder="subResourceName" x-model="subResource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
|
||||||
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
|
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -339,9 +339,9 @@
|
||||||
data-service="users.getMemberships"
|
data-service="users.getMemberships"
|
||||||
data-name="memberships"
|
data-name="memberships"
|
||||||
data-param-user-id="{{router.params.id}}"
|
data-param-user-id="{{router.params.id}}"
|
||||||
data-event="load,users.update">
|
data-event="load,users.update,teams.deleteMembership">
|
||||||
|
|
||||||
<div class="box margin-top margin-bottom" data-ls-if="{{memberships.length}} === 0" style="display: none" class="margin-top-xxl margin-bottom-xxl text-align-center">
|
<div class="box margin-top margin-bottom" data-ls-if="{{memberships.memberships.length}} === 0" style="display: none" class="margin-top-xxl margin-bottom-xxl text-align-center">
|
||||||
<h3 class="text-bold margin-bottom-no">No memberships available.</h3>
|
<h3 class="text-bold margin-bottom-no">No memberships available.</h3>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -367,7 +367,7 @@
|
||||||
data-failure-param-alert-text="Failed to Remove Member"
|
data-failure-param-alert-text="Failed to Remove Member"
|
||||||
data-failure-param-alert-classname="error">
|
data-failure-param-alert-classname="error">
|
||||||
|
|
||||||
<input name="teamId" data-ls-attrs="id={{membership.$id}}" type="hidden" data-ls-bind="{{router.params.id}}">
|
<input name="teamId" data-ls-attrs="id=leave-teamId-{{membership.teamId}}" type="hidden" data-ls-bind="{{membership.teamId}}">
|
||||||
<input name="membershipId" data-ls-attrs="id=leave-membershipId-{{membership.$id}}" type="hidden" data-ls-bind="{{membership.$id}}">
|
<input name="membershipId" data-ls-attrs="id=leave-membershipId-{{membership.$id}}" type="hidden" data-ls-bind="{{membership.$id}}">
|
||||||
|
|
||||||
<button class="danger">Remove</button>
|
<button class="danger">Remove</button>
|
||||||
|
|
|
@ -178,12 +178,12 @@ sort($patterns);
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</select>
|
</select>
|
||||||
<div x-show="hasResource">
|
<div x-show="hasResource">
|
||||||
<label x-text="'Select ' + resourceName + ' (optional)'" for="resource"></label>
|
<label x-text="resourceName + ' (optional)'" for="resource"></label>
|
||||||
<input id="resource" type="text" :placeholder="resourceName" x-model="resource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
|
<input id="resource" type="text" :placeholder="resourceName" x-model="resource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
|
||||||
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
|
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
|
||||||
</div>
|
</div>
|
||||||
<div x-show="hasSubResource">
|
<div x-show="hasSubResource">
|
||||||
<label x-text="'Select ' + subResourceName + ' (optional)'" for="subResource"></label>
|
<label x-text="subResourceName + ' (optional)'" for="subResource"></label>
|
||||||
<input id="subResource" type="text" :placeholder="subResourceName" x-model="subResource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
|
<input id="subResource" type="text" :placeholder="subResourceName" x-model="subResource" maxlength="36" pattern="^[a-zA-Z0-9][a-zA-Z0-9_-]{0,35}$">
|
||||||
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
|
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Leave empty for wildcard</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -480,6 +480,11 @@ services:
|
||||||
- _APP_REDIS_PORT
|
- _APP_REDIS_PORT
|
||||||
- _APP_REDIS_USER
|
- _APP_REDIS_USER
|
||||||
- _APP_REDIS_PASS
|
- _APP_REDIS_PASS
|
||||||
|
- _APP_DB_HOST
|
||||||
|
- _APP_DB_PORT
|
||||||
|
- _APP_DB_SCHEMA
|
||||||
|
- _APP_DB_USER
|
||||||
|
- _APP_DB_PASS
|
||||||
- _APP_MAINTENANCE_INTERVAL
|
- _APP_MAINTENANCE_INTERVAL
|
||||||
- _APP_MAINTENANCE_RETENTION_EXECUTION
|
- _APP_MAINTENANCE_RETENTION_EXECUTION
|
||||||
- _APP_MAINTENANCE_RETENTION_ABUSE
|
- _APP_MAINTENANCE_RETENTION_ABUSE
|
||||||
|
|
|
@ -72,8 +72,7 @@ class Certificate extends Event
|
||||||
return Resque::enqueue($this->queue, $this->class, [
|
return Resque::enqueue($this->queue, $this->class, [
|
||||||
'project' => $this->project,
|
'project' => $this->project,
|
||||||
'domain' => $this->domain,
|
'domain' => $this->domain,
|
||||||
'validateTarget' => $this->validateTarget,
|
'skipRenewCheck' => $this->skipRenewCheck
|
||||||
'validateCNAME' => $this->validateCNAME
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue