Merge branch 'master' of gitlab.com:lilcity/backend into feature/LIL-701

remotes/origin/editis_13-01-19
gzbender 7 years ago
commit e41cc38044
  1. 2
      project/settings.py
  2. 8
      web/src/components/blocks/BlockImageText.vue

@ -252,7 +252,7 @@ CELERY_BEAT_SCHEDULE = {
},
'send_certificates': {
'task': 'apps.notification.tasks.send_certificates',
'schedule': crontab(hour=19),
'schedule': crontab(minute=0, hour=19),
'args': (),
},
'sendgrid_update_recipients': {

@ -27,11 +27,7 @@
</div>
<div class="kit__field field">
<div class="field__wrap">
<textarea class="field__textarea field__textarea_sm"
placeholder="Описание"
:value="text"
v-autosize="text"
@change="onTextChange"></textarea>
<vue-redactor :value="text" v-on:update:value="onTextChange" placeholder="Описание"/>
</div>
</div>
</div>
@ -41,6 +37,7 @@
<script>
import LilImage from "./Image";
import VueRedactor from '../redactor/VueRedactor';
export default {
name: "block-image-text",
@ -64,6 +61,7 @@
},
components: {
'lil-image': LilImage,
'vue-redactor': VueRedactor,
},
}
</script>

Loading…
Cancel
Save