Commit Graph

Select branches

Hide Pull Requests

baigl

cys_dev

lyc-dev

main

yangws_ws

yws_dev

zdg_dev

zouyf_dev

zouyf_tmp

zxl

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

2.5.5

2.5.7

Mono Color

• 11968879d8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev zdg_dev zdg 2024-12-24 11:33:49 +0800
• db86299523 ppt缩略图生成 zdg 2024-12-24 11:32:52 +0800
• c152a3d3ee aippt生成-缩略图 zdg 2024-12-24 11:24:53 +0800
• a366d5d4d6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl zxl zhangxuelin 2024-12-24 11:24:01 +0800
• e0ec22c3ac 替换照片改为线上url zhangxuelin 2024-12-24 11:23:52 +0800
• 9c8872579f Merge pull request 'edit 框架设计' (#173) from lyc-dev into main main lyc-dev lyc 2024-12-24 10:21:42 +0800
• 4f32927b49 edit 框架设计 lyc 2024-12-24 10:21:13 +0800
• e132f3927b Merge pull request 'zxl' (#172) from zxl into main zhangxuelin 2024-12-24 10:07:31 +0800
• c290c170d3 报错后及时回转loading按钮 朱浩 2024-12-24 10:01:34 +0800
• 3867a9603f 报错后及时回转loading按钮 朱浩 2024-12-24 09:58:31 +0800
• f732520d8d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl zhangxuelin 2024-12-24 09:51:31 +0800
• 01fbb9d05c Merge pull request 'lyc-dev' (#171) from lyc-dev into main lyc 2024-12-23 17:02:30 +0800
• 1334becb54 Merge branch 'main' into lyc-dev lyc 2024-12-23 17:01:53 +0800
• c95508ed59 edit 模板 lyc 2024-12-23 17:01:40 +0800
• cf540d73df Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl zhangxuelin 2024-12-23 15:26:47 +0800
• 35bf246975 Merge pull request 'baigl' (#170) from baigl into main baigl 2024-12-23 14:04:52 +0800
• e3c4706880 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl baigl 白了个白 2024-12-23 14:02:24 +0800
• c507331fb5 作业设计：作业类型 tag颜色样式修改 白了个白 2024-12-23 14:01:04 +0800
• abd7be0698 Merge pull request '模板edit' (#169) from lyc-dev into main lyc 2024-12-23 10:45:55 +0800
• 92e8aa64d7 模板edit lyc 2024-12-23 10:45:27 +0800
• f6b08169b6 Merge branch 'main' into zouyf_dev zouyf_dev “zouyf” 2024-12-23 10:11:48 +0800
• 83d3cd5df8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl zhangxuelin 2024-12-23 09:41:19 +0800
• b1407706a8 永川个性化打包 朱浩 2024-12-22 12:15:01 +0800
• 996b4006a2 永川个性化打包 朱浩 2024-12-22 11:46:10 +0800
• 4531533382 大模型顺序问题修改 朱浩 2024-12-21 21:42:07 +0800
• a601a9f8dd Merge remote-tracking branch 'origin/main' 朱浩 2024-12-21 21:40:07 +0800
• 086836e016 Merge pull request '1.pptList 实验室功能' (#168) from zdg_dev into main zhengdegang 2024-12-21 12:17:04 +0800
• acb0231304 1.pptList 实验室功能 2.pplList 批量更新缩略图 zdg 2024-12-21 12:15:58 +0800
• 94e23c3d69 Merge pull request 'baigl' (#167) from baigl into main baigl 2024-12-20 17:19:17 +0800
• ea5ed4b6ac Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 白了个白 2024-12-20 17:18:32 +0800
• 6b45fa61dd 1 白了个白 2024-12-20 17:17:35 +0800
• 7aa75794dc 科学实验：批改优化 白了个白 2024-12-20 17:16:57 +0800
• a2c2c4eec7 Merge remote-tracking branch 'origin/main' 朱浩 2024-12-20 17:14:40 +0800
• 4095390f45 Merge pull request '插入素材' (#166) from cys_dev into main CYS 2024-12-20 17:12:50 +0800
• d75af2636d 插入素材 cys_dev cys 2024-12-20 17:12:07 +0800
• 1983dafbba Merge remote-tracking branch 'origin/main' 朱浩 2024-12-20 16:52:18 +0800
• 6c7284383a 宫格图片插件 朱浩 2024-12-20 16:52:02 +0800
• f7a3aa6e53 科学实验：学科写死 zouyf_tmp 白了个白 2024-12-20 16:37:08 +0800
• 28f79f7ab0 Merge pull request 'baigl' (#165) from baigl into main baigl 2024-12-20 16:07:29 +0800
• 1488d7cc03 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 白了个白 2024-12-20 16:06:55 +0800
• 045b44b833 1 白了个白 2024-12-20 16:06:41 +0800
• b47a3bb63a Merge pull request 'baigl' (#164) from baigl into main baigl 2024-12-20 16:02:49 +0800
• 5e954bab0b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 白了个白 2024-12-20 16:02:07 +0800
• 7322056dad 1 白了个白 2024-12-20 16:01:46 +0800
• 18370129df Merge pull request 'zdg_dev' (#163) from zdg_dev into main zhengdegang 2024-12-20 16:00:48 +0800
• 0bf94af5a3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev zdg 2024-12-20 16:00:14 +0800
• 7b042fd001 ppt上课 工具栏 zdg 2024-12-20 16:00:09 +0800
• 3bf381f5c5 Merge pull request '插入素材' (#162) from cys_dev into main CYS 2024-12-20 15:57:22 +0800
• fb67b16258 插入素材 cys 2024-12-20 15:52:22 +0800
• 016e87277b Merge pull request 'baigl' (#161) from baigl into main baigl 2024-12-20 15:45:01 +0800
• 502c772b46 1 白了个白 2024-12-20 15:42:19 +0800
• 57cd8ea45a 1 白了个白 2024-12-20 15:24:27 +0800
• 8bbd01e2b2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 白了个白 2024-12-20 15:24:02 +0800
• 622a71253f 作业设计：科学实验 白了个白 2024-12-20 15:23:34 +0800
• af60c5cc17 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev “zouyf” 2024-12-20 14:49:02 +0800
• e67756192a Merge branch 'main' into zouyf_dev “zouyf” 2024-12-20 14:48:30 +0800
• a2591c60bc Merge pull request '更新菁优网参数' (#160) from zouyf_tmp into main zouyf 2024-12-20 14:45:40 +0800
• da8d6c4b32 更新菁优网参数 “zouyf” 2024-12-20 14:44:59 +0800
• 73d4ee03ba Merge branch 'main' into zouyf_dev “zouyf” 2024-12-20 14:08:27 +0800
• 8863e05a1a Merge branch 'main' into zouyf_dev “zouyf” 2024-12-20 11:18:03 +0800
• 795c4d82c7 Merge remote-tracking branch 'origin/main' 朱浩 2024-12-20 11:18:00 +0800
• 8e0b9f72d5 宫格图片插件 朱浩 2024-12-20 11:16:44 +0800
• 4ad59a8b4e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 白了个白 2024-12-20 11:15:32 +0800
• 3de2ddb094 作业设计：新增 科学实验作业类型 白了个白 2024-12-20 11:13:37 +0800
• 6dbd140f80 Merge pull request '[作业批改] - 增加科学实验的批改(同常规作业)' (#159) from zouyf_tmp into main zouyf 2024-12-20 11:06:37 +0800
• 7bca2fdc2d [作业批改] - 增加科学实验的批改(同常规作业) “zouyf” 2024-12-20 11:05:22 +0800
• ee96250af2 Merge pull request '隐藏教学工作台' (#158) from lyc-dev into main lyc 2024-12-20 10:57:49 +0800
• 54be3cad4f 隐藏教学工作台 lyc 2024-12-20 10:56:55 +0800
• debd5e1942 Merge branch 'main' into zouyf_dev “zouyf” 2024-12-20 10:27:19 +0800
• 90161e0396 Merge pull request '暂屏蔽-[校本题库, 智能推荐, AI设计作业]' (#157) from zouyf_tmp into main zouyf 2024-12-20 10:27:05 +0800
• 3a6c7dfa47 暂屏蔽-[校本题库, 智能推荐, AI设计作业] “zouyf” 2024-12-20 10:25:30 +0800
• c0e82cd329 Merge pull request 'zdg_dev' (#156) from zdg_dev into main 2.5.7 zhengdegang 2024-12-20 09:45:45 +0800
• e5667fac2d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev zdg 2024-12-20 09:44:02 +0800
• f9bb7ed672 去掉 无用代码 zdg 2024-12-20 09:43:56 +0800
• 0ab34e7aa3 退出登录问题 朱浩 2024-12-20 09:42:28 +0800
• 7751692061 新增宫格查看插件 朱浩 2024-12-20 09:39:20 +0800
• c69ae97a48 Merge remote-tracking branch 'origin/main' 朱浩 2024-12-19 18:42:54 +0800
• 051dbdf4a2 新增宫格查看插件 朱浩 2024-12-19 18:42:35 +0800
• d9b4b5c886 Merge pull request 'pplist' (#155) from zdg_dev into main zhengdegang 2024-12-19 17:34:00 +0800
• bc195e1f51 pplist zdg 2024-12-19 17:33:19 +0800
• ba35677947 Merge pull request 'add:添加实验室;' (#154) from yws_dev into main yangws 2024-12-19 17:27:53 +0800
• 4b393ecec9 add:添加实验室; yws_dev lyc 2024-12-19 16:56:31 +0800
• 2565481306 Merge pull request 'lyc-dev' (#153) from lyc-dev into main lyc 2024-12-19 16:56:31 +0800
• f708e2f741 Merge branch 'main' into lyc-dev lyc 2024-12-19 16:55:52 +0800
• 94276db542 edit lyc 2024-12-19 16:55:37 +0800
• 6ef5d4575e Merge pull request 'zdg_dev' (#152) from zdg_dev into main zhengdegang 2024-12-19 16:49:25 +0800
• dfc10aebbe pptlist公屏上课 zdg 2024-12-19 16:48:43 +0800
• c8b8c21875 Merge branch 'main' into zouyf_dev “zouyf” 2024-12-19 15:51:19 +0800
• c8729a7008 [试题上传] - 兼容优化菁优网题型 “zouyf” 2024-12-19 15:51:06 +0800
• ff6fab0bcc Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev zdg 2024-12-19 11:14:19 +0800
• 45abab7a41 公屏上课 zdg 2024-12-19 11:14:14 +0800
• 6128f267e1 Merge remote-tracking branch 'origin/main' 朱浩 2024-12-19 11:07:27 +0800
• e0a406c497 新增宫格查看插件 朱浩 2024-12-19 11:07:12 +0800
• cebf864b82 Merge pull request '模板修改' (#151) from lyc-dev into main lyc 2024-12-18 17:31:44 +0800
• 0ed69394ef 模板修改 lyc 2024-12-18 17:31:10 +0800
• 0b6039f9d8 Merge pull request '白板按钮图标不显示' (#150) from lyc-dev into main lyc 2024-12-18 17:17:15 +0800
• 627c70d0e1 白板按钮图标不显示 lyc 2024-12-18 17:16:23 +0800
• 64272467a2 ppist里面不显示导入 zhangxuelin 2024-12-18 16:08:19 +0800
• 792ab3284f Merge pull request 'zdg_dev' (#149) from zdg_dev into main zhengdegang 2024-12-18 16:01:31 +0800
• 38a50d18bf 注释 zdg 2024-12-18 16:00:31 +0800