 cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
2016-02-22 18:10:20 +08:00 |
 huang
|
3fda270a66
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-02-20 16:58:20 +08:00 |
|
huang
|
212b37ef84
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-20 16:19:53 +08:00 |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
2016-02-20 16:19:35 +08:00 |
|
cxt
|
e04e80d64d
|
跨越多个学期的课程学期的显示
|
2016-02-20 16:18:28 +08:00 |
 guange
|
2cf253a26b
|
复制课程图片出错
|
2016-02-04 17:30:49 +08:00 |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-02 15:57:23 +08:00 |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-02-02 15:51:49 +08:00 |
|
guange
|
d6e248805f
|
changeset_num nil问题
|
2016-02-02 11:37:48 +08:00 |
 ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-01 10:14:04 +08:00 |
|
guange
|
71778ba948
|
拷贝课程图标
|
2016-01-29 22:10:04 +08:00 |
|
ouyangxuhua
|
45bf2ef88a
|
Merge branch 'develop' into dev_hjq
|
2016-01-29 19:00:15 +08:00 |
|
ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新
|
2016-01-29 18:11:16 +08:00 |
|
cxt
|
8358140c87
|
问题跟踪目标版本字体修改
|
2016-01-29 17:02:25 +08:00 |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
2016-01-29 16:55:07 +08:00 |
|
cxt
|
e9a7f6f826
|
导出学生作业成绩列表
|
2016-01-29 11:02:57 +08:00 |
|
cxt
|
af7ca36c92
|
学生加入课程或退出课程
|
2016-01-26 15:59:39 +08:00 |
|
huang
|
154417378e
|
精品课程默认推荐
|
2016-01-24 10:58:58 +08:00 |
|
huang
|
49d0d214de
|
精品课程默认排序
|
2016-01-24 08:48:38 +08:00 |
|
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
2016-01-22 18:00:01 +08:00 |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-22 17:29:33 +08:00 |
|
huang
|
2947ff8997
|
精品课程数据迁移
|
2016-01-22 16:46:23 +08:00 |
|
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
2016-01-22 15:17:11 +08:00 |
|
huang
|
edd198e91f
|
issue刷新
|
2016-01-22 14:21:17 +08:00 |
|
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
|
2016-01-21 16:10:29 +08:00 |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
2016-01-20 17:05:28 +08:00 |
|
huang
|
f3b5f4e5f7
|
修改浏览器tab页通过不同的模块展示不同内容
|
2016-01-20 16:58:41 +08:00 |
|
huang
|
0db69e1ebf
|
解决课程导语时间和课程创建动态时间一致的问题
|
2016-01-20 16:32:47 +08:00 |
|
huang
|
c5d935108e
|
完成课程按tag搜索推荐
|
2016-01-20 15:59:30 +08:00 |
|
huang
|
18c3c23d2c
|
课程推荐
|
2016-01-20 15:43:33 +08:00 |
|
cxt
|
b64fc1771d
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-20 09:27:29 +08:00 |
|
ouyangxuhua
|
d0c2eabddd
|
未登陆情况下，也能下载组织下的文件
|
2016-01-19 16:42:10 +08:00 |
|
huang
|
5862c16c68
|
完成精品课程推荐
过滤掉私有课程
过滤掉已删除的课程
|
2016-01-18 17:36:18 +08:00 |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
2016-01-18 15:48:26 +08:00 |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
2016-01-18 10:16:29 +08:00 |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
2016-01-18 10:13:31 +08:00 |
|
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
|
2016-01-15 15:42:36 +08:00 |
|
huang
|
86516df88a
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
2016-01-15 15:41:02 +08:00 |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
2016-01-14 15:02:30 +08:00 |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-14 14:40:13 +08:00 |
|
huang
|
49d456bf21
|
修改数据统计信息
|
2016-01-14 14:32:19 +08:00 |
|
huang
|
4b26e77478
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/models/issue.rb
app/models/message.rb
app/models/news.rb
处理冲突
|
2016-01-13 16:28:00 +08:00 |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
2016-01-13 16:15:46 +08:00 |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
2016-01-13 15:29:29 +08:00 |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
2016-01-13 15:17:13 +08:00 |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
2016-01-12 15:53:15 +08:00 |
|
huang
|
83881766b2
|
提交总数接口获取修改
|
2016-01-12 11:01:58 +08:00 |
|
cxt
|
a93539da5e
|
课程学期往前推一个学期
|
2016-01-11 11:07:03 +08:00 |
|
huang
|
8c10ce6fee
|
修改组织500问题
|
2016-01-08 21:47:42 +08:00 |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-08 18:11:54 +08:00 |