 cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
2016-01-29 15:45:47 +08:00 |
|
cxt
|
b5cf138f43
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/student_work/_programing_work_show.html.erb
db/schema.rb
|
2016-01-29 15:44:26 +08:00 |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
2016-01-29 15:37:03 +08:00 |
|
cxt
|
e9a7f6f826
|
导出学生作业成绩列表
|
2016-01-29 11:02:57 +08:00 |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
2016-01-28 16:27:46 +08:00 |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
2016-01-28 09:51:05 +08:00 |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
2016-01-27 17:26:57 +08:00 |
 ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突
|
2016-01-27 15:29:15 +08:00 |
 guange
|
d8ef2f0965
|
个人留言中的at启用
|
2016-01-26 18:24:15 +08:00 |
|
cxt
|
19003f27fc
|
课程添加is_copy属性
|
2016-01-26 15:05:45 +08:00 |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
2016-01-26 11:17:55 +08:00 |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
2016-01-26 11:05:25 +08:00 |
|
ouyangxuhua
|
dda64245b3
|
解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。
|
2016-01-26 10:35:54 +08:00 |
|
cxt
|
945d0a933f
|
项目资源统计为负数
|
2016-01-25 17:34:04 +08:00 |
|
cxt
|
184e0ee689
|
管理员界面增加项目、组织、课程、用户、作业个数的显示
|
2016-01-25 16:50:34 +08:00 |
|
cxt
|
b6e13340e5
|
个人留言的删除功能
|
2016-01-25 15:33:50 +08:00 |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
2016-01-25 14:19:39 +08:00 |
|
cxt
|
4465e93dae
|
最近登录报500
|
2016-01-25 10:16:33 +08:00 |
|
cxt
|
4530e7896a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 20:55:31 +08:00 |
|
cxt
|
8a2a1d2bc9
|
Merge branch 'szzh' into develop
|
2016-01-22 20:55:18 +08:00 |
|
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
2016-01-22 20:54:14 +08:00 |
|
cxt
|
3de8687440
|
留言页面的动态内容不生成链接，留言回复的样式更改
|
2016-01-22 20:11:49 +08:00 |
 huang
|
19bb545993
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 18:49:28 +08:00 |
|
huang
|
16cb4add09
|
issue局部刷新属性问题
|
2016-01-22 18:48:40 +08:00 |
|
ouyangxuhua
|
26f8500671
|
博客回复后，该博客的更新时间为当前时间
|
2016-01-22 18:42:50 +08:00 |
|
ouyangxuhua
|
2d07801f52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 18:10:50 +08:00 |
|
ouyangxuhua
|
dbed8379d3
|
新建组织允许游客下载选项功能修复
|
2016-01-22 18:10:32 +08:00 |
|
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
2016-01-22 18:00:01 +08:00 |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:30:07 +08:00 |
|
ouyangxuhua
|
b5bfa6d824
|
1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。
|
2016-01-22 16:56:36 +08:00 |
|
ouyangxuhua
|
b6219c149a
|
解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除；
|
2016-01-22 16:10:05 +08:00 |
|
ouyangxuhua
|
b5159d54c8
|
博客按更新时间排序
|
2016-01-22 15:05:52 +08:00 |
|
huang
|
edd198e91f
|
issue刷新
|
2016-01-22 14:21:17 +08:00 |
|
ouyangxuhua
|
594ce8a304
|
修改几个bug
|
2016-01-21 16:57:13 +08:00 |
|
ouyangxuhua
|
b6460633d2
|
个人博客按更新时间倒排
|
2016-01-21 16:15:45 +08:00 |
|
ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
2016-01-21 16:11:06 +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 |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
2016-01-21 15:32:18 +08:00 |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
2016-01-21 15:31:36 +08:00 |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
2016-01-21 14:33:31 +08:00 |
|
huang
|
7de48f143e
|
issue状态修改
|
2016-01-21 10:38:07 +08:00 |
|
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
2016-01-21 10:33:53 +08:00 |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
2016-01-20 18:37:47 +08:00 |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
2016-01-20 17:23:02 +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 |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
2016-01-20 16:24:14 +08:00 |
|
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
2016-01-20 10:53:05 +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 |
|
cxt
|
e293805488
|
点击在线问卷时若未登录则直接跳到登录页面
|
2016-01-19 15:41:53 +08:00 |