 huang
|
207273839b
|
Merge branch 'dev_newrep' into dev_newproject
Conflicts:
app/controllers/projects_controller.rb
app/views/projects/settings/_new_repositories.html.erb
|
2016-10-19 08:53:38 +08:00 |
 cxt
|
a1b70a7e91
|
Merge branch 'cxt_course' into develop
|
2016-10-14 16:18:12 +08:00 |
|
huang
|
b9d87b1b29
|
Merge branch 'develop' into rep_quality
Conflicts:
public/stylesheets/css/project.css
|
2016-10-14 15:43:45 +08:00 |
|
huang
|
333c9c6db0
|
项目历史版本一键删除功能
|
2016-10-14 15:01:22 +08:00 |
|
cxt
|
12ad7c1612
|
班级讨论区增加二级子栏目
|
2016-10-14 14:28:19 +08:00 |
 yuanke
|
5ac30fe09c
|
Merge branch 'cxt_replies' into weixin_guange
|
2016-10-13 08:49:20 +08:00 |
|
cxt
|
a581f989c9
|
给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复
|
2016-10-11 14:08:44 +08:00 |
|
yuanke
|
163abb70de
|
课程搜索只能搜索title
|
2016-10-10 14:00:10 +08:00 |
|
yuanke
|
b94553edcd
|
搜索修改及代码优化
|
2016-10-10 09:38:21 +08:00 |
|
cxt
|
9f72539845
|
本地版新建班级报500
|
2016-10-09 16:11:34 +08:00 |
|
huang
|
acb6fcfc81
|
Merge branch 'develop' into dev_newrep
|
2016-10-09 15:36:49 +08:00 |
|
yuanke
|
5d5306dede
|
搜索课程
|
2016-10-09 15:05:50 +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 |
|
yuanke
|
28d6bca3df
|
搜索课程
|
2016-10-09 13:29:13 +08:00 |
|
yuanke
|
9dd6a65316
|
搜索课程
|
2016-10-09 13:16:03 +08:00 |
|
yuanke
|
1fe2f8946b
|
搜索课程.
|
2016-10-09 12:10:34 +08:00 |
|
yuanke
|
f380c64653
|
搜索课程
|
2016-10-09 11:27:35 +08:00 |
|
yuanke
|
eb3a463166
|
Merge branch 'develop' into weixin_guange
|
2016-10-09 10:36:18 +08:00 |
|
yuanke
|
d407b5ab10
|
搜索中加入课程
|
2016-10-09 10:35:43 +08:00 |
|
huang
|
45d8e64840
|
修改gitlab tree返回类型（lastrev）
|
2016-10-09 09:30:20 +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 |