 cxt
|
88c4a26303
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:03:01 +08:00 |
|
cxt
|
8efcf876c6
|
班级删除成员后，隐藏对应作品记录历史数据迁移
|
2016-11-25 11:03:30 +08:00 |
 daiao
|
428cb8e928
|
项目issue。里程碑为空，完成为100%的issue筛选不了
|
2016-11-21 17:21:15 +08:00 |
|
daiao
|
c31287f2f5
|
temp用户，铃铛消息报500，并修改点击名称进个人主页（目前申请类消息点击进自己主页）
|
2016-11-21 15:21:51 +08:00 |
 huang
|
90cf429a10
|
fork 弹出新页面
|
2016-11-18 21:20:44 +08:00 |
|
huang
|
de61d699a8
|
Merge branch 'dev_newproject' into develop
|
2016-11-18 16:22:03 +08:00 |
|
cxt
|
5510df165d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-11-18 15:45:06 +08:00 |
|
cxt
|
3ebc3c6492
|
老师、学生测验列表的调整
|
2016-11-17 17:04:00 +08:00 |
|
cxt
|
efd0bf6707
|
删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整
|
2016-11-17 10:23:13 +08:00 |
|
huang
|
5dcb99c3ad
|
优化projects数据库表，删除不必要的字段
|
2016-11-15 16:38:30 +08:00 |
|
cxt
|
ef9b389cfc
|
作业动态报500
|
2016-11-14 17:32:18 +08:00 |
|
huang
|
d040d2efd1
|
版本库添加返回上一级目录
|
2016-11-11 17:21:18 +08:00 |
|
cxt
|
cb5ca96bb5
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_homework.html.erb
db/schema.rb
|
2016-11-11 16:53:20 +08:00 |
|
cxt
|
16c51e1eaa
|
基于项目的分组作业没有显示项目详情
|
2016-11-11 16:50:25 +08:00 |
|
huang
|
e544b04f6f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:10:20 +08:00 |
|
huang
|
442fb8a531
|
添加fork成员列表
|
2016-11-11 16:09:43 +08:00 |
|
daiao
|
65e59e31e0
|
Issue表fixed_version_id数据迁移
|
2016-11-11 15:39:13 +08:00 |
|
huang
|
8fce011392
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 15:35:39 +08:00 |
|
huang
|
766e4fcb1d
|
上线迁移问题
|
2016-11-11 15:35:18 +08:00 |
|
daiao
|
e8f1a388ef
|
项目issue表数据迁移
|
2016-11-11 15:20:07 +08:00 |
|
cxt
|
d1bfdde261
|
班级名称命名和显示规范调整
|
2016-11-11 15:19:22 +08:00 |
|
huang
|
629770a703
|
Issue指派给为0的时候迁移
|
2016-11-11 14:50:49 +08:00 |
|
cxt
|
e65f9bd98b
|
issue多级回复的调整
|
2016-10-31 15:56:37 +08:00 |
 yuanke
|
93ed72fb59
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-28 15:57:53 +08:00 |
|
huang
|
d2138dd872
|
里程碑中增加创建者、项目私有公开显示特性
|
2016-10-28 14:20:00 +08:00 |
|
huang
|
3ef90a3c62
|
Merge branch 'dev_newproject' into develop
Conflicts:
db/schema.rb
|
2016-10-27 17:33:28 +08:00 |
|
cxt
|
c79676d426
|
问卷的上移、下移
|
2016-10-27 15:11:52 +08:00 |
|
huang
|
412b37d643
|
modified quality analysis error list
|
2016-10-25 17:08:05 +08:00 |
|
cxt
|
453e91dcfb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-20 14:24:13 +08:00 |
|
cxt
|
269083c4a6
|
分组作业的评分设置
|
2016-10-20 14:24:07 +08:00 |
|
huang
|
1b8bf05be5
|
用户ID装换成用户名
|
2016-10-20 13:26:11 +08:00 |
|
cxt
|
6109a1602b
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-19 18:11:02 +08:00 |
|
cxt
|
e102815f60
|
个人主页
|
2016-10-19 18:03:59 +08:00 |
|
huang
|
fce6c407c8
|
Merge branch 'rep_quality' into dev_newproject
Conflicts:
app/controllers/projects_controller.rb
app/views/layouts/base_projects.html.erb
app/views/projects/settings/_new_edit.html.erb
public/stylesheets/css/project.css
|
2016-10-19 11:27:49 +08:00 |
|
cxt
|
a5375fc668
|
迁移的修改
|
2016-10-15 18:39:17 +08:00 |
|
cxt
|
1433bcb8ab
|
历史数据迁移
|
2016-10-15 18:35:36 +08:00 |
|
huang
|
c94f986ba2
|
将未发布的作业恢复成已发布
|
2016-10-15 14:20:54 +08:00 |
|
huang
|
5532ec3b86
|
Merge branch 'develop' into dev_newproject
Conflicts:
app/views/issues/index.html.erb
app/views/layouts/base_projects.html.erb
public/stylesheets/css/project.css
|
2016-10-15 10:53:01 +08:00 |
|
huang
|
f2f9792203
|
attachment history中description字段类型修改
|
2016-10-15 09:38:48 +08:00 |
|
daiao
|
d3575b288e
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
db/schema.rb
|
2016-10-15 09:00:03 +08:00 |
|
huang
|
0760836f29
|
项目base优化
|
2016-10-14 17:23:51 +08:00 |
|
cxt
|
a581f989c9
|
给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复
|
2016-10-11 14:08:44 +08:00 |
|
huang
|
5f1458483c
|
修改attachment字段类型，解决字段长不能上传的问题
|
2016-10-09 13:44:32 +08:00 |
|
cxt
|
3b8dded2bc
|
新建课程的教师团队为空
|
2016-10-08 10:21:33 +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 |
|
huang
|
61f99137fc
|
去掉项目模式及数据迁移
|
2016-09-23 10:53:45 +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 |
|
huang
|
a3467a5697
|
项目课程讨论区资源公开迁移
|
2016-09-18 15:53:32 +08:00 |
 liguangye
