 guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
 cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
|
cxt
|
3b25616f0c
|
编辑作品时可编辑分组成员
|
2015-12-17 19:06:10 +08:00 |
 lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
2015-12-17 18:17:38 +08:00 |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
2015-12-17 18:12:38 +08:00 |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
2015-12-17 17:15:03 +08:00 |
|
lizanle
|
4bc68081ee
|
editor修改
|
2015-12-17 15:15:00 +08:00 |
|
lizanle
|
8d58b045f1
|
文件链接却弹出图片框 bug
|
2015-12-17 09:55:02 +08:00 |
|
lizanle
|
b13ae8f599
|
issue
|
2015-12-16 15:55:40 +08:00 |
|
lizanle
|
68aceaa7df
|
issue下载
|
2015-12-15 18:43:58 +08:00 |
|
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
|
guange
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
|
cxt
|
af0e592d8a
|
匿评日期的设置
|
2015-12-14 17:03:20 +08:00 |
|
cxt
|
d7b690e53a
|
匿评设置时匿评关闭日期可以等于匿评开启日期
|
2015-12-14 16:54:28 +08:00 |
|
cxt
|
dfd0c95f2a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:11:48 +08:00 |
|
lizanle
|
d1423ebc7e
|
ke高度小修改。
|
2015-12-11 15:41:41 +08:00 |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
|
cxt
|
f880ccd749
|
分组作业
|
2015-12-11 14:57:09 +08:00 |
 huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
2015-12-11 09:42:19 +08:00 |
|
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
2015-12-10 18:59:54 +08:00 |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
2015-12-07 09:47:18 +08:00 |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
2015-12-04 16:43:48 +08:00 |
|
cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
2015-12-04 10:59:14 +08:00 |
|
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
2015-12-03 09:17:36 +08:00 |
|
cxt
|
ae218fa86c
|
发布作业时添加分组作业
|
2015-12-02 11:14:46 +08:00 |
|
lizanle
|
8f4c915c57
|
博客的非空验证bug
|
2015-12-01 17:33:18 +08:00 |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
2015-11-24 17:29:57 +08:00 |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
2015-11-19 15:03:56 +08:00 |
 ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
2015-11-18 16:52:03 +08:00 |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
2015-11-18 16:05:08 +08:00 |
|
ouyangxuhua
|
b231b44e81
|
1.项目和课程中，添加翻页提醒；
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
|
2015-11-18 11:12:40 +08:00 |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
2015-11-18 10:57:17 +08:00 |
|
lizanle
|
7c1e9f0042
|
MathJax这些资源不能少。少了会在一些浏览器上出bug
|
2015-11-18 09:58:09 +08:00 |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
2015-11-17 17:34:50 +08:00 |
|
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
2015-11-17 16:48:03 +08:00 |
|
lizanle
|
94831443a5
|
MathJax的js
|
2015-11-17 15:24:06 +08:00 |
|
lizanle
|
56613b6358
|
增加项目的显示
|
2015-11-14 10:45:49 +08:00 |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-11-13 17:27:33 +08:00 |
|
lizanle
|
506709b474
|
个人资源库，课程 资源文件上传
1.单个上传
2.给出明确的提示
3.按钮联动
|
2015-11-12 16:35:13 +08:00 |
|
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
2015-11-11 16:02:37 +08:00 |
|
lizanle
|
d13205bd3d
|
文件正在上传提示
|
2015-11-11 11:39:02 +08:00 |
|
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
2015-11-11 11:19:10 +08:00 |
|
lizanle
|
db0978c657
|
编辑的时候报500
|
2015-11-10 17:07:37 +08:00 |
|
cxt
|
463262e838
|
提交作品时立马弹框
|
2015-11-09 11:16:19 +08:00 |
|
huang
|
d2b56e2811
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-06 14:40:37 +08:00 |
|
cxt
|
5e9cc27c11
|
发布作业时的发布日期若未选择则默认为当天
|
2015-11-06 09:56:37 +08:00 |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
2015-11-05 17:57:07 +08:00 |
|
cxt
|
9be1fe63b4
|
默认发布日期的格式
|
2015-11-05 15:45:21 +08:00 |