 yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
10 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
10 years ago |
 cxt
|
f5122d7ef0
|
微信url切换到正式版
|
10 years ago |
|
cxt
|
59f49f586b
|
上线测试版
|
10 years ago |
 huang
|
04849659de
|
版本库统计
|
10 years ago |
|
cxt
|
2898805aa7
|
回复的模板消息
|
10 years ago |
|
cxt
|
275895f805
|
模板消息的重构
|
10 years ago |
guange
|
73ad787e23
|
修改到正式版
|
10 years ago |
|
guange
|
cadb5f3f15
|
更换服务器至test.course.trustie.net
|
10 years ago |
|
huang
|
5b744093af
|
回复application编码问题代码
|
10 years ago |
|
huang
|
9fa50e0452
|
编码问题
|
10 years ago |
|
huang
|
b5ced6eda9
|
编码问题
|
10 years ago |
|
guange
|
aa9cb4e579
|
merge
|
10 years ago |
|
guange
|
619b07b5c2
|
服务器上调试openid成功
|
10 years ago |
|
guange
|
bb5a527f9e
|
配置新菜单
|
10 years ago |
|
guange
|
ae08031440
|
开放跨域
|
10 years ago |
|
guange
|
1926f0ba53
|
修改openid路由
|
10 years ago |
|
huang
|
86aecd21b9
|
上传图片
|
10 years ago |
|
huang
|
10371e8bdd
|
添加附件图片功能
|
10 years ago |
 Yiang Gan
|
392c5708f2
|
作业详情页面
|
10 years ago |
|
cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
10 years ago |
|
Yiang Gan
|
1c5b22abf4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Yiang Gan
|
f23c0e7602
|
最新动态修改
|
10 years ago |
|
guange
|
b30fad723d
|
菜单更新
|
10 years ago |
 Tim
|
77e11fe0fe
|
微信最新动态修改
|
10 years ago |
|
Yiang Gan
|
6dc374cf9a
|
最新动态
|
10 years ago |
|
guange
|
91d49e3028
|
添加附加环境模板
|
10 years ago |
|
guange
|
46d5767a6a
|
去掉elasticsearch多台部署，只要一台即可
|
10 years ago |
|
cxt
|
c8142b3ee5
|
作业api
|
10 years ago |
|
Yiang Gan
|
4de598873f
|
动态和作业的api
|
10 years ago |
|
Tim
|
406bb7930c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/javascripts/wechat/wechat-dev.js
|
10 years ago |
|
guange
|
60931dde6a
|
添加获取openid的功能
|
10 years ago |
|
Tim
|
4f7d698076
|
wechat init
|
10 years ago |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
10 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
10 years ago |
|
guange
|
6ae4cd0767
|
merge
|
10 years ago |
 linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
guange
|
59923dfb03
|
merge
|
10 years ago |
 ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
linchun
|
52af5e4303
|
修复了管理员界面多个列表的题目问题
|
10 years ago |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
10 years ago |
|
linchun
|
d3ed89d87e
|
sort
|
10 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
guange
|
24a278d7d6
|
加上atall
|
10 years ago |
|
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
10 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
10 years ago |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
|
linchun
|
3c66a29767
|
完善课程资源列表，完成项目资源列表
|
10 years ago |
|
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
10 years ago |
|
huang
|
de1c2e18c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
4f3055c990
|
讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。
|
10 years ago |
|
huang
|
bbbf13084e
|
修改搜索功能，页面跳转
|
10 years ago |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
10 years ago |
|
cxt
|
6416b01037
|
课程里的“课程作业”改为“作业”
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 years ago |
|
guange
|
79004e1328
|
修改绑定流程
|
10 years ago |
|
huang
|
5fd36c0e78
|
课程、项目、组织资源导入
|
10 years ago |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
10 years ago |
|
huang
|
21244a5657
|
资源库导入功能
|
10 years ago |
|
guange
|
c33b35383d
|
修改菜单
|
10 years ago |
|
guange
|
d5e8945619
|
修改菜单
|
10 years ago |
|
guange
|
445bae6de9
|
patch mysql5.7的create table
|
10 years ago |
|
guange
|
a7220a535e
|
修改wechat配置
|
10 years ago |
|
guange
|
8f5645e5c1
|
修改wechat配置
|
10 years ago |
|
guange
|
15d5fe127e
|
merge
|
10 years ago |
|
guange
|
a83cb2a1fa
|
merge
|
10 years ago |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
e3e2c37f12
|
超级管理员的最近登录用户列表添加老师列表
|
10 years ago |
 newuser
