 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 |
 huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-11 16:23:58 +08:00 |
|
cxt
|
fdefbf3795
|
作品打分连续点击不会多次提交
|
2016-05-11 15:31:33 +08:00 |
|
cxt
|
d4a35b94f6
|
导出的作品成绩保存为数字格式
|
2016-05-11 14:51:49 +08:00 |
|
cxt
|
d232a5241e
|
新建课程报404
|
2016-05-11 11:47:16 +08:00 |
|
cxt
|
320c3881ef
|
多次点击发送按钮不应新建多个作业
|
2016-05-11 10:48:04 +08:00 |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
2016-05-11 09:18:55 +08:00 |
|
cxt
|
83f7de597a
|
暂时屏蔽通知的微信消息和消息通知
|
2016-05-10 15:30:27 +08:00 |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
2016-05-10 15:26:08 +08:00 |
 yuanke
|
629591ad00
|
课程、项目列表更新时间取动态表中的
|
2016-05-10 12:55:42 +08:00 |
|
cxt
|
ba07e564db
|
老师评分的弹框
|
2016-05-10 11:51:41 +08:00 |
|
cxt
|
d303a06377
|
首页列表的排序
|
2016-05-10 11:32:20 +08:00 |
|
cxt
|
11017d72c5
|
老师对作品的评分可为空
|
2016-05-10 11:28:24 +08:00 |
|
huang
|
ccc4ddc325
|
组织编辑问题
|
2016-05-10 10:18:47 +08:00 |
|
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
2016-05-09 18:40:21 +08:00 |
|
cxt
|
1eb41478b2
|
课程动态和首页动态中的作业动态实现二级回复
|
2016-05-09 17:06:10 +08:00 |
|
cxt
|
644e097dc8
|
定时更新关联项目的作业更新时间
|
2016-05-09 16:16:03 +08:00 |
|
cxt
|
1b309d4bf0
|
时间的比较
|
2016-05-09 10:36:38 +08:00 |
|
cxt
|
7b84c994e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-09 10:32:48 +08:00 |
|
cxt
|
fc95d048a5
|
作业列表打不开
|
2016-05-09 10:32:41 +08:00 |
|
huang
|
18b70e9dd3
|
上线问题
|
2016-05-06 22:59:46 +08:00 |
|
huang
|
7a0d86228a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-06 22:57:29 +08:00 |
|
huang
|
635d49cc25
|
course->课程动态
project->项目动态
|
2016-05-06 22:57:05 +08:00 |
|
cxt
|
e03bc42c53
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/words_controller.rb
|
2016-05-06 22:53:16 +08:00 |
|
huang
|
96ce1d8d40
|
| 及更多问题
|
2016-05-06 22:35:17 +08:00 |
|
huang
|
6401afb850
|
二级目录排序同步
|
2016-05-06 22:30:44 +08:00 |
|
cxt
|
2a55d8f0c3
|
作业的回复更新作业的updated_at字段
|
2016-05-06 22:23:05 +08:00 |
|
huang
|
9a80ff0597
|
右一添加“更多”链接
|
2016-05-06 22:21:52 +08:00 |
|
cxt
|
90809ea350
|
首页报500
|
2016-05-06 22:18:31 +08:00 |
|
cxt
|
9526962c69
|
翻页时不更新作业动态
|
2016-05-06 22:06:24 +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 |
|
huang
|
ece84e912d
|
鼠标经过显示标题
|
2016-05-06 21:32:37 +08:00 |
|
huang
|
b7d87966dd
|
时间显示样式
|
2016-05-06 21:26:28 +08:00 |
|
huang
|
8323422f09
|
回复留言为空则不能提交
|
2016-05-06 21:19:35 +08:00 |
|
cxt
|
54cdd57f89
|
二级回复的内容与上边框的距离调整
|
2016-05-06 20:56:20 +08:00 |
|
huang
|
d672c80edb
|
换行问题
|
2016-05-06 20:45:08 +08:00 |
|
huang
|
cd0603f01b
|
模式二里面的链接问题
|
2016-05-06 20:36:06 +08:00 |
|
huang
|
967a76af67
|
图片变大的问题
|
2016-05-06 20:20:48 +08:00 |
|
cxt
|
b0f407aae5
|
去掉导出的作业成绩中的作品描述的html代码
|
2016-05-06 20:19:16 +08:00 |
|
huang
|
3469d928d8
|
图片变的很大问题
|
2016-05-06 20:17:11 +08:00 |
|
huang
|
23a23fd085
|
组织logo上传图片
|
2016-05-06 19:53:13 +08:00 |
|
huang
|
86b0470b76
|
隐藏掉搜索功能
|
2016-05-06 19:02:43 +08:00 |
|
cxt
|
262fd8bb65
|
学生提交禁用匿评的作业时会弹出匿评关闭的提示
|
2016-05-06 18:54:51 +08:00 |
|
huang
|
a267c75ec7
|
首页的隐藏可见
|
2016-05-06 18:50:57 +08:00 |
|
cxt
|
c6c3625029
|
题目申请说明内容较长时，会导致被申请者收不到消息
|
2016-05-06 18:47:38 +08:00 |
|
huang
|
86ad0035b7
|
样式显示问题
|
2016-05-06 18:19:00 +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 |