 sw
|
64b0646281
|
base_course基本完成
|
2015-03-18 15:18:06 +08:00 |
whimlex
|
cfaf788e37
|
新版项目成员，关注者，资源库国际化；修改国际化缺失的bug
|
2015-03-17 18:04:35 +08:00 |
|
sw
|
4d60a6dabc
|
1、修改版权
2、增加footer
|
2015-03-17 17:04:18 +08:00 |
|
whimlex
|
e8da6ef871
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 15:07:51 +08:00 |
|
whimlex
|
50fe8f2bb7
|
项目配置模块
|
2015-03-17 15:06:15 +08:00 |
|
sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
2015-03-13 18:01:16 +08:00 |
|
whimlex
|
aee987d634
|
邀请Trustie用户
|
2015-03-13 17:47:58 +08:00 |
 huang
|
1ed542af09
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-13 15:40:06 +08:00 |
|
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
2015-03-13 15:37:54 +08:00 |
|
whimlex
|
be75bcef47
|
项目得分国际化
|
2015-03-13 11:51:53 +08:00 |
|
whimlex
|
baa854c5a9
|
公共标签
|
2015-03-13 10:26:10 +08:00 |
|
whimlex
|
cef923b8a8
|
邮件邀请用户国际化
|
2015-03-13 09:46:05 +08:00 |
|
whimlex
|
18422ecf6a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
2015-03-12 17:50:15 +08:00 |
|
whimlex
|
1e5fac32b4
|
添加邮箱验证
|
2015-03-12 17:48:31 +08:00 |
|
sw
|
3fd94ce243
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
2015-03-12 17:19:03 +08:00 |
|
sw
|
362bad594f
|
修改项目发送邮件邀请页面样式，以及提示
|
2015-03-12 17:18:18 +08:00 |
|
whimlex
|
3a1f0aec55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:14:12 +08:00 |
|
whimlex
|
5f88ffc5d0
|
项目邀请用户国际化，js判断邮件格式
|
2015-03-12 17:13:46 +08:00 |
|
sw
|
971c278de5
|
#2026 作业创建时间->截至时间
|
2015-03-12 17:02:47 +08:00 |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 16:32:31 +08:00 |
|
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
2015-03-12 16:32:20 +08:00 |
|
whimlex
|
e952490fa0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 15:25:45 +08:00 |
|
whimlex
|
458fa5b977
|
完善代码审查插件、账户、项目部分模块国际化
|
2015-03-12 15:25:27 +08:00 |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
2015-03-12 15:13:41 +08:00 |
|
sw
|
1e23007e5d
|
资源库中文丢失
|
2015-03-12 13:58:50 +08:00 |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
2015-03-12 09:47:42 +08:00 |
|
whimlex
|
11da65c9ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
config/locales/en.yml
config/locales/zh.yml
|
2015-03-11 17:27:02 +08:00 |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
2015-03-11 17:23:38 +08:00 |
|
sw
|
9e896118e9
|
项目模块配置：作品下载->资源库
|
2015-03-11 15:16:20 +08:00 |
|
sw
|
0525b03e65
|
zh.yml删除重复的
|
2015-03-11 14:50:06 +08:00 |
|
whimlex
|
540ddd4a1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-11 11:55:13 +08:00 |
|
whimlex
|
0eafbb92d5
|
意见反馈模块国际化
|
2015-03-11 11:53:42 +08:00 |
|
sw
|
b0eba062a8
|
修复项目、课程留言不正确的BUG
|
2015-03-11 11:20:43 +08:00 |
|
sw
|
d177f1ae89
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 10:16:23 +08:00 |
|
whimlex
|
5732f0ed03
|
国际化问题修改，新添加en.yml存在中文字符，格式问题
|
2015-03-11 10:10:54 +08:00 |
|
sw
|
284625de8f
|
国际化文件错误修改
|
2015-03-11 10:07:14 +08:00 |
|
sw
|
c2f494911d
|
修改en.yml不正确
|
2015-03-11 09:33:36 +08:00 |
 z9hang
