 cxt
|
9f72539845
|
本地版新建班级报500
|
2016-10-09 16:11:34 +08:00 |
 huang
|
d827b3e519
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-09 13:44:46 +08:00 |
|
huang
|
5f1458483c
|
修改attachment字段类型，解决字段长不能上传的问题
|
2016-10-09 13:44:32 +08:00 |
|
cxt
|
f0e334d33d
|
分组作业的迟交扣分和缺评扣分
|
2016-10-09 09:16:05 +08:00 |
|
cxt
|
7f3bb0be63
|
教师团队中上移、下移功能的完善
|
2016-10-08 13:54:35 +08:00 |
|
huang
|
db54d6e0d9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-09-26 22:21:45 +08:00 |
|
huang
|
528aeaff89
|
Merge branch 'rep_quality' into develop
|
2016-09-26 22:20:08 +08:00 |
|
cxt
|
398a6f1da7
|
Merge branch 'cxt_course' into develop
|
2016-09-23 16:50:45 +08:00 |
|
cxt
|
70042fe91f
|
帖子详情页面的优化
|
2016-09-23 16:44:49 +08:00 |
|
huang
|
a8acb4a6cb
|
项目base功能添加
|
2016-09-23 10:36:47 +08:00 |
|
cxt
|
caf5602389
|
课程大纲教师团队的管理
|
2016-09-23 09:22:47 +08:00 |
 yuanke
|
0a9d288880
|
Merge branch 'weixin_guange' into develop
|
2016-09-22 13:41:52 +08:00 |
|
yuanke
|
fe431902d7
|
修改留言的at微信相关BUG
|
2016-09-18 16:48:20 +08:00 |
|
cxt
|
19721e20c5
|
Merge branch 'cxt_course' into develop
|
2016-09-18 15:11:11 +08:00 |
|
cxt
|
2c7eddbae6
|
个人留言的at回复报错
|
2016-09-18 14:49:01 +08:00 |
|
yuanke
|
98aaca3572
|
Merge branch 'develop' into weixin_guange
|
2016-09-18 13:07:51 +08:00 |
|
yuanke
|
65bd77f0ff
|
微信二维码过期问题修改
|
2016-09-18 10:50:40 +08:00 |
|
cxt
|
1bd93904af
|
Merge branch 'cxt_course' into develop
|
2016-09-14 19:47:24 +08:00 |
|
yuanke
|
c7be9cadf1
|
Merge branch 'weixin_guange' into develop
|
2016-09-14 19:38:19 +08:00 |
|
cxt
|
6f4618fffb
|
分组作业可对组员单独评分
|
2016-09-14 17:38:57 +08:00 |
|
huang
|
067426824b
|
news.rb回调修改
|
2016-09-14 15:12:04 +08:00 |
|
yuanke
|
154b77a3a7
|
微信班级名改为课程名。班级名
|
2016-09-14 15:10:24 +08:00 |
|
yuanke
|
4ea468eacb
|
Merge branch 'weixin_guange' into develop
|
2016-09-12 17:44:04 +08:00 |
|
yuanke
|
168a47fabb
|
微信通知显示被删除修改
|
2016-09-12 17:34:55 +08:00 |
 daiao
|
ed448f0087
|
Merge branch 'develop' into dev_shcool
Conflicts:
db/schema.rb
|
2016-09-09 09:31:17 +08:00 |
|
daiao
|
aa27d7def2
|
修复编辑issue，更新附件时，自动回复提示问题（不同Issue下，重名不显示，同意issue下，会更新创建时的附件）
|
2016-09-09 09:16:22 +08:00 |
|
cxt
|
bf4c6d049c
|
新建分组作业时不创建作品列表
|
2016-09-06 16:38:29 +08:00 |
|
cxt
|
1e7f3db946
|
分组作业：组内每个成员都复制一份组长的作业，得分相同
|
2016-09-06 15:07:43 +08:00 |
|
cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-09-02 15:24:55 +08:00 |
|
yuanke
|
11ed1ea345
|
Merge branch 'weixin_guange' into develop
|
2016-09-01 14:11:20 +08:00 |
|
huang
|
9e9b4d12c9
|
新注册用户不发送留言
|
2016-08-31 15:00:34 +08:00 |
|
yuanke
|
292e778a8c
|
微信班级项目增加删除和退出功能
|
2016-08-31 14:21:38 +08:00 |
|
huang
|
4320fbf945
|
Merge branch 'dev_blankdatabase' into develop
|
2016-08-31 10:30:46 +08:00 |
|
cxt
|
188b9197aa
|
消息列表
|
2016-08-30 16:15:57 +08:00 |
|
huang
|
6d0f22fd60
|
空数据库--修复后台删除issue标签500问题
|
2016-08-30 16:03:28 +08:00 |
|
yuanke
|
b9e9892257
|
微信issue指向BUG修改，issue@功能修改
|
2016-08-30 15:01:26 +08:00 |
|
yuanke
|
b4a5179a1b
|
修改班级成员管里的配置返回后显示空白及@issue链接无效的问题
|
2016-08-30 14:25:36 +08:00 |
|
yuanke
|
8a6ad89973
|
issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等
|
2016-08-30 14:08:10 +08:00 |
|
cxt
|
0047f7bfdf
|
学生身份的编辑
|
2016-08-26 19:39:41 +08:00 |
|
cxt
|
0ce61bfee8
|
学生删除作品时将作品还原为初始状态
|
2016-08-26 16:20:14 +08:00 |
|
cxt
|
56b74b755b
|
取消收藏
|
2016-08-24 17:30:30 +08:00 |
|
yuanke
|
f50cfe159c
|
微信用户合并修改
|
2016-08-14 12:35:03 +08:00 |
|
yuanke
|
3be75c8633
|
微信BUG修改
|
2016-08-14 11:18:23 +08:00 |
 guange
|
1d53af36cd
|
merge
|
2016-08-14 11:16:20 +08:00 |
|
guange
|
dc7ff8f90f
|
.
|
2016-08-14 11:15:37 +08:00 |
|
yuanke
|
6cea0bfb67
|
.
|
2016-08-14 10:56:38 +08:00 |
|
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56:17 +08:00 |
|
huang
|
d7faed7f6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 15:39:06 +08:00 |
|
cxt
|
35260f2f6d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-08-13 15:36:48 +08:00 |
|
guange
|
dde0fbb3c1
|
迁移用户
|
2016-08-13 14:39:15 +08:00 |