 huang
|
1c08c79e8e
|
Merge branch 'develop' into gitlab_guange
|
2015-12-04 09:12:40 +08:00 |
|
huang
|
8f024bdf4d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
|
2015-12-04 09:12:24 +08:00 |
|
huang
|
7fe3a02d81
|
Merge branch 'gitlab_guange' into develop
|
2015-12-04 09:11:22 +08:00 |
|
huang
|
89b8f7783d
|
添加forked_form的id
|
2015-12-04 08:57:29 +08:00 |
|
huang
|
5d18b14e73
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
|
2015-12-04 00:16:21 +08:00 |
|
huang
|
057d9a3337
|
0
|
2015-12-04 00:15:47 +08:00 |
|
huang
|
8d891a9faa
|
fork权限
|
2015-12-03 20:57:09 +08:00 |
|
huang
|
b91c65798d
|
课程成员添加设置
|
2015-12-03 20:44:29 +08:00 |
 cxt
|
4e9e7543ba
|
chrome浏览器点击保存测验头部信息无反应
|
2015-12-03 19:21:35 +08:00 |
|
cxt
|
838140ada8
|
在线测验的自动发布和截止
|
2015-12-03 19:08:15 +08:00 |
|
cxt
|
fd51b02e16
|
添加修订附件
|
2015-12-03 18:33:08 +08:00 |
|
cxt
|
8d505b85bf
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-03 10:41:39 +08:00 |
|
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
|
cxt
|
9c4c90e066
|
Merge branch 'develop' into cxt_course
|
2015-12-03 09:55:18 +08:00 |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
2015-12-03 09:17:36 +08:00 |
 ouyangxuhua
|
cf41b13f3a
|
增加组织表和组织课程表的关联删除
|
2015-12-02 17:38:41 +08:00 |
|
ouyangxuhua
|
9baeb850a3
|
在管理员界面中，添加组织的编辑和删除功能。
|
2015-12-02 17:34:21 +08:00 |
|
ouyangxuhua
|
95b071a8f7
|
修复组织模块的bug
|
2015-12-02 16:48:49 +08:00 |
 lizanle
|
adb246f9ad
|
注释标记 错误
<!-- -->
|
2015-12-02 15:30:07 +08:00 |
|
lizanle
|
9fe5cfbf76
|
资源发送课程发送项目自动搜索
|
2015-12-02 14:38:41 +08:00 |
|
lizanle
|
2f0895c2c2
|
发送资源成功给出提示
发送资源默认为发送课程
|
2015-12-02 13:40:53 +08:00 |
|
cxt
|
ae218fa86c
|
发布作业时添加分组作业
|
2015-12-02 11:14:46 +08:00 |
|
lizanle
|
7af82aac98
|
base_forums要加ajax-indicator ajax-model
|
2015-12-02 09:28:01 +08:00 |
|
lizanle
|
46ad5f45c1
|
搜索结果下一页样式不对
|
2015-12-02 09:23:12 +08:00 |
|
lizanle
|
8f4c915c57
|
博客的非空验证bug
|
2015-12-01 17:33:18 +08:00 |
|
lizanle
|
35b543cd22
|
论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。
|
2015-12-01 17:23:14 +08:00 |
|
lizanle
|
d4823e7c8b
|
贴吧更新时间
|
2015-12-01 15:48:25 +08:00 |
|
huang
|
f1d38003c4
|
Merge branch 'szzh' into develop
|
2015-12-01 15:35:13 +08:00 |
|
huang
|
68f363e4a0
|
Merge branch 'develop' into szzh
|
2015-12-01 15:34:42 +08:00 |
|
lizanle
|
304cc078a7
|
去掉警示的感叹号
|
2015-12-01 15:30:47 +08:00 |
|
cxt
|
68a29d8131
|
学生提交作品后可点击重试重新上传作品
|
2015-12-01 15:18:14 +08:00 |
|
ouyangxuhua
|
0aba11f175
|
解决组织配置在360浏览器显示不兼容的问题
|
2015-12-01 11:28:33 +08:00 |
|
lizanle
|
1103a114a0
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-01 10:36:16 +08:00 |
|
lizanle
|
b2bca65025
|
分片默认为5
|
2015-12-01 10:33:57 +08:00 |
|
huang
|
0fe68563dd
|
Merge branch 'develop' into gitlab_guange
|
2015-12-01 09:50:05 +08:00 |
|
cxt
|
259cb67c58
|
rake命令的消息通知
|
2015-12-01 09:22:01 +08:00 |
 guange
|
52a0da83c4
|
匿名用户留言问题.
|
2015-11-30 21:52:05 +08:00 |
|
lizanle
|
3b56e40730
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-30 18:07:43 +08:00 |
|
lizanle
|
d6d0acf8bf
|
tip
|
2015-11-30 18:07:29 +08:00 |
|
huang
|
0a1a250e92
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-30 17:22:50 +08:00 |
|
huang
|
6f899411a1
|
Merge branch 'szzh' into develop
|
2015-11-30 17:22:32 +08:00 |
|
cxt
|
b16acda21e
|
匿评结束消息暂时不发送
|
2015-11-30 17:22:03 +08:00 |
|
huang
|
9d970036f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-30 17:21:38 +08:00 |
|
huang
|
45c54a98e9
|
Merge branch 'develop' into szzh
|
2015-11-30 17:21:21 +08:00 |
|
cxt
|
fee438cc0b
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-30 16:27:39 +08:00 |
|
cxt
|
ebeaac5798
|
作业匿评的结束状态未更新
|
2015-11-30 16:27:26 +08:00 |
|
ouyangxuhua
|
3750a49b65
|
修复组织编辑下拉框的bug
|
2015-11-30 16:10:29 +08:00 |
|
ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能；
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
|
2015-11-30 16:04:43 +08:00 |
|
huang
|
aa19f5f8d5
|
Merge branch 'gitlab_guange' into develop
Conflicts:
app/views/layouts/base_courses.html.erb
处理冲突
|
2015-11-30 15:43:05 +08:00 |
|
huang
|
582a7c47a4
|
修改英雄版为0显示的问题
|
2015-11-30 15:42:00 +08:00 |