 guange
|
3a601bbd2c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-21 19:23:17 +08:00 |
 lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
2015-08-21 16:16:18 +08:00 |
 huang
|
5594295c9e
|
添加问题更新策略
显示更新内容
|
2015-08-21 15:27:01 +08:00 |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
|
guange
|
d36da76685
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-15 19:47:53 +08:00 |
|
lizanle
|
89b9a5c09d
|
资源库
|
2015-08-15 17:06:41 +08:00 |
 sw
|
a8283a2861
|
点击问卷动态，跳转到答题界面
|
2015-08-14 14:46:14 +08:00 |
|
sw
|
3e9f3f4e70
|
课程动态，无对应数据时报错
|
2015-08-13 15:00:13 +08:00 |
|
sw
|
4b5022bfc6
|
课程动态报错
|
2015-08-13 14:56:01 +08:00 |
|
sw
|
b036d5b63d
|
网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序
|
2015-08-13 11:08:02 +08:00 |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
2015-08-12 16:24:27 +08:00 |
|
sw
|
a1dfe13728
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-11 14:53:59 +08:00 |
|
lizanle
|
d43ded4f8b
|
1.没有可导入的问卷提示
2.教辅也可以导入老师的问卷
|
2015-08-11 11:30:17 +08:00 |
|
sw
|
09b1c03ef2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-10 11:21:04 +08:00 |
|
lizanle
|
d0bca180ca
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-10 09:12:57 +08:00 |
|
lizanle
|
5d82f3336e
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
2015-08-10 09:12:26 +08:00 |
|
sw
|
2e4babc2ae
|
修改demo代码，增加C++的示例代码
|
2015-08-04 17:52:57 +08:00 |
|
sw
|
96420f59a8
|
修改标准代码
|
2015-08-04 16:35:02 +08:00 |
|
sw
|
aaf546686e
|
输出错误 ---> 输入和输出不匹配
|
2015-08-04 15:40:05 +08:00 |
|
sw
|
3f51368bb2
|
老师布置作业界面增加错误信息的提示
|
2015-08-04 15:25:05 +08:00 |
|
sw
|
fe2d621dc3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/users_helper.rb
|
2015-08-01 15:17:01 +08:00 |
|
huang
|
5e857d3472
|
...
|
2015-08-01 15:14:36 +08:00 |
|
sw
|
793f477f1c
|
创建课程数、加入课程数、创建项目数、加入项目数统计问题
|
2015-08-01 14:58:41 +08:00 |
 cxt
|
8eb2b72802
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-31 15:51:52 +08:00 |
|
huang
|
93ef63d60d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/layouts/base_users_new.html.erb
|
2015-07-31 14:07:04 +08:00 |
|
huang
|
ef5bd664cc
|
..合并
|
2015-07-31 14:04:39 +08:00 |
|
cxt
|
dfa06ab069
|
课程动态中的创建问卷显示成了发布问卷
|
2015-07-30 11:13:04 +08:00 |
|
sw
|
9728277005
|
1、课程动态、每次项目动态显示13条
2、取消动态页面、他的课程、他的项目、留言等显示
|
2015-07-28 16:04:40 +08:00 |
|
huang
|
390aa632cd
|
修改删除主版本库后，新建可以设置主版本库
|
2015-07-24 15:02:01 +08:00 |
|
lizanle
|
e85ef7b192
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-07-24 09:38:03 +08:00 |
|
lizanle
|
8350d5f10b
|
首页动态优化
|
2015-07-24 09:37:53 +08:00 |
|
cxt
|
afce49839f
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/layouts/base_users_new.html.erb
|
2015-07-24 09:07:58 +08:00 |
|
sw
|
6775008b50
|
加入课程数和创建课程数不正确
去除掉无用代码
|
2015-07-23 14:42:47 +08:00 |
|
sw
|
76247d74a7
|
公共贴吧 顶和踩之后数字未变化
|
2015-07-23 10:50:48 +08:00 |
|
cxt
|
dc11ad31f1
|
3241缺陷的修复
|
2015-07-22 15:38:56 +08:00 |
|
sw
|
742cdb2448
|
编程作业支持C++代码
|
2015-07-21 15:09:52 +08:00 |
|
lizanle
|
6f773b902b
|
移动端版本 管理 可以下载
|
2015-07-21 11:59:25 +08:00 |
|
lizanle
|
b3d2754415
|
移动端版本 管理 可以下载
|
2015-07-21 10:52:41 +08:00 |
 yutao
|
5bae0b674c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-18 17:01:36 +08:00 |
|
yutao
|
679ad8406d
|
课程主页
|
2015-07-18 17:01:22 +08:00 |
|
lizanle
|
b4dc19b85a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-07-18 16:35:28 +08:00 |
|
lizanle
|
d4dcbad7e8
|
作业状态
|
2015-07-18 16:35:20 +08:00 |
|
yutao
|
55f57ef8b7
|
个人主页
|
2015-07-18 15:58:33 +08:00 |
|
yutao
|
63f44535a3
|
个人主页
|
2015-07-18 15:52:54 +08:00 |
|
sw
|
c61e990ad3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-18 15:07:06 +08:00 |
|
yutao
|
91bca6c261
|
个人主页
|
2015-07-18 13:47:14 +08:00 |
|
sw
|
42d706a961
|
作品列表扣分规则显示
|
2015-07-18 10:44:26 +08:00 |
|
sw
|
94ed3501f8
|
转义增加&的转义
|
2015-07-18 10:39:04 +08:00 |
|
sw
|
a4095adc59
|
编程作业代码中不显示<和>
|
2015-07-18 10:30:27 +08:00 |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
2015-07-17 17:38:07 +08:00 |