|
43e9a9a495
|
1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成
|
2015-03-10 17:20:30 +08:00 |
|
z9hang
|
803f4a3eaf
|
1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
|
2015-03-10 14:41:36 +08:00 |
|
z9hang
|
08f625446e
|
app版本管理功能新建版本界面
|
2015-03-10 10:18:56 +08:00 |
|
whimlex
|
4b19463db7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
app/views/users/show.html.erb
config/locales/zh.yml
|
2015-03-10 10:08:18 +08:00 |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
2015-03-10 09:45:36 +08:00 |
|
sw
|
61167e55c9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-09 17:37:49 +08:00 |
|
sw
|
81b58e5c87
|
修改base_project中代码错误
|
2015-03-09 15:32:55 +08:00 |
|
z9hang
|
d634532789
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
config/locales/zh.yml
|
2015-03-09 15:26:02 +08:00 |
|
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
2015-03-09 15:23:24 +08:00 |
|
sw
|
8c44d25750
|
处理资源标签搜索中标签丢失的问题
|
2015-03-09 10:27:32 +08:00 |
|
sw
|
659a87ef60
|
修复部分本地化标签丢失
|
2015-03-09 09:11:57 +08:00 |
|
sw
|
3cac4336cd
|
修改课程、项目、竞赛首页搜索懒为英文
|
2015-03-07 17:15:01 +08:00 |
 alan
|
838c39da69
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/projects/_invite_members_by_mail.html.erb
|
2015-03-07 16:08:54 +08:00 |
|
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 16:07:48 +08:00 |
|
huang
|
ba09213023
|
添加新闻模块、部分样式
|
2015-03-07 15:32:50 +08:00 |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
2015-03-06 15:36:47 +08:00 |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
2015-03-06 15:23:42 +08:00 |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
2015-03-06 14:55:21 +08:00 |
|
sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
2015-03-06 09:27:43 +08:00 |
|
sw
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
2015-03-05 17:42:31 +08:00 |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
2015-03-05 17:37:33 +08:00 |
|
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
2015-03-05 17:03:44 +08:00 |
|
sw
|
5f8595d874
|
admin页面增加组织列表
|
2015-03-05 15:27:22 +08:00 |
|
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
2015-03-05 11:53:28 +08:00 |
|
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
2015-03-04 10:02:40 +08:00 |
|
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-02 14:50:10 +08:00 |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 23:34:10 +08:00 |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 20:23:50 +08:00 |
|
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
2015-02-10 10:21:46 +08:00 |
|
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
2015-02-09 22:14:16 +08:00 |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
2015-02-09 22:07:21 +08:00 |
|
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
2015-02-06 18:19:35 +08:00 |
|
alan
|
6f9e2bad63
|
mail weekly
|
2015-02-06 18:15:08 +08:00 |
|
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
2015-02-06 09:32:32 +08:00 |
|
huang
|
59e7f2f28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 15:23:05 +08:00 |
|
huang
|
8bef9420cf
|
修改企业版中自己能看到自己的私有项目
|
2015-02-03 15:22:45 +08:00 |
|
sw
|
96f538c76b
|
#1917邮件通知设置中将“收取选中项目的所有通知...”后的省略号去掉
|
2015-02-02 16:42:51 +08:00 |
|
sw
|
bb79aac700
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-31 17:20:11 +08:00 |
|
sw
|
ab18dfcaa8
|
School => 中国高校
|
2015-01-31 17:19:13 +08:00 |
|
whimlex
|
8f19467115
|
英文国际化
|
2015-01-31 17:18:07 +08:00 |
|
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
2015-01-31 17:14:01 +08:00 |
|
alan
|
1010003737
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-31 15:55:17 +08:00 |
|
alan
|
134f0d5557
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-31 15:49:00 +08:00 |
|
huang
|
3350bb98b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-31 15:46:30 +08:00 |
|
alan
|
9e36f9264c
|
修改《竞赛作业评分》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-31 15:46:10 +08:00 |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
2015-01-31 15:43:35 +08:00 |
|
whimlex
|
c413ce1405
|
项目企业模块国际化修改
|
2015-01-31 14:44:16 +08:00 |
|
whimlex
|
57237c76d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-31 10:55:08 +08:00 |
|
whimlex
|
3e1d90630e
|
找回密码，邮件激活国际化
|
2015-01-31 10:48:09 +08:00 |
|
alan
|
f2a3ce0ece
|
修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-30 16:05:36 +08:00 |
|
huang
|
864ed349e4
|
国际化
|
2015-01-30 14:48:24 +08:00 |
|
huang
|
29df528af1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
config/routes.rb
|
2015-01-30 14:27:56 +08:00 |
|
huang
|
d0a675f2b8
|
企业版模块
|
2015-01-30 14:11:35 +08:00 |
|
whimlex
|
617107f0cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
|
2015-01-30 10:34:47 +08:00 |
|
whimlex
|
f05e046751
|
首页国际化
|
2015-01-30 10:26:26 +08:00 |
 lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