|
d747ec854d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
10 years ago |
|
huang
|
40fb140b6d
|
版本库提交记录diff信息
|
10 years ago |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
d2267106c2
|
修复team.trustie.net的侧栏点击后没有显示栏目内容的问题
|
10 years ago |
|
cxt
|
a2e60944be
|
已发布资源的延期发布
|
10 years ago |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
10 years ago |
|
guange
|
eed6250145
|
secdomain问题
|
10 years ago |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
28035dfc47
|
子域名处理
|
10 years ago |
|
guange
|
bb0ff4a14c
|
elasticsearch在开发环境下的补丁,默认不开启
|
10 years ago |
|
ouyangxuhua
|
7b56dc7f8e
|
管理员界面，解决编辑组织报错的问题
|
10 years ago |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
10 years ago |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
10 years ago |
|
ouyangxuhua
|
280f679b0c
|
1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项
|
10 years ago |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
10 years ago |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
10 years ago |
|
huang
|
83ff449946
|
项目、课程资源 浏览 改成 上传文件
|
10 years ago |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
10 years ago |
|
ouyangxuhua
|
d7b17b455d
|
Merge branch 'szzh' into develop
|
10 years ago |
|
ouyangxuhua
|
5e72734bee
|
增加3个url定制路由
|
10 years ago |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
10 years ago |
|
huang
|
ff475fb00b
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
10 years ago |
|
huang
|
7de48f143e
|
issue状态修改
|
10 years ago |
|
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
10 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
10 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
10 years ago |
|
guange
|
96d0b2e717
|
绑定用户事件
|
10 years ago |
|
guange
|
9f667588c4
|
添加菜单
|
10 years ago |
|
ouyangxuhua
|
909e0e846b
|
路由配置问题
|
10 years ago |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
10 years ago |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
10 years ago |
|
ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
10 years ago |
|
guange
|
080cc71912
|
wechat 路由修改
|
10 years ago |
|
guange
|
5f6a3cac04
|
wechat init
|
10 years ago |
|
guange
|
744b246930
|
配置修改
|
10 years ago |
|
guange
|
b68eab23ea
|
merge
|
10 years ago |
|
guange
|
587d347178
|
added wechat
|
10 years ago |
|
huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
huang
|
18bc8215e3
|
路由冲突
|
10 years ago |
|
guange
|
c8b52db6f9
|
merge
|
10 years ago |
|
guange
|
c298adda7c
|
子域名路由实现
|
10 years ago |
|
huang
|
71e155d83a
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
10 years ago |
|
ouyangxuhua
|
3697d74d48
|
子域名路由配置
|
10 years ago |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 years ago |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
10 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
10 years ago |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
10 years ago |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
10 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
10 years ago |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
10 years ago |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
6a9dc43d03
|
版权修改、issue编辑
|
10 years ago |
|
ouyangxuhua
|
5eceb3d841
|
解决一些bug; 增加已设为首页标签
|
10 years ago |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
10 years ago |
|
huang
|
e56382a899
|
tag云ajax更新后自动刷新
|
10 years ago |
|
cxt
|
05f822a5c2
|
导出在线测验成绩列表
|
10 years ago |
|
ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
10 years ago |
|
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
10 years ago |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
dab3f0d225
|
为组织1添加子域名：team
|
10 years ago |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
10 years ago |
|
huang
|
680e861620
|
项目资源搜索功能
|
10 years ago |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
|
cxt
|
9b974b6170
|
Merge branch 'cxt_course' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
7e76a32480
|
项目/课程讨论区的动态增加设置菜单
|
10 years ago |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
10 years ago |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
10 years ago |
|
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
b7eda83def
|
历史资源功能
|
10 years ago |
