ching/dsite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
114 Commits 3 Branches 3 Tags
Commit Graph

114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ching
d16cfa0ca2 feat(recipe views): 增加菜谱原材料统计接口 
增加菜谱原材料统计接口

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-27 19:41:45 +08:00
Ching
bce303ceab feat(settings): 修改 settings 值 
修改 settings 值

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-27 18:29:29 +08:00
Ching
dc49b8967f feat(gitignore): ignore dump.rdb 
ignore dump.rdb

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-26 21:39:15 +08:00
Ching
d8ceb4db7e feat(utils; dodo): 增加飞书发送消息工具 
增加飞书发送消息工具

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-26 21:31:32 +08:00
Ching
38ed29e210 Merge tag 'vr20220205' into develop 
no message
 2022-02-25 01:22:12 +08:00
Ching
8e6c37198c Merge branch 'release/r20220205' vr20220205 2022-02-25 01:22:12 +08:00
Ching
e5c79047c9 Merge tag 'r2022-02-13' into develop 
no message
 2022-02-13 20:14:03 +08:00
Ching
206b35baec Merge branch 'release/r2022-02-13' 
# Conflicts:
#	recipe/views.py
r2022-02-13 		2022-02-13 20:13:08 +08:00
Ching
e0f3d31b0b Merge branch 'feature/recipe-ingredient-2022-02-12' into develop 2022-02-13 20:10:47 +08:00
Ching
69a55778ec feat(recipe edit page): 编辑菜谱页面增加创建食材功能 
编辑菜谱页面增加创建食材功能

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-13 20:06:31 +08:00
Ching
1c424275f1 feat(recipe edit page): 菜谱编辑页增加添加食材功能 
菜谱编辑页增加添加食材功能

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-13 18:01:51 +08:00
Ching
54819c6861 feat(recipe model；recipe api): 增加 ingredient 和 recipe-ingredient model; 增加相关 API 
增加 ingredient 和 recipe-ingredient model; 增加相关 API

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-13 01:18:02 +08:00
Ching
3b492ee812 feat(recipe list api): recipe list api 按 id 倒序排列 
recipe list api 按 id 倒序排列

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-12 17:40:00 +08:00
Ching
66a6777139 feat(recipe list): 修改菜谱列表中的 tag 颜色，按菜谱类型区分 
修改菜谱列表中的 tag 颜色，按菜谱类型区分

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-12 17:30:56 +08:00
Ching
931fecd152 feat(router): 增加页面 title 
增加页面 title

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-12 16:55:59 +08:00
Ching
306e54bcd5 feat(recipe edit): 修改删除菜谱按钮位置 
修改删除菜谱按钮位置

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-12 15:52:16 +08:00
Ching
aa2f401636 fix(scripts): fix typo 
fix typo

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-11 22:25:47 +08:00
Ching
f44ced4946 feat(scripts): 修复可能导致重复发送图片的问题；修改 logger 位置 
修复可能导致重复发送图片的问题；修改 logger 位置

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-11 22:13:17 +08:00
Ching
1cc841f3cc feat(scripts): 增加 Instagram 同步至 mastodon 脚本 
增加 Instagram 同步至 mastodon 脚本

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-11 21:47:47 +08:00
Ching
cc0c22c68b Merge branch 'develop' of github.com:looching/dsite into develop 2022-02-11 19:54:28 +08:00
Ching
b4b5a0e68a feat(scripts): 增加 instagram 同步 mastodon 脚本 
增加 instagram 同步 mastodon 脚本

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-11 19:53:35 +08:00
Ching
e7a579e168 fix(recipe models): 修复通过嘟嘟创建菜谱时没有设置 status 导致创建失败的问题 
修复通过嘟嘟创建菜谱时没有设置 status 导致创建失败的问题

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-10 22:38:12 +08:00
Ching
b26000205b fix(scripts): 修复 bitwarden 备份数据路径有误的问题 
修复 bitwarden 备份数据路径有误的问题

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-10 22:35:57 +08:00
Ching
1bea995dc1 feat(scripts): 增加将图片转为灰度图的脚本 
增加将图片转为灰度图的脚本

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-10 15:30:30 +08:00
Ching
844ce1bfd5 feat(scripts): 增加 dsite 部署脚本；修复嘟嘟机部署提示有误的问题 
增加 dsite 部署脚本；修复嘟嘟机部署提示有误的问题

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-05 02:23:07 +08:00
Ching
83a3bd193b feat(recipe detail page): 菜谱编辑页增加删除按钮 
菜谱编辑页增加删除按钮

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-05 01:41:03 +08:00
Ching
abce5b18fd feat(recipe api): 增加删除菜谱接口 
增加删除菜谱接口

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-05 00:38:30 +08:00
Ching
1277accf5c feat(scripts): 增加bitwarden备份脚本 
增加bitwarden备份脚本

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-04 16:49:23 +08:00
Ching
9b115417d3 feat(recipe mobile): 修改菜谱后弹出成功提示 
修改菜谱后弹出成功提示

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-03 01:21:24 +08:00
Ching
219e7be4a6 feat(scripts): 增加重启dodo脚本 
增加重启dodo脚本