2015-01-27 14:46:04 +08:00 |
|
whimlex
|
64cbeddd13
|
项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正
|
2015-01-26 17:37:05 +08:00 |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
2015-01-23 15:08:34 +08:00 |
|
whimlex
|
2be757a3d5
|
翻译缺失完善
|
2015-01-23 14:19:43 +08:00 |
|
whimlex
|
9886a3212c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 14:15:39 +08:00 |
|
whimlex
|
15a8bddfe6
|
缺失翻译
|
2015-01-23 14:02:00 +08:00 |
|
lizanle
|
b26f2029ef
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
|
2015-01-23 13:49:13 +08:00 |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 11:46:55 +08:00 |
|
lizanle
|
69ced4b14b
|
添加国际化内容
|
2015-01-23 11:08:58 +08:00 |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
2015-01-23 10:33:07 +08:00 |
|
sw
|
a0e6b9c2fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-22 17:51:11 +08:00 |
|
huang
|
388ddac96b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-22 17:46:31 +08:00 |
|
huang
|
84bfd30fc5
|
修改问题反馈弹框！
|
2015-01-22 17:46:12 +08:00 |
|
sw
|
90a81ee1f1
|
增加网站项目首页加入项目的功能
|
2015-01-22 17:03:01 +08:00 |
|
alan
|
24dfeb1614
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-22 16:32:53 +08:00 |
|
alan
|
432e3a05f2
|
增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-22 16:30:21 +08:00 |
|
whimlex
|
0c0160ac2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-21 18:13:47 +08:00 |
|
whimlex
|
3279928bef
|
邮件样式调整，国际化；用户资料页面调整
|
2015-01-21 18:12:04 +08:00 |
|
lizanle
|
4d20c8080f
|
修改国际化文件名字
|
2015-01-22 17:22:44 +08:00 |
|
lizanle
|
458749b921
|
添加了国际化代码
|
2015-01-22 16:46:29 +08:00 |
|
alan
|
9f36469d39
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-20 16:34:30 +08:00 |
|
alan
|
40d6c3b19c
|
添加《邮箱地址验证是否存在及国际化的编写》功能
Signed-off-by: alan <547533434@qq.com>
|
2015-01-20 16:33:59 +08:00 |
|
sw
|
e493ae22cf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-19 17:08:47 +08:00 |
|
sw
|
14a1f31a12
|
1、项目动态 -> 近期动态
2、修复新建修改课程时，描述会有一行空白行
|
2015-01-19 16:43:21 +08:00 |
|
z9hang
|
493b7ca695
|
#1821 课程--作业：导出excel相关问题 调整样式
|
2015-01-19 16:05:18 +08:00 |
|
huang
|
6bba6b2b76
|
weiwan
|
2015-01-17 14:04:20 +08:00 |
|
huang
|
0f5c3c5f4c
|
添加主观题统计页面及样式
|
2015-01-17 11:46:34 +08:00 |
|
sw
|
f99d159ca1
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 17:34:52 +08:00 |
|
sw
|
d16d5fd362
|
单行文字/多行文字 --> 单行主观/多行主观
|
2015-01-16 17:31:04 +08:00 |
|
z9hang
|
bbf4c4629b
|
问卷show页面国际化
|
2015-01-16 16:13:03 +08:00 |
|
huang
|
7177303eeb
|
问卷统计最终效果
|
2015-01-16 15:49:22 +08:00 |
|
sw
|
20c160f03f
|
1、修改标题头、取消修改标题头数据的保存和页面的变更
|
2015-01-15 10:50:08 +08:00 |
|
sw
|
0433f7c87f
|
增加新建单选题功能
|
2015-01-14 15:35:04 +08:00 |
|
sw
|
311d90d565
|
1.增加点击单选、多选、单行文本、多行文本的js
2.分割问卷标题头
3.增加新增问题的路由及action
|
2015-01-13 20:13:50 +08:00 |
|
sw
|
d0dc01b992
|
增加问卷修改功能，以及相关js
|
2015-01-12 17:55:22 +08:00 |
|
sw
|
450c4b203d
|
增加新建问卷按钮功能
|
2015-01-12 17:30:33 +08:00 |
|
sw
|
d2dfff33d0
|
课程页面增加问卷调查的链接
|
2015-01-12 17:01:39 +08:00 |
|
sw
|
475b046898
|
修改访问poll#index报ArgumentError
|
2015-01-12 16:56:53 +08:00 |
|
sw
|
bf7eaa7a80
|
修复同一个学生提交相同的文件后，打包下载异常的BUG
|
2015-01-10 17:41:50 +08:00 |
|
sw
|
41679a8d5c
|
修改文件缺少时的提示
|
2015-01-10 16:20:36 +08:00 |
|
alan
|
fb6c297a37
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 11:46:39 +08:00 |
|
alan
|
575b641e25
|
merge dev_chuangbin
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 11:01:16 +08:00 |
 zhuhao