|
53bdeed1e4
|
解决铃铛404问题
|
2016-09-18 14:20:08 +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 |
|
huang
|
de3fc8aa9f
|
school为0的情况数据迁移
|
2016-09-14 16:26:37 +08:00 |
|
daiao
|
5a25eb324b
|
Merge branch 'dev_shcool' into develop
|
2016-09-14 15:13:31 +08:00 |
|
huang
|
390f68aad6
|
作品列表页面性能提升（主要是数据库查询减少，建立相关索引）
|
2016-09-13 14:57:45 +08:00 |
|
daiao
|
a3f444819e
|
项目列表名字太长排版问题
|
2016-09-12 10:52:43 +08:00 |
 Tim
|
b796ac3b53
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/exercise/_student_table.html.erb
db/schema.rb
|
2016-09-09 13:30:10 +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
|
d8bc6a51fc
|
加索引
|
2016-09-07 15:14:10 +08:00 |
|
cxt
|
bec09a7f1c
|
为student_work_tests增加索引
|
2016-09-07 14:03:20 +08:00 |
|
cxt
|
1e7f3db946
|
分组作业：组内每个成员都复制一份组长的作业，得分相同
|
2016-09-06 15:07:43 +08:00 |
|
daiao
|
cdd4dfcf09
|
项目列表中：私有项目对非成员显示，非成员不点击进入
|
2016-09-05 16:55:56 +08:00 |
|
huang
|
cde1d11871
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-31 10:34:42 +08:00 |
|
cxt
|
f4632c432f
|
消息列表中的at消息报500
|
2016-08-30 17:11:22 +08:00 |
|
huang
|
e2c0237fcd
|
解决空数据库问题
|
2016-08-30 15:30:01 +08:00 |
|
huang
|
ee2ae456ac
|
unresolved issues for sonar
|
2016-08-30 10:43:47 +08:00 |
|
huang
|
803bd9819a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/css/public.css
|
2016-08-26 17:55:51 +08:00 |
|
huang
|
a71f948f41
|
项目、课程资源库添加私有资源提示
|
2016-08-26 16:26:12 +08:00 |
|
Tim
|
df1039cd09
|
项目收藏按钮位置调整
|
2016-08-25 15:55:36 +08:00 |
|
cxt
|
56b74b755b
|
取消收藏
|
2016-08-24 17:30:30 +08:00 |
|
cxt
|
7d89f69981
|
班级和项目收藏夹
|
2016-08-24 15:58:23 +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
|
3130296e69
|
修改微信个人信息获取实现
|
2016-08-13 11:09:48 +08:00 |
|
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
2016-08-11 17:22:48 +08:00 |
|
cxt
|
7edb30754b
|
student_works添加字段commit_time，记录学生作品实际的提交时间
|
2016-08-10 16:50:27 +08:00 |
|
huang
|
5ad063b830
|
记录接受PR用户信息，并且唯一性判断
|
2016-08-10 16:27:41 +08:00 |
|
huang
|
e2557aede8
|
test jenkins
|
2016-08-10 10:58:47 +08:00 |
|
huang
|
3ef2509d27
|
报告人员加入项目不用提醒
|
2016-08-05 16:35:22 +08:00 |
|
Tim
|
950b18c250
|
加入班级提示
|
2016-08-03 16:39:22 +08:00 |
|
guange
|
fc38ef6a3f
|
增加了一个查看服务器内网ip的middleware，利于以后分析问题，headers为X-Response-Ip
|
2016-08-01 19:16:51 +08:00 |
|
cxt
|
3bc696a597
|
申请学校的更改
|
2016-08-01 13:57:55 +08:00 |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +08:00 |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 21:39:00 +08:00 |
|
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 20:52:18 +08:00 |
|
huang
|
643b06484b
|
消息表添加字段
|
2016-07-29 20:50:55 +08:00 |
|
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
2016-07-29 19:39:42 +08:00 |
|
cxt
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +08:00 |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
2016-07-29 14:49:37 +08:00 |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-29 14:36:18 +08:00 |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
2016-07-29 14:34:42 +08:00 |
|
daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
2016-07-28 20:02:57 +08:00 |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
2016-07-28 20:01:22 +08:00 |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
2016-07-28 16:22:33 +08:00 |
|
yuanke
|
283dc86a8b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
db/schema.rb
public/assets/wechat/homework_detail.html
public/javascripts/wechat/controllers/activity.js
|
2016-07-28 15:23:12 +08:00 |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
2016-07-28 15:11:04 +08:00 |