guange
|
23a1f84ae7
|
kindeditor js顺序错误
|
10 years ago |
|
guange
|
71ae441bfc
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
10 years ago |
 yutao
|
3b3b8661c8
|
bug#2827:IE浏览器：讨论区：点击回复时，编辑器下面会出现内容不能为空
|
10 years ago |
 sw
|
d23189b933
|
已存在的输入输出测试的name改为测试的id
|
10 years ago |
|
sw
|
02d7215f6f
|
编辑编程作业跳转
|
10 years ago |
|
guange
|
5bdad52e63
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
742506f52b
|
IE8不能提交作业
|
10 years ago |
|
sw
|
ab88156d2f
|
编程作业创建部分值获取
增加、删除编程作业测试结果
样式调整
|
10 years ago |
 huang
|
ed8a134a01
|
text样式调整
|
10 years ago |
|
huang
|
41fb1255a9
|
所有附件实时通知邮件样式修改
|
10 years ago |
|
huang
|
e1b059b3d2
|
上传项目资源添加到邮件按天发送
|
10 years ago |
|
sw
|
61eb3ecc62
|
1、新建作业上一步下一步改为页面刷新
2、下一步路由改为post
|
10 years ago |
|
yutao
|
6cfc5d6a5d
|
...
|
10 years ago |
|
huang
|
f3f0a9847f
|
邮件text页面并不调整
|
10 years ago |
|
sw
|
8f645f840c
|
上一步按钮样式
编程作业部分数据添加
|
10 years ago |
|
yutao
|
e5774f5731
|
bug#2853:谷歌浏览器：课程讨论区：发布带有大图的内容时，没有展开两个字显示。
|
10 years ago |
|
sw
|
df96ece903
|
参数增加编程作业？匿评作业？
|
10 years ago |
|
sw
|
9423f4b45a
|
1、匿评作业改名
2、编程作业静态页面
|
10 years ago |
|
sw
|
44e3daa0d2
|
1、老师新建作业，两类作业的选择
2、编程作业静态页面的添加
|
10 years ago |
|
huang
|
04d4fee17e
|
邮件实时发送：新编辑器格式在邮件中体现
|
10 years ago |
|
huang
|
59dcfcbb1a
|
添加邮件回复（课程通知、项目新闻、缺陷更新回复）页面
|
10 years ago |
|
yutao
|
0434219518
|
...
|
10 years ago |
|
yutao
|
2fd00a1071
|
...
|
10 years ago |
|
yutao
|
f39a98ee68
|
bug#2841:课程讨论区：主题的输入框和描述的编辑器位置应该对齐
|
10 years ago |
|
yutao
|
8ccfcc3d72
|
bug#2847:讨论区：对已发布的帖子进行编辑时，建议在中间用虚线隔开
|
10 years ago |
|
huang
|
014f830b1d
|
添加issue回复邮件发送内容
|
10 years ago |
|
yutao
|
790e1741ab
|
bug#2859:课程留言--二级回复块被挤下来了
|
10 years ago |
|
yutao
|
3b2db627c4
|
...
|
10 years ago |
|
yutao
|
b6f3233318
|
bug#2304:新版项目--wiki：如图，建议修改上传附件显示样式
|
10 years ago |
|
yutao
|
21ff990c65
|
bug#2812:forge主页、course主页搜索建议做成下拉按钮的样式
|
10 years ago |
|
huang
|
b2f7b0f670
|
编辑器（未改动）
|
10 years ago |
|
sw
|
06009934d8
|
编辑新闻无法编辑成功
|
10 years ago |
|
sw
|
1ac206eb74
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
0053930769
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
d62e7218cc
|
项目邀请用户相关问题
|
10 years ago |
|
sw
|
b5dce61c9e
|
作品列表学号为a标签
|
10 years ago |
|
yutao
|
fd5f2d9322
|
...
|
10 years ago |
|
sw
|
3b90bd4770
|
发布作业500
|
10 years ago |
|
sw
|
9df47653b1
|
作品评论时间显示为更新时间，并按更新时间排序
|
10 years ago |
|
sw
|
cc2bd5f7b1
|
作品列表收索时，收索条件内容在课程收索栏
|
10 years ago |
|
sw
|
d302c7ca86
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
e8d9d53bcc
|
bug#2832:讨论区：回复带有图片的内容，在动态查看时，创建时间显示错位。
|
10 years ago |
|
sw
|
4af3a28eab
|
课程首页：加入课程，加入失败继续显示加入课程弹框
|
10 years ago |
|
sw
|
17294ec7ae
|
加入项目：加入失败不关闭加入项目弹框
|
10 years ago |
|
yutao
|
e108f8270e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
29b2018a5a
|
bug#2779:搜索用户结果页面项目后没有冒号，课程后又有冒号，建议统一改为没有冒号
|
10 years ago |
|
huang
|
f5f267839e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
a7086c9208
|
版本库“收起git说面”鼠标经过变成手型
|
10 years ago |
|
sw
|
f2c87f198d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
sw
|
a600d93630
|
111
|
10 years ago |
|
huang
|
3854ef3610
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
2acab1719e
|
修改附件上传上面被截取问题
|
10 years ago |
|
yutao
|
d9157965e9
|
...
|
10 years ago |
|
huang
|
3d53c4930a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
ab64b38cee
|
留言提交之后清除编辑框内容
|
10 years ago |
|
huang
|
5d88de3e6e
|
解决bug：加入项目对齐及注释
|
10 years ago |
|
sw
|
cd7bb85f2f
|
资源列表多了一个c
|
10 years ago |
|
yutao
|
5ac4d2afe3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
482df88d70
|
...
|
10 years ago |
|
huang
|
94877bb353
|
修改版本格式
|
10 years ago |
|
sw
|
1810a3eb41
|
111
|
10 years ago |
|
sw
|
21a9a67bfc
|
移除bid
|
10 years ago |
|
sw
|
418f75fd1f
|
注释无用代码
|
10 years ago |
|
sw
|
90bd3bad58
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
b7c04207e1
|
课程通知评论显示
|
10 years ago |
|
sw
|
c07f66776c
|
课程留言列表，拉长时显示不正确
|
10 years ago |
|
yutao
|
e138292f2a
|
...
|
10 years ago |
|
sw
|
6d8f0e728d
|
课程 作业、通知模块，新版编辑器相关BUG
|
10 years ago |
|
yutao
|
46da84cd81
|
...
|
10 years ago |
|
sw
|
0d6c4a9984
|
Merge branch 'szzh' into develop
|
10 years ago |
|
sw
|
0a09e73042
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
huang
|
4da4d54d92
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
8fc0e3cfe9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
881d66103b
|
去掉注释掉的代码
|
10 years ago |
|
yutao
|
e8369b2f25
|
...
|
10 years ago |
|
sw
|
9938c9f83a
|
课程首页通知不显示附件
|
10 years ago |
|
yutao
|
3c515dd077
|
...
|
10 years ago |
|
yutao
|
f7e0ad9fc3
|
...
|
10 years ago |
|
yutao
|
6929694fb4
|
个人主页留言换编辑器
|
10 years ago |
|
yutao
|
e99206ff4a
|
项目留言换编辑器
|
10 years ago |
|
sw
|
d74edbcf54
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
5c36cf5c9d
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
2a74509fd9
|
邮件显示页面项目括号颜色
|
10 years ago |
|
huang
|
a4f1edcdee
|
更新：wiki项目其它成员可以收到；
项目、课程留言其它成员可以收到
邮件显示页面国际化
|
10 years ago |
|
yutao
|
de3bb64fd9
|
课程讨论区换编辑器
|
10 years ago |
|
sw
|
f956b27953
|
作业积分显示平均分
|
10 years ago |
|
huang
|
7bf4cfd218
|
修改个人留言在按天发送中查询条件
|
10 years ago |
|
huang
|
15697e05ed
|
按天发送中添加项目留言
|
10 years ago |
|
sw
|
5d5159f4c7
|
助教也可在个人首页关闭课程
|
10 years ago |
|
huang
|
c72f522493
|
邮件按天发送中添加wiki
|
10 years ago |
|
sw
|
a5d7c50fe3
|
课程通知展开按钮
|
10 years ago |
|
sw
|
57804a118d
|
课程作业列表中展开按钮
|
10 years ago |
|
sw
|
94e8bd13ab
|
资源作者
|
10 years ago |
|
sw
|
ff159075aa
|
新header课程在项目上面
|
10 years ago |
|
guange
|
25ac0100c7
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
89f71ffa46
|
解决相关资源后的下载图标按钮后就直接预览了，不合适缺陷
|
10 years ago |
|
sw
|
574c7373ec
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
f94c13d0e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
0d9bdae5b0
|
邮件按天发送新界面
|
10 years ago |
|
sw
|
e1636d20d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
918d03d4dd
|
...
|
10 years ago |
|
sw
|
f3dd7c11b6
|
提交问卷答案时样式调整
|
10 years ago |
|
sw
|
4c5d2d5055
|
poll列表界面样式调整，导出功能权限
|
10 years ago |
|
sw
|
857d3d5f62
|
问卷调查结果导出功能
|
10 years ago |
|
sw
|
d29353dd1a
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
05a77caeda
|
去掉讨论区重复及统计数量错误
|
10 years ago |
|
sw
|
da9a607a5b
|
第一次评论后添加附件，评论不刷想
|
10 years ago |
|
sw
|
d477d44d4b
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
sw
|
6a997bace3
|
学生姓名颜色调整
匿评列表学号显示--
|
10 years ago |
|
huang
|
543ae1bbd0
|
修改邀请加入项目逻辑：改成已加入和等待加入
|
10 years ago |
|
huang
|
7e89cd27aa
|
邮件邀请bug修改
|
10 years ago |
|
huang
|
b1ce342b3d
|
修改作业表修改后引起的问题
|
10 years ago |
|
huang
|
a9a79ae70d
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
3b954dfd16
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
c85fd9f7b8
|
处理新作业模块的冲突
|
10 years ago |
|
yutao
|
b4732814e6
|
...
|
10 years ago |
|
huang
|
c62d468ed3
|
修改项目新闻和课程通知冲突
|
10 years ago |
|
huang
|
1f6308b97e
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
bef1917c4e
|
修改异常
|
10 years ago |
|
huang
|
8adb00fccb
|
修改讨论区邮件中样式和编辑不一致问题
|
10 years ago |
|
huang
|
a148c49fa9
|
邮件给出激活账号提示
|
10 years ago |
|
huang
|
54abe5d858
|
没有等待加入的成员则不显示
|
10 years ago |
|
sw
|
412efb28fe
|
点击作业，新打开一个tab页
|
10 years ago |
|
huang
|
a967a86a1d
|
修改邮件500缺陷
|
10 years ago |
|
yutao
|
64251f1093
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
18e41e562a
|
讨论区编辑器加上其他的按钮
|
10 years ago |
|
sw
|
a881343db5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
427553d4e5
|
老师编辑作业、学生编辑作品时删除附件界面没刷新
|
10 years ago |
|
yutao
|
2e7c6c4afb
|
修复bug#2725 :用户搜索--默认用户名和姓名一起匹配
|
10 years ago |
|
sw
|
f466084a17
|
地区没有就不显示了
|
10 years ago |
|
sw
|
9d1100a9df
|
项目内资源选人我的项目关闭按钮
|
10 years ago |
|
sw
|
c31e370ad6
|
课程资源列表：选人我的课程、选入我的其他课程弹出框关闭按钮异常
|
10 years ago |
|
yutao
|
a456616212
|
...
|
10 years ago |
|
sw
|
bf653fa94f
|
课程作品列表搜索功能异常
|
10 years ago |
|
sw
|
7bab135ac7
|
1、上传资源时公开单选框样式
2、课程上传资源文件有下拉条
|
10 years ago |
|
yutao
|
8fcf7ac7a8
|
...
|
10 years ago |
|
yutao
|
4aba7484e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
85682d6bbc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
971755c74a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
yutao
|
cd8f3bdea3
|
...
|
10 years ago |
|
sw
|
1cff2a85e9
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
6886f0fba3
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
395c4635da
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
0c19199be9
|
按天发送中添加项目新闻
|
10 years ago |
|
sw
|
89d15e7673
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
47c7073a94
|
匿评作品不显示学号
|
10 years ago |
|
sw
|
09e014b5f7
|
匿评作品列表界面
|
10 years ago |
|
sw
|
1119840e25
|
作品列表界面
|
10 years ago |
|
yutao
|
aae3dc8a0a
|
...
|
10 years ago |
|
yutao
|
519da71a3b
|
课程讨论区编辑框表情 解决ie浏览器样式问题
|
10 years ago |
|
yutao
|
37347664e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
10 years ago |
|
huang
|
52bbb92c9f
|
课程通知邮件内容显示修改（新编辑器下不能使用）
|
10 years ago |
|
guange
|
36afb4d1f8
|
视频在公共贴吧的帖子回复里发不
|
10 years ago |
|
sw
|
891c22762f
|
1、学生删除作品内文件功能
2、删除附件时提示
3、作品评论框与上一部分的间距
|
10 years ago |
|
sw
|
3183334106
|
作品描述显示增加换行样式
|
10 years ago |
|
sw
|
6b7a60a7e1
|
课程资源列表增加5个像素间隔
|
10 years ago |
|
sw
|
0ff088f96d
|
作品列表增加搜索按钮，取消搜索框手型显示
|
10 years ago |
|
huang
|
c39e0bf3db
|
项目成员邀请添加：
邀请等待
已邀请的成员列表
|
10 years ago |
|
sw
|
aa0dc475aa
|
隐藏迟交扣分和缺评扣分
|
10 years ago |
|
sw
|
b7dbaca15b
|
在学生列表，点击学生积分之后，a标签有下划线
|
10 years ago |
|
guange
|
fb7c65a70d
|
添加下载原始文件链接
|
10 years ago |
|
guange
|
444658d0b3
|
转换变为既时转换
|
10 years ago |
|
sw
|
ae950cf3c0
|
学生评分弹出框缺少关闭按钮
|
10 years ago |
|
sw
|
b822db9995
|
删除增加title
|
10 years ago |
|
sw
|
f168e43b0f
|
1、返还批阅的附件可以删除并且js刷新
2、学生可以在作品show界面删除自己的作业的附件
|
10 years ago |
|
sw
|
d6fb35544e
|
评分作品时提交按钮固定在提交栏的右下角
|
10 years ago |
|
huang
|
e40f1a570e
|
添加邮件邀请成员列表
|
10 years ago |
|
huang
|
9e0a986fe9
|
项目、课程讨论区邮件提醒查询修改
|
10 years ago |
|
sw
|
6992a50f64
|
作品列表学号显示为灰色，取消连接；作品名称显示为绿色，学生姓名靠左对齐
|
10 years ago |
|
sw
|
4e8587ac43
|
作品列表 学号、学生姓名、作品名称增加title
|
10 years ago |
|
sw
|
c869270a27
|
隐藏发布时间、开启匿评时间、关闭匿评时间
|
10 years ago |
|
sw
|
1c4ca0c913
|
导航栏进入课程、项目、个人主页新打开一页
|
10 years ago |
|
sw
|
b2cdcf4bbe
|
课程首页缓存
|
10 years ago |
|
sw
|
84a79ac8e2
|
去掉课程、项目首页缓存
|
10 years ago |
|
sw
|
84e891ebd0
|
作品列表界面作业信息TAB页显示附件
|
10 years ago |
|
sw
|
56c88dfd1d
|
作业列表增加作业附件显示
|
10 years ago |
|
sw
|
0080a216dd
|
匿评评分之后，我耳朵评分显示为黑色
|
10 years ago |
|
sw
|
41db8e9866
|
个人主页 课程报错
|
10 years ago |
|
sw
|
c33af3d4bf
|
课程通知更多按钮
|
10 years ago |
|
sw
|
faeee5bc0d
|
课程搜索报错
|
10 years ago |
|
sw
|
9f03e39e86
|
作业描述大于20行才显示更多按钮
|
10 years ago |
|
sw
|
e6af34e9f8
|
学生列表显示
|
10 years ago |
|
sw
|
b935f50b36
|
课程内作业列表、新建作业等路由关闭，相关页面、方法删除
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
sw
|
bd6a057008
|
老师布置作业加入个人动态
|
10 years ago |
|
sw
|
66c02f0667
|
1、新编辑器增加HomeworkCommon的Type
2、老师创建作业加入老师个人动态
|
10 years ago |
|
huang
|
6cddb59a4a
|
修改邮件提醒：项目缺陷动态不能收到
|
10 years ago |
|
guange
|
e786873061
|
还是缓存问题
|
10 years ago |
|
guange
|
adb21cc617
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
7bbd85f8c2
|
去除首页贴吧回复缓存
|
10 years ago |
 alan
|
70330f0f4b
|
Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
app/views/layouts/_user_project_list.html.erb
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
3967b632b5
|
去除导航的缓存
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
97fe43c8a1
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
f4c1cc839c
|
资源库标签显示错误
|
10 years ago |
|
guange
|
0eace6e598
|
cached导致的个人项目列表问题
|
10 years ago |
|
sw
|
b5dc424714
|
bid超过20行才显示更多按钮
|
10 years ago |
|
sw
|
8dd6bb4afa
|
课程首页公开资料数显示错误
|
10 years ago |
|
sw
|
27314f8b54
|
Merge branch 'memcached_alan' into szzh
|
10 years ago |