|
92cf3d86cc
|
Merge branch 'develop' into szzh
|
2015-01-09 16:05:38 +08:00 |
|
sw
|
a30cc9bea8
|
修改文件缺少时的提示
|
2015-01-09 16:01:47 +08:00 |
|
sw
|
9ef3849fe3
|
如果缺少某一附件。在下载后的文件增加相关说明文档
|
2015-01-09 15:59:42 +08:00 |
|
sw
|
805de7fc28
|
修改课程首页课程列表显示策略
|
2015-01-04 13:28:33 +08:00 |
|
z9hang
|
4b923ed483
|
修改导出作品列表的名称
|
2014-12-31 09:48:17 +08:00 |
|
z9hang
|
d3f9f23465
|
修改课程列表导出的文件名
|
2014-12-31 09:05:21 +08:00 |
|
z9hang
|
35dce16924
|
课程成员列表excel导出
|
2014-12-30 17:49:48 +08:00 |
|
z9hang
|
899ac6f654
|
添加作品列表导出excel功能
|
2014-12-30 14:29:30 +08:00 |
|
sw
|
734216bbcd
|
"截止了，可补交”改为“已截止，但可补交”
|
2014-12-24 09:48:09 +08:00 |
|
alan
|
6c09228139
|
根据凌彬设计修改学生列表样式
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 15:48:35 +08:00 |
|
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-19 23:12:32 +08:00 |
|
alan
|
f9a86356ad
|
添加《重新发送激活邮件》功能to注册模块
Signed-off-by: alan <547533434@qq.com>
|
2014-12-19 10:51:53 +08:00 |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-17 17:36:12 +08:00 |
|
sw
|
cf5b03a379
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/courses/_member_list.html.erb
|
2014-12-10 17:56:50 +08:00 |
|
sw
|
66d8609c56
|
作业截止时间已到，此后提交的作品将记为迟交 -> 截止了，可补交
|
2014-12-10 09:44:03 +08:00 |
|
sw
|
9b5cbb0b4e
|
#1696作业提交时间已过->作业截止时间已到，此后提交的作品将记为迟交。
|
2014-12-10 09:25:24 +08:00 |