 alan
|
36dfd7c77c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-27 15:12:56 +08:00 |
|
alan
|
00c0ddc600
|
admin查看course和user列表
Signed-off-by: alan <547533434@qq.com>
|
2015-01-27 15:11:24 +08:00 |
 sw
|
950d831108
|
Merge branch 'api' into szzh
|
2015-01-27 14:51:15 +08:00 |
|
sw
|
5950f0404b
|
#1832 不显示无数据的字段，字段名
|
2015-01-27 11:35:19 +08:00 |
|
sw
|
56700f4d62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-27 11:06:42 +08:00 |
|
sw
|
649c65fbe2
|
国际化部分代码
|
2015-01-27 10:14:05 +08:00 |
|
sw
|
fe06ca503a
|
增加poll colsed_at的赋值
|
2015-01-27 09:55:02 +08:00 |
|
sw
|
97c7ccac16
|
增加关闭问卷功能
|
2015-01-27 09:45:15 +08:00 |
 z9hang
|
4b3621905e
|
修正课程成员搜索bug
|
2015-01-27 09:06:00 +08:00 |
whimlex
|
0ff22b1ac0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-26 17:47:47 +08:00 |
|
whimlex
|
e5e24c1163
|
resolve conflict
|
2015-01-26 17:47:33 +08:00 |
|
whimlex
|
64cbeddd13
|
项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正
|
2015-01-26 17:37:05 +08:00 |
|
alan
|
36ec204f40
|
修改《公共贴吧中，回复了帖子后，重新编辑的话能编辑标题》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-26 16:54:46 +08:00 |
|
alan
|
f1495686e9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-26 15:54:38 +08:00 |
|
alan
|
0944cc4ca8
|
< 邮件格式调整>
Signed-off-by: alan <547533434@qq.com>
|
2015-01-26 15:54:23 +08:00 |
|
sw
|
d135274281
|
修改重复加入项目提示语
|
2015-01-26 15:41:10 +08:00 |
|
sw
|
9f6ff04e65
|
#1866 新建帖子时当鼠标移至“提交”按钮时，光标应变成手型的图标
|
2015-01-26 15:31:36 +08:00 |
|
sw
|
87f19f7a8b
|
#1873 加入”==》“申请加入”
|
2015-01-26 14:25:39 +08:00 |
|
sw
|
a04bd5d826
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-26 14:11:06 +08:00 |
|
sw
|
554cbf55bb
|
Merge branch 'develop' into szzh
|
2015-01-26 14:10:38 +08:00 |
|
sw
|
2f8d57797c
|
增加弹出框的宽度
|
2015-01-26 14:09:56 +08:00 |
 zhuhao
|
a38b3c89fe
|
添加预构件生产测试数据
|
2015-01-24 10:36:19 +08:00 |
|
zhuhao
|
ca17058750
|
添加预构件
|
2015-01-24 10:35:46 +08:00 |
|
zhuhao
|
167abcd6b4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-24 10:20:01 +08:00 |
|
zhuhao
|
230b98d704
|
注册测试
|
2015-01-24 10:18:32 +08:00 |
|
sw
|
0f7c52e279
|
Merge branch 'szzh' into develop
|
2015-01-23 17:10:46 +08:00 |
|
sw
|
02f01c1aba
|
修改首页加入项目
|
2015-01-23 17:10:21 +08:00 |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
2015-01-23 16:51:40 +08:00 |
|
z9hang
|
b2396df68c
|
优化下代码
|
2015-01-23 16:31:41 +08:00 |
|
sw
|
079fce4335
|
Merge branch 'szzh' into develop
|
2015-01-23 15:55:51 +08:00 |
|
alan
|
7ef6f8adfb
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-23 15:55:44 +08:00 |
|
alan
|
a3cf79db96
|
修改编码问题
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 15:55:29 +08:00 |
|
sw
|
9990845f31
|
Merge branch 'szzh' into develop
|
2015-01-23 15:28:25 +08:00 |
|
sw
|
5e4279e158
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 15:23:31 +08:00 |
|
sw
|
a093537ba4
|
去掉编辑问卷时框框
|
2015-01-23 15:23:13 +08:00 |
|
zhuhao
|
bbe7025e2d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 15:22:18 +08:00 |
|
sw
|
6dad5bb416
|
修改问卷统计界面margin
|
2015-01-23 15:15:24 +08:00 |
|
sw
|
2450bb777d
|
修改问卷统计界面样式
|
2015-01-23 15:10:54 +08:00 |
|
whimlex
|
14685f2656
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 15:09:03 +08:00 |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
2015-01-23 15:08:34 +08:00 |
|
zhuhao
|
6ff0a41934
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 15:04:42 +08:00 |
|
alan
|
38da932f4c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/application.rb
|
2015-01-23 14:57:09 +08:00 |
|
alan
|
61634585f5
|
修改《news，forum模块发送邮件的模板》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 14:51:11 +08:00 |
|
sw
|
08e646c752
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 14:43:48 +08:00 |
|
sw
|
900cff8f8e
|
1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
|
2015-01-23 14:43:40 +08:00 |
|
sw
|
dbdae2ac7e
|
问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示
|
2015-01-23 14:25:29 +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 |
|
sw
|
016f4f9a0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 14:11:02 +08:00 |
|
sw
|
6645648027
|
学生是否看到问卷结果老师可配置增加数据库
|
2015-01-23 14:10:38 +08:00 |