Signed-off-by: Ching <loooching@gmail.com>
 2022-02-03 00:49:49 +08:00
Ching
86fdc14b56 fix(dodo): 修复 dodo 部署成功消息没发送的问题 
修复 dodo 部署成功消息没发送的问题

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-23 23:38:50 +08:00
Ching
effc93b56d feat(dodo): 增加飞书 dodo 部署逻辑 
增加飞书 dodo 部署逻辑

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-22 21:34:31 +08:00
Ching
f683341f66 style(*.py): use Black as python code formatter 
use Black as python code formatter

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-22 18:02:32 +08:00
Ching
beb10e00a9 feat(recipe): 修改菜谱飞书卡片样式 
修改菜谱飞书卡片样式

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-22 00:01:44 +08:00
Ching
a0fa3ac98c fix(dodo): 修复指令执行后当成嘟嘟发送的问题 
修复指令执行后当成嘟嘟发送的问题

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-21 14:22:22 +08:00
Ching
e51ab984fd fix(dodo): 修复指令识别有误的问题 
修复指令识别有误的问题

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-21 00:54:46 +08:00
Ching
f3c309e38c fix(dodo): fix import error 
fix import error

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-21 00:39:08 +08:00
Ching
c8d5195669 Merge branch 'develop' of git.tunpok.com:ching/dsite into develop 2022-01-21 00:14:39 +08:00
Ching
ea42cef954 feat(dodo): 增加创建菜谱功能 
增加创建菜谱功能

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-21 00:14:30 +08:00
Ching
33631e2b94 fix(dodo): 修复删除嘟文时报错的问题 
修复删除嘟文时报错的问题

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-19 09:35:45 +08:00
Ching
e2ed14784a feat(dodo): [A] 增加飞书机器人部署逻辑 
[A] 增加飞书机器人部署逻辑

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-18 23:05:18 +08:00
Ching
2280fd25c1 feat(week_recipe.vue): [M] add console log for debug 
[M] add console log for debug

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-17 22:29:16 +08:00
Ching
b017b691ee feat(package.json): [M] frontend dependency 
[M] frontend dependency

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-16 13:49:08 +08:00
Ching
3e206522e8 Merge branch 'develop' of git.tunpok.com:ching/dsite into develop 2022-01-16 13:17:33 +08:00
Ching
4a940491fe feat(frontend folder): [M] change vue version 
[M] change vue version

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-16 13:11:31 +08:00
ching
13942425aa modify Jenkinsfile 2022-01-16 01:44:35 +08:00
ching
3f7e61d7dc update Jenkinsfile 2022-01-16 01:32:35 +08:00
Ching
e82ac3ae3d feat(Jenkinsfile): [M] modify file name 
[M] modify file name

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-16 01:11:46 +08:00
Ching
70cccac644 feat(Jenkinsfile): [A] add Jenkinsfile 
[A] add Jenkinsfile

Signed-off-by: Ching <loooching@gmail.com>
 2022-01-16 01:01:32 +08:00
Ching
95f70c1478 Merge branch 'develop' of github.com:looching/dsite into develop 2022-01-15 13:17:25 +08:00