huang
|
09c462ebad
|
资源代码还原
|
9 years ago |
yuanke
|
24b969e781
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
e24470db4c
|
代码测试截取ERROR_MSG时只在编译错误下截取
|
9 years ago |
guange
|
8411a08ddb
|
修改错别字
|
9 years ago |
huang
|
37b93a4595
|
文章回复不能用的问题
|
9 years ago |
huang
|
aef178183c
|
我的资源附件不能删的问题
|
9 years ago |
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
9 years ago |
huang
|
b9e5c77b91
|
资源500问题
|
9 years ago |
cxt
|
695e870a26
|
作品的统计不见了
|
9 years ago |
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
9 years ago |
cxt
|
66c410884f
|
作业是否需要请求分享,只判断了用户是否属于课程,未判断作业创建者的ID,如果用户不在某个课程了,则变成需要自己向自己申请作业,且【我的题库】也不显示自己之前创建的作业了。
|
9 years ago |
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
9 years ago |
huang
|
39d014355b
|
科大名师,和名师列表添加标题
|
9 years ago |
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
huang
|
660cf7ef73
|
名师列表局部搜索
|
9 years ago |
huang
|
0feb1280fd
|
名师更多列表
及相关入口路由
|
9 years ago |
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
9 years ago |
huang
|
f7a888ac3d
|
名师默认创建
|
9 years ago |
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
9 years ago |
huang
|
37ee03374e
|
完成设置名师功能
|
9 years ago |
yuanke
|
6237bcb6cd
|
加个gem 'certified'
|
9 years ago |
yuanke
|
a39702f962
|
图片自动上传,代码测试编译错误过长。
|
9 years ago |
cxt
|
8af0459519
|
首页动态中不应出现已删除的课程动态
|
9 years ago |
cxt
|
582c305a47
|
申请引用过的作业在课程删除后不应该在申请题库中显示
|
9 years ago |
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
9 years ago |
cxt
|
b3782c5d0c
|
合并代码
|
9 years ago |
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
9 years ago |
huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
huang
|
52c8593b09
|
组织教师列表sql优化
|
9 years ago |
cxt
|
d4a35b94f6
|
导出的作品成绩保存为数字格式
|
9 years ago |
huang
|
43f06c0826
|
版本库ZIP下载
|
9 years ago |
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
9 years ago |
cxt
|
5baf467d13
|
作品评分不覆盖
|
9 years ago |
yuanke
|
629591ad00
|
课程、项目列表更新时间取动态表中的
|
9 years ago |
yuanke
|
e502aa7c43
|
KE表格项目问题,自动上传图片做了一点
|
9 years ago |
huang
|
99d9a28828
|
名师榜sql查询
|
9 years ago |
cxt
|
d303a06377
|
首页列表的排序
|
9 years ago |
huang
|
6474444cc7
|
用户连接 id变成用户名
|
9 years ago |
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
9 years ago |
huang
|
fc36e4c01e
|
教师列表
|
9 years ago |
cxt
|
1eb41478b2
|
课程动态和首页动态中的作业动态实现二级回复
|
9 years ago |
cxt
|
644e097dc8
|
定时更新关联项目的作业更新时间
|
9 years ago |
cxt
|
1b309d4bf0
|
时间的比较
|
9 years ago |
cxt
|
7b84c994e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
fc95d048a5
|
作业列表打不开
|
9 years ago |
huang
|
18b70e9dd3
|
上线问题
|
9 years ago |
cxt
|
e03bc42c53
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/words_controller.rb
|
9 years ago |
cxt
|
2a55d8f0c3
|
作业的回复更新作业的updated_at字段
|
9 years ago |
cxt
|
9526962c69
|
翻页时不更新作业动态
|
9 years ago |
cxt
|
b8f7672424
|
项目动态的更新时间更新到作业动态中
|
9 years ago |
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
cxt
|
b0f407aae5
|
去掉导出的作业成绩中的作品描述的html代码
|
9 years ago |
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
9 years ago |
cxt
|
620cc83d4b
|
"从题库选用作业"暂时只提供公共作业和我的作业
|
9 years ago |
cxt
|
10d26f89d9
|
作业列表的二级回复
|
9 years ago |
huang
|
ae298f9b55
|
帖子详情页面添加编辑功能
|
9 years ago |
huang
|
a5be092c16
|
二级目录帖子列表中添加编辑功能
|
9 years ago |
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
9 years ago |
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
huang
|
aefcb78926
|
新base
|
9 years ago |
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
9 years ago |
huang
|
885b6f6092
|
隐藏掉“综合”选项,分页每页显示20个
|
9 years ago |
cxt
|
0fafbffa49
|
项目的更新加到作业的最后更新时间中
|
9 years ago |
huang
|
d0db711449
|
编辑功能
|
9 years ago |
huang
|
02d6186045
|
二级域名讨论帖子添加删除链接
|
9 years ago |
huang
|
e0c011948c
|
二级域名的隐藏和显示
|
9 years ago |
yuanke
|
b82a1c1162
|
讨论区计算回复数的一个BUG
|
9 years ago |
guange
|
72f5f5b795
|
加入组织
|
9 years ago |
huang
|
79cd36f297
|
二级域名排序
|
9 years ago |
guange
|
17282083a6
|
merge
|
9 years ago |
guange
|
88fd2cbfb6
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
9 years ago |
guange
|
dfdd301f2f
|
sso同步登录功能完成
|
9 years ago |
huang
|
6d28d0becd
|
二级域名的删除功能
|
9 years ago |
huang
|
2920f21c95
|
二级域名编辑功能自动刷新
|
9 years ago |
huang
|
d86fec6f03
|
模式6没有内容的显示
|
9 years ago |
huang
|
33bf4fafa6
|
模式4没有内容的显示情况
|
9 years ago |
huang
|
04b2aee166
|
板块一没有图片的显示情况
|
9 years ago |
guange
|
df41f7328f
|
json解析换成rails的
|
9 years ago |
huang
|
2996daef71
|
二级域名局部刷新
|
9 years ago |
guange
|
eaad006d17
|
safe base64
|
9 years ago |
cxt
|
06586f9e4b
|
导出作业成绩中添加作品描述的导出
|
9 years ago |
guange
|
e9834f108a
|
修改pwd
|
9 years ago |
yuanke
|
9dc92fe817
|
列表优化
|
9 years ago |
guange
|
ff23df4f12
|
oss之前不用检验登录
|
9 years ago |
cxt
|
6c184b9248
|
题库的分享请求
|
9 years ago |
huang
|
8dfe95dfd1
|
配置页面新建二级域名样式
|
9 years ago |
guange
|
e8adcf8cc7
|
添加sso model
|
9 years ago |
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
9 years ago |
guange
|
0635c1e98b
|
添加单点登录controller
|
9 years ago |
cxt
|
467af47386
|
私有题库的作业详情页面不显示
|
9 years ago |
huang
|
578982faba
|
subdomain 404跳转
|
9 years ago |
yuanke
|
411ae6f89e
|
1.修改贴吧分页显示问题2列表优化
|
9 years ago |
huang
|
fd543828ac
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/controllers/sub_document_comments_controller.rb
app/views/sub_document_comments/_show_newstyle.html.erb
app/views/sub_document_comments/show.html.erb
|
9 years ago |
huang
|
557e731343
|
模式二添加回复功能,模式一回复超过三行则隐藏
|
9 years ago |
cxt
|
70910c5238
|
“我的作业”中不应出现已删除课程的作业
|
9 years ago |
Tim
|
399f757811
|
0
|
9 years ago |
huang
|
39dd62580a
|
完成2级目录详情页面
|
9 years ago |
huang
|
a9059c4c2e
|
帖子添加编辑删除功能
|
9 years ago |