 cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
2016-01-29 15:45:47 +08:00 |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
2016-01-29 15:37:03 +08:00 |
 ouyangxuhua
|
280f679b0c
|
1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项
|
2016-01-28 16:49:25 +08:00 |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
2016-01-27 17:26:57 +08:00 |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
2016-01-26 11:05:25 +08:00 |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
2016-01-25 14:19:39 +08:00 |
 huang
|
83ff449946
|
项目、课程资源 浏览 改成 上传文件
|
2016-01-22 21:51:31 +08:00 |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:30:07 +08:00 |
|
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
2016-01-22 17:27:21 +08:00 |
|
ouyangxuhua
|
d7b17b455d
|
Merge branch 'szzh' into develop
|
2016-01-22 10:27:32 +08:00 |
|
ouyangxuhua
|
5e72734bee
|
增加3个url定制路由
|
2016-01-22 09:25:58 +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
|
ff475fb00b
|
Merge branch 'szzh' into develop
|
2016-01-21 15:35:38 +08:00 |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
2016-01-21 11:19:08 +08:00 |
|
huang
|
7de48f143e
|
issue状态修改
|
2016-01-21 10:38:07 +08:00 |
|
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
2016-01-21 10:33:53 +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 |
|
ouyangxuhua
|
909e0e846b
|
路由配置问题
|
2016-01-18 11:06:08 +08:00 |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-18 10:54:17 +08:00 |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
2016-01-18 10:43:22 +08:00 |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
2016-01-18 10:16:29 +08:00 |
|
ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
2016-01-18 10:07:12 +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
|
18bc8215e3
|
路由冲突
|
2016-01-15 11:35:27 +08:00 |
 guange
|
c8b52db6f9
|
merge
|
2016-01-14 20:38:37 +08:00 |
|
guange
|
c298adda7c
|
子域名路由实现
|
2016-01-14 20:37:56 +08:00 |
|
huang
|
71e155d83a
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 18:26:26 +08:00 |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-14 18:25:56 +08:00 |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
2016-01-14 18:25:42 +08:00 |
|
ouyangxuhua
|
3697d74d48
|
子域名路由配置
|
2016-01-14 18:13:17 +08:00 |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
2016-01-14 17:54:16 +08:00 |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
2016-01-14 17:52:48 +08:00 |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
2016-01-14 17:29:55 +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 |
|
cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
2016-01-13 16:32:05 +08:00 |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
2016-01-13 16:21:37 +08:00 |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
2016-01-13 16:15:46 +08:00 |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
2016-01-13 15:17:13 +08:00 |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
2016-01-12 16:43:40 +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 |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-08 18:09:21 +08:00 |
|
huang
|
6a9dc43d03
|
版权修改、issue编辑
|
2016-01-08 14:42:28 +08:00 |
|
ouyangxuhua
|
5eceb3d841
|
解决一些bug; 增加已设为首页标签
|
2016-01-08 14:42:21 +08:00 |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
2016-01-08 14:12:55 +08:00 |
|
huang
|
e56382a899
|
tag云ajax更新后自动刷新
|
2016-01-07 17:15:19 +08:00 |
|
cxt
|
05f822a5c2
|
导出在线测验成绩列表
|
2016-01-07 16:43:03 +08:00 |
|
ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
2016-01-07 15:09:09 +08:00 |
|
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
|
2016-01-06 16:27:42 +08:00 |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
2016-01-06 16:22:13 +08:00 |