 yuanke
|
c0de43ecc0
|
修改KE字体间距问题，代码测试出错提示。
|
2016-05-17 10:31:10 +08:00 |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
2016-05-16 16:57:18 +08:00 |
 cxt
|
9caf9cbf2f
|
消息列表的消息，在点击时，要弹出新的浏览器页面
|
2016-05-16 16:16:24 +08:00 |
 Tim
|
fa788ced1b
|
资源库添加私有资源
|
2016-05-16 15:00:08 +08:00 |
 huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
2016-05-13 18:25:15 +08:00 |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
2016-05-13 17:11:53 +08:00 |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
2016-05-13 15:25:53 +08:00 |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
|
Tim
|
1833f15e19
|
课程资源库导入资源样式修改
|
2016-05-13 14:23:51 +08:00 |
|
cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
2016-05-12 17:49:07 +08:00 |
|
cxt
|
d4c1f27533
|
私有作业请求分享时，强制要求写请求分享的说明文字
|
2016-05-12 15:29:20 +08:00 |
|
cxt
|
ac5a9c87ac
|
消息通知中的“同意|拒绝”调整宽度
|
2016-05-12 14:59:12 +08:00 |
|
cxt
|
ca5f03f2ea
|
作业回复的消息通知，评阅作品的消息通知修改
|
2016-05-12 14:13:34 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
2016-05-12 10:29:43 +08:00 |
|
cxt
|
9ec488684b
|
分享申请的消息更改
|
2016-05-12 09:30:06 +08:00 |
|
Tim
|
7957beb64a
|
发送至按钮样式控制
|
2016-05-11 15:51:59 +08:00 |
|
cxt
|
320c3881ef
|
多次点击发送按钮不应新建多个作业
|
2016-05-11 10:48:04 +08:00 |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
2016-05-11 09:18:55 +08:00 |
|
txz
|
67380d58d4
|
博客锁定置顶位置
|
2016-05-10 15:27:43 +08:00 |
|
txz
|
9b55d8b527
|
微信版标题显示不完整
|
2016-05-10 14:06:34 +08:00 |
|
yuanke
|
629591ad00
|
课程、项目列表更新时间取动态表中的
|
2016-05-10 12:55:42 +08:00 |
|
yuanke
|
e502aa7c43
|
KE表格项目问题，自动上传图片做了一点
|
2016-05-10 12:51:42 +08:00 |
|
Tim
|
e8424d9b97
|
项目时间字体大小控制
|
2016-05-10 10:57:55 +08:00 |
|
cxt
|
1eb41478b2
|
课程动态和首页动态中的作业动态实现二级回复
|
2016-05-09 17:06:10 +08:00 |
|
cxt
|
e03bc42c53
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/words_controller.rb
|
2016-05-06 22:53:16 +08:00 |
|
cxt
|
90809ea350
|
首页报500
|
2016-05-06 22:18:31 +08:00 |
|
cxt
|
b8f7672424
|
项目动态的更新时间更新到作业动态中
|
2016-05-06 22:02:45 +08:00 |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-06 22:02:22 +08:00 |
|
cxt
|
54cdd57f89
|
二级回复的内容与上边框的距离调整
|
2016-05-06 20:56:20 +08:00 |
|
cxt
|
c6c3625029
|
题目申请说明内容较长时，会导致被申请者收不到消息
|
2016-05-06 18:47:38 +08:00 |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
2016-05-06 18:12:08 +08:00 |
|
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
2016-05-06 18:07:24 +08:00 |
|
yuanke
|
34ea7662b2
|
将内容省略显示的固定字数改为传参
|
2016-05-06 17:59:27 +08:00 |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
2016-05-06 17:36:28 +08:00 |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
|
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-05-06 11:35:27 +08:00 |
|
cxt
|
f4cb6f120c
|
名片中的取消关注和添加关注
|
2016-05-05 11:09:53 +08:00 |
|
yuanke
|
9dc92fe817
|
列表优化
|
2016-05-04 16:28:40 +08:00 |
|
cxt
|
6c184b9248
|
题库的分享请求
|
2016-05-04 16:17:37 +08:00 |
|
cxt
|
467af47386
|
私有题库的作业详情页面不显示
|
2016-05-04 11:13:52 +08:00 |
|
cxt
|
ff160ff793
|
题库的申请改为绿色按钮
|
2016-05-04 10:15:22 +08:00 |
|
huang
|
d212d4f4c5
|
Merge branch 'cxt_course' into develop
|
2016-05-03 18:17:54 +08:00 |
|
cxt
|
407af62654
|
作业动态的分数显示
|
2016-05-03 18:06:53 +08:00 |
|
yuanke
|
8b672cc7c3
|
项目、课程列表增加更新时间
|
2016-05-03 17:57:24 +08:00 |
|
cxt
|
bcb02e49d3
|
课程问答区的名片显示
|
2016-05-03 17:23:56 +08:00 |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
2016-05-03 17:12:38 +08:00 |
|
cxt
|
ada4407e63
|
局部刷新后 名片不显示
|
2016-05-03 17:11:30 +08:00 |
|
cxt
|
55297a9daf
|
统一作业动态中项目的更新时间与tip中的更新时间
|
2016-05-03 15:19:22 +08:00 |
|
cxt
|
6b1137980e
|
挂起的作业编辑截止日期后报500
|
2016-05-03 10:58:49 +08:00 |
|
cxt
|
39c2365338
|
已拒绝的私有作业不可引用
|
2016-05-03 10:15:09 +08:00 |
|
cxt
|
2ca77d26b6
|
作业列表报500
|
2016-04-29 19:49:09 +08:00 |
|
cxt
|
0bb6d42c80
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-29 19:22:08 +08:00 |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
2016-04-29 19:21:54 +08:00 |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
2016-04-29 17:57:32 +08:00 |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
2016-04-29 17:55:57 +08:00 |
|
cxt
|
8f3b9ae9fe
|
动态的？
|
2016-04-29 16:54:48 +08:00 |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-04-29 15:58:05 +08:00 |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
2016-04-29 15:54:37 +08:00 |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
2016-04-29 15:46:26 +08:00 |
|
yuanke
|
789f3906a5
|
课程列表，列表描述内容去掉空格
|
2016-04-29 15:07:46 +08:00 |
|
yuanke
|
196501bc39
|
项目列表问题
|
2016-04-29 14:08:25 +08:00 |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
2016-04-29 13:42:58 +08:00 |
|
yuanke
|
b3fdc45a04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 12:38:06 +08:00 |
|
yuanke
|
54a8e6871c
|
问答区列表修改
|
2016-04-28 11:31:31 +08:00 |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
2016-04-28 10:49:05 +08:00 |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 10:45:57 +08:00 |
|
yuanke
|
dd00533084
|
帖子显示三行好点
|
2016-04-28 10:32:32 +08:00 |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
2016-04-28 10:19:59 +08:00 |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
2016-04-27 16:27:55 +08:00 |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
2016-04-27 16:02:52 +08:00 |
|
yuanke
|
51245d44fa
|
编程作业未发布是 由于代码查重按钮的原因导致布局问题。
|
2016-04-27 10:02:43 +08:00 |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
2016-04-27 09:54:49 +08:00 |
|
Tim
|
86751e31fb
|
题库加入私有课程题目，可申请使用
|
2016-04-26 15:35:42 +08:00 |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
2016-04-26 15:10:47 +08:00 |
|
yuanke
|
bb80cad1e3
|
Merge branch 'yuanke' into yuanke_1
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-25 14:03:27 +08:00 |
|
yuanke
|
639749f02b
|
修改作业未发布时 加了代码查重按钮 显示错乱的问题.
|
2016-04-25 11:00:56 +08:00 |
|
yuanke
|
d34b3780c8
|
课程列表修改
|
2016-04-25 10:44:46 +08:00 |
|
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
2016-04-24 14:23:08 +08:00 |
|
yuanke
|
c8eaf293e7
|
课程列表
|
2016-04-24 10:49:33 +08:00 |
|
yuanke
|
81cd30cbda
|
Merge branch 'cxt_course' into yuanke_1
Conflicts:
db/schema.rb
|
2016-04-23 13:22:28 +08:00 |
|
yuanke
|
f503969702
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-22 14:16:26 +08:00 |
|
yuanke
|
016177a078
|
Merge branch 'yuanke' into develop
|
2016-04-22 14:14:15 +08:00 |
|
yuanke
|
f6a5ffc6a5
|
测试代码的时候点击一下然后按钮消失等结果返回才出现
|
2016-04-22 14:13:24 +08:00 |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
2016-04-22 12:40:20 +08:00 |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
2016-04-22 11:27:30 +08:00 |
|
cxt
|
3fe2e81c0e
|
作业评分设置时比例NAN
|
2016-04-21 17:01:57 +08:00 |
|
cxt
|
1ded6ddf04
|
学生无法编辑已提交的编程作品
|
2016-04-19 13:03:12 +08:00 |
|
yuanke
|
5efd55de2d
|
Merge branch 'yuanke' into develop
|
2016-04-15 17:37:17 +08:00 |
|
yuanke
|
19a95dfc9c
|
作业列表加上代码查重
|
2016-04-15 17:36:23 +08:00 |
|
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-15 17:08:51 +08:00 |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
2016-04-15 17:07:38 +08:00 |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-14 11:32:35 +08:00 |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 11:29:26 +08:00 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |
|
cxt
|
4d581d07b8
|
作业发布默认选中禁用匿评
|
2016-04-13 14:14:41 +08:00 |
|
cxt
|
5e3e2e64a9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-09 18:35:07 +08:00 |
|
huang
|
8d40950491
|
项目讨论区锁定后不能回复
|
2016-04-07 15:20:25 +08:00 |