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

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#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.13-yc

2.5.15

2.5.15-yc

2.5.16

2.5.16-yc

2.5.16-yy

2.5.17-yy

2.5.19

2.5.20

2.5.21

2.5.5

2.5.7

2.5.9

Mono Color

• 1bafc24025 Merge pull request 'lyc-dev' (#242) from lyc-dev into main main lyc 2025-02-21 17:30:29 +0800
• 2797313612 冲突 lyc-dev lyc 2025-02-21 17:29:40 +0800
• e007c30235 修复一些问题 lyc 2025-02-21 17:27:39 +0800
• f39d327468 Merge branch 'main' into zouyf_dev zouyf_dev “zouyf” 2025-02-21 17:27:17 +0800
• 60b17dc1f7 1 “zouyf” 2025-02-21 17:27:02 +0800
• 3675de66f5 处理冲突 lyc 2025-02-21 16:55:53 +0800
• a679a8fc44 Merge remote-tracking branch 'origin/main' 2.5.21 朱浩 2025-02-21 16:42:12 +0800
• 5d7dc6fc80 文件上传插件开发 朱浩 2025-02-21 16:42:01 +0800
• c812eaee5f 修复一些问题 lyc 2025-02-21 16:38:41 +0800
• 084da1f68d Merge pull request 'fix：作业管理分值问题；' (#241) from yws_dev into main yangws 2025-02-21 16:01:01 +0800
• 7c377e0eaa fix：作业管理分值问题； yws_dev 小杨 2025-02-21 16:00:30 +0800
• d954c88ec5 edit lyc 2025-02-21 00:15:20 +0800
• a708eb59b5 edit lyc 2025-02-20 17:27:59 +0800
• f02f6a8384 edit：模型模板 lyc 2025-02-19 17:28:59 +0800
• 95d2059b9b 版本升级 2.5.20 朱浩 2025-02-19 16:59:34 +0800
• f238e37fdd 版本升级 朱浩 2025-02-19 16:59:16 +0800
• 03897d2aa5 Merge remote-tracking branch 'origin/main' 朱浩 2025-02-19 16:55:38 +0800
• a01d7f08da Merge pull request 'fix：空格问题；' (#240) from yws_dev into main yangws 2025-02-19 16:27:50 +0800
• 055746144d fix：空格问题； 小杨 2025-02-19 16:27:25 +0800
• 06a2697ec2 Merge pull request 'fix：修改rootid；' (#239) from yws_dev into main yangws 2025-02-19 16:25:48 +0800
• fd43dde733 fix：修改rootid； 小杨 2025-02-19 16:25:22 +0800
• 870ffb167a edit bookld lyc 2025-02-19 16:18:36 +0800
• 0960599c73 Merge remote-tracking branch 'origin/main' 朱浩 2025-02-19 10:35:22 +0800
• a5579d4091 版本升级 朱浩 2025-02-19 10:35:11 +0800
• d5c17eb17f Merge pull request 'zouyf_dev' (#238) from zouyf_dev into main 2.5.19 zouyf 2025-02-19 10:31:40 +0800
• f5c9cdc9de Merge branch 'main' into zouyf_dev “zouyf” 2025-02-19 10:27:22 +0800
• b5f43f1a37 去掉无自主试题的提示 “zouyf” 2025-02-19 10:27:04 +0800
• e27f7e0018 edit lyc 2025-02-18 17:32:10 +0800
• df906c52f6 Merge pull request 'zxl' (#237) from zxl into main zhangxuelin 2025-02-18 17:04:57 +0800
• 7a64625567 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl zxl zhangxuelin 2025-02-18 17:04:22 +0800
• f033155cc1 修改音频上传 zhangxuelin 2025-02-18 17:04:01 +0800
• b3b1dde262 Merge remote-tracking branch 'origin/main' 朱浩 2025-02-17 09:37:19 +0800
• cbb3971c9b 版本升级 朱浩 2025-02-17 09:37:10 +0800
• 327e7d78ad Merge branch 'main' into lyc-dev lyc 2025-02-17 09:30:08 +0800
• e97ff8e147 修复一些问题 lyc 2025-02-16 23:13:30 +0800
• 38227cc282 Merge pull request 'zdg_dev' (#236) from zdg_dev into main baigl zhengdegang 2025-02-14 16:36:32 +0800
• 433161ef13 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev zdg_dev zdg 2025-02-14 16:35:37 +0800
• 0b2ed540b8 修复 1.上课视频无法控制 2.ppt导入图片远程上传异常 zdg 2025-02-14 16:35:28 +0800
• 0af53f82f0 Merge pull request '新增学校管理展示判断' (#235) from zxl into main zhangxuelin 2025-02-13 14:33:47 +0800
• 38df362a86 新增学校管理展示判断 zhangxuelin 2025-02-13 14:32:35 +0800
• 0beae0b035 打字机效率变更 朱浩 2025-02-13 14:25:18 +0800
• 159cb75ca9 Merge remote-tracking branch 'origin/main' 朱浩 2025-02-11 16:41:09 +0800
• c69bc91185 去除32位打包兼容 朱浩 2025-02-11 16:41:02 +0800
• 66bc555445 思维导图插件,酉阳版本升级 朱浩 2025-02-11 16:40:16 +0800
• 5b10c4b5d5 Merge pull request 'zdg_dev' (#234) from zdg_dev into main 2.5.17-yy zhengdegang 2025-02-11 14:31:17 +0800
• 3032e2fb3a ppt导入-解析过程中增加关闭功能 zdg 2025-02-11 14:30:22 +0800
• 35d8bdf13f 思维导图插件 朱浩 2025-02-10 17:14:25 +0800
• 6f3ffc45cf Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev zdg 2025-02-10 16:05:56 +0800
• 89307e5d71 修复onse 课件重复打开 zdg 2025-02-10 16:05:41 +0800
• cf80e50b62 Merge pull request 'zouyf_dev' (#233) from zouyf_dev into main zouyf 2025-02-10 15:17:40 +0800
• 4ffe428523 Merge branch 'main' into zouyf_dev “zouyf” 2025-02-10 15:08:58 +0800
• 6d624e67d8 1 “zouyf” 2025-02-10 15:08:32 +0800
• 28be505dc1 BUG修复 朱浩 2025-02-10 10:55:55 +0800
• ba1a4a3abe Merge branch 'lyc-dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into lyc-dev lyc 2025-01-25 02:50:30 +0800
• b31e975efd Merge remote-tracking branch 'origin/main' 朱浩 2025-01-21 14:23:33 +0800
• 8d85ad6ab6 Merge pull request 'fix：默认图片问题；' (#232) from yws_dev into main yangws 2025-01-21 14:23:21 +0800
• 3c0e7777f8 fix：默认图片问题； 小杨 2025-01-21 14:22:56 +0800
• a73a409776 Merge pull request 'zdg_dev' (#231) from zdg_dev into main zhengdegang 2025-01-21 14:16:10 +0800
• b6d1e03201 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev zdg 2025-01-21 14:15:25 +0800
• 8d8b8d223c ppt上传 zdg 2025-01-21 14:15:15 +0800
• 083fdba962 Merge remote-tracking branch 'origin/main' 朱浩 2025-01-21 14:01:09 +0800
• 681b5f7923 思维导图 朱浩 2025-01-21 13:11:29 +0800
• fabffc2363 新增base64图片直接导出 朱浩 2025-01-21 12:49:41 +0800
• 57d0885df7 思维导图插件图标 朱浩 2025-01-21 12:49:18 +0800
• 45f03977b3 更新图标 朱浩 2025-01-21 12:48:55 +0800
• f47f305dc9 Merge pull request 'zdg_dev' (#230) from zdg_dev into main zhengdegang 2025-01-21 12:35:32 +0800
• 95fcd2445e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev zdg 2025-01-21 12:32:48 +0800
• 4af2b5fc3a 优化pptx识别 母版加载等 zdg 2025-01-21 12:24:24 +0800
• 92170da77d 1 “zouyf” 2025-01-20 17:28:01 +0800
• 24b2d08617 Merge branch 'main' into zouyf_dev “zouyf” 2025-01-20 16:11:04 +0800
• 28294d0a25 [科学实验] - 更改学段学科选择方式 “zouyf” 2025-01-20 16:10:51 +0800
• f5779a82fd Merge branch 'main' into lyc-dev 朱浩 2025-01-20 14:59:42 +0800
• 91e9468f41 Merge remote-tracking branch 'origin/main' 朱浩 2025-01-20 14:58:41 +0800
• 16100d1ffa 去除省份地址包 朱浩 2025-01-20 14:56:47 +0800
• a368925887 Merge pull request 'fix:默认头像问题；' (#228) from yws_dev into main yangws 2025-01-20 14:27:22 +0800
• 9d29238017 fix:默认头像问题； 小杨 2025-01-20 14:26:50 +0800
• 2c90e96c5f 去除省份地址包 朱浩 2025-01-20 10:14:05 +0800
• 90aafaba10 去除IM包 朱浩 2025-01-20 09:56:29 +0800
• 57af105c90 edit lyc 2025-01-20 09:49:02 +0800
• 1d68bc6534 yy版本 朱浩 2025-01-17 14:50:47 +0800
• 088eac287b Merge remote-tracking branch 'origin/main' 朱浩 2025-01-17 11:11:38 +0800
• 934f561dee yy版本 朱浩 2025-01-17 11:08:35 +0800
• 1326c5dd02 微调 朱浩 2025-01-17 10:36:57 +0800
• 797ac57441 Merge branch 'main' into lyc-dev lyc 2025-01-17 09:57:50 +0800
• c7d9bb087c edit lyc 2025-01-17 09:57:35 +0800
• c56b434b4b Merge branch 'main' into zouyf_dev “zouyf” 2025-01-16 15:22:07 +0800
• ef7fbcfdbe Merge pull request 'baigl' (#227) from baigl into main 2.5.16-yy 2.5.16-yc 2.5.16 baigl 2025-01-16 15:12:38 +0800
• 4af7220d1d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 白了个白 2025-01-16 15:06:03 +0800
• db712d9e1f 作业管理：界面UI调整 白了个白 2025-01-16 15:03:02 +0800
• a793e67a60 Merge pull request '桌面不发消息' (#226) from zxl into main zhangxuelin 2025-01-16 15:01:28 +0800
• 95a80c2b99 桌面不发消息 zhangxuelin 2025-01-16 15:00:24 +0800
• 97405bb73b 自动组卷 白了个白 2025-01-16 14:21:31 +0800
• 58c5a99dd2 Merge branch 'main' into zouyf_dev “zouyf” 2025-01-16 10:45:08 +0800
• 9c2c31e4b7 打印数据屏蔽 朱浩 2025-01-15 16:43:12 +0800
• 121cff7c2b 打印数据屏蔽 朱浩 2025-01-15 16:43:00 +0800
• 2ad1ae4946 打印数据屏蔽 朱浩 2025-01-15 16:42:10 +0800
• f8f0646bde Merge remote-tracking branch 'origin/main' 朱浩 2025-01-15 16:16:55 +0800
• ca6efb4d66 BUG修复 朱浩 2025-01-15 16:16:30 +0800
• d1454a288f Merge pull request 'edit' (#225) from lyc-dev into main lyc 2025-01-15 16:08:25 +0800
• 5ff9a5387a edit lyc 2025-01-15 16:07:47 +0800