 黄井泉
|
00c8673f4a
|
Merge branch 'dai_ao' into 'develop'
项目头部样式修改，fork数目不对
See merge request !23
|
2016-11-25 17:19:15 +08:00 |
 daiao
|
f1b6e67e50
|
项目头部样式修改，fork数目错误
|
2016-11-25 17:10:49 +08:00 |
|
huang
|
8393679c9c
|
项目关注车成员列表结构梳理
|
2016-11-25 17:08:11 +08:00 |
 cxt
|
ebda1d7d54
|
测试版课程列表报500
|
2016-11-25 16:17:02 +08:00 |
|
huang
|
636721699e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
|
2016-11-25 15:16:09 +08:00 |
|
daiao
|
c02e507f0d
|
Merge branch 'develop' into dai_ao
|
2016-11-25 15:01:22 +08:00 |
|
cxt
|
785f027a63
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:56:24 +08:00 |
|
huang
|
b15fd1607f
|
里程碑issue统计，加入未指派，调整total位置，并按成员issue的数量排序
|
2016-11-25 14:50:23 +08:00 |
|
daiao
|
09506c0954
|
项目成员,关注成员，fork新页面
|
2016-11-25 12:17:27 +08:00 |
|
daiao
|
bff5a36577
|
pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果
|
2016-11-25 11:32:45 +08:00 |
|
daiao
|
599d233176
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
|
2016-11-25 10:49:57 +08:00 |
|
daiao
|
e6e4a320ee
|
项目关注列表
|
2016-11-25 10:47:48 +08:00 |
|
huang
|
2f07aefd36
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-25 10:34:06 +08:00 |
|
huang
|
58790bcb72
|
版本库删除数据一致性 解决Gitlab本身bug，删除操作会报异常的问题
|
2016-11-25 10:31:03 +08:00 |
|
cxt
|
8743460134
|
动态与详情的回复叠层调整
|
2016-11-25 09:59:03 +08:00 |
|
huang
|
abc6eafdb4
|
修复删除版本库功能
|
2016-11-24 16:04:29 +08:00 |
|
huang
|
45bbd7b293
|
pull request 选择项目的时候JS控制分支
|
2016-11-24 14:47:02 +08:00 |
 yuanke
|
7713fba2f8
|
个人留言列表优化
|
2016-11-24 14:30:24 +08:00 |
|
yuanke
|
d28f597aed
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-24 10:53:41 +08:00 |
|
yuanke
|
86da6a0fe7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-24 10:53:22 +08:00 |
|
daiao
|
f7db47be41
|
Merge branch 'dai_ao' into develop
|
2016-11-24 10:45:43 +08:00 |
|
daiao
|
980ae78185
|
修改pull request发送源项目提示
|
2016-11-24 10:11:59 +08:00 |
|
daiao
|
5ed9d169f3
|
Merge branch 'develop' into dai_ao
|
2016-11-24 10:05:18 +08:00 |
|
huang
|
42dee92c60
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-23 17:18:42 +08:00 |
|
daiao
|
61a3ffcbd0
|
项目issue统计显示顺序按任务量排序，调整total位置和样式并增加未指派一栏
|
2016-11-23 17:18:12 +08:00 |
|
huang
|
67a9d04a64
|
版本库添加删除功能
|
2016-11-23 17:14:49 +08:00 |
|
yuanke
|
2dc6171b48
|
微信反馈时的提示语加入www.trustie.net
|
2016-11-23 16:40:31 +08:00 |
|
yuanke
|
82fa7600da
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-23 09:29:02 +08:00 |
|
huang
|
fca68c24dc
|
pull_request合并到源项目的问题
|
2016-11-22 15:05:33 +08:00 |
|
huang
|
79b1cdcf84
|
pull request 源项目拉取代码及提交
|
2016-11-22 11:06:18 +08:00 |
|
cxt
|
eeacd76aa9
|
首页班级列表的归档
|
2016-11-22 10:27:56 +08:00 |
|
daiao
|
428cb8e928
|
项目issue。里程碑为空，完成为100%的issue筛选不了
|
2016-11-21 17:21:15 +08:00 |
|
cxt
|
4388b7625e
|
首页班级列表的归档
|
2016-11-21 16:58:25 +08:00 |
|
yuanke
|
6cb711d66b
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-21 10:14:08 +08:00 |
|
yuanke
|
14552abd56
|
博客人气排序修改，个人主页关注BUG修改
|
2016-11-21 10:08:27 +08:00 |
|
cxt
|
cf6acd48c4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-18 19:17:47 +08:00 |
|
huang
|
a58a3c0655
|
项目成员新弹框ajax局部刷新
|
2016-11-18 19:00:44 +08:00 |
|
cxt
|
4da94a5bb0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-18 17:32:55 +08:00 |
|
cxt
|
9a30369cef
|
班级作业：两种身份（助教和学生）的成员匿评扣分错误
|
2016-11-18 16:37:25 +08:00 |
|
huang
|
de61d699a8
|
Merge branch 'dev_newproject' into develop
|
2016-11-18 16:22:03 +08:00 |
|
huang
|
5f35e8bd97
|
修复新注册用户不能fork的问题
|
2016-11-18 16:20:18 +08:00 |
|
huang
|
6584cd88f1
|
pull request 使用优化
|
2016-11-18 16:08:50 +08:00 |
|
daiao
|
290a301cee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
|
2016-11-18 15:48:40 +08:00 |
|
daiao
|
cd32353d91
|
Merge branch 'dai_ao' into develop
|
2016-11-18 15:45:35 +08:00 |
|
cxt
|
5510df165d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-11-18 15:45:06 +08:00 |
|
cxt
|
1fcb1db27c
|
课程大纲下的班级归档
|
2016-11-18 15:34:53 +08:00 |
|
huang
|
00d12fdeb3
|
pull reqeust相关
|
2016-11-17 17:30:15 +08:00 |
|
cxt
|
3ebc3c6492
|
老师、学生测验列表的调整
|
2016-11-17 17:04:00 +08:00 |
|
daiao
|
d65a062737
|
所有我的issue功能
|
2016-11-17 17:02:02 +08:00 |
|
huang
|
386b41d08e
|
pull requst优化
|
2016-11-17 11:32:39 +08:00 |
|
cxt
|
efd0bf6707
|
删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整
|
2016-11-17 10:23:13 +08:00 |
|
cxt
|
1ad0c1cbff
|
测验列表
|
2016-11-17 09:06:44 +08:00 |
|
daiao
|
e956d20d6e
|
我的issue部分功能
|
2016-11-16 16:57:02 +08:00 |
|
daiao
|
acffe8ec19
|
我的issue未完
|
2016-11-16 11:26:17 +08:00 |
|
cxt
|
2dc717df0c
|
Merge branch 'develop' into cxt_course
|
2016-11-15 16:57:33 +08:00 |
|
cxt
|
9f79408e32
|
导入试卷
|
2016-11-15 16:57:07 +08:00 |
|
huang
|
0adde560ba
|
我的issue路由修改及查询修改
|
2016-11-15 14:30:01 +08:00 |
|
huang
|
1e5d3e05ad
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-15 14:09:40 +08:00 |
|
huang
|
0ea9a49f86
|
质量分析界面调整
|
2016-11-15 14:09:25 +08:00 |
|
daiao
|
c927a6fecc
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-15 13:21:37 +08:00 |
|
daiao
|
ffe86c7ec9
|
项目配置删除按钮新版弹框
|
2016-11-15 13:21:27 +08:00 |
|
huang
|
11f8656651
|
0
|
2016-11-15 11:20:30 +08:00 |
|
huang
|
5f21b63c41
|
我的issue框架搭建
|
2016-11-15 10:47:07 +08:00 |
|
cxt
|
d8906db1aa
|
班级学生列表：“未分班”列表对成员分班，成员显示未自动刷新；具体分班列表对成员编辑分班，分班成员数统计未自动刷新
|
2016-11-15 10:34:14 +08:00 |
|
huang
|
3561009efc
|
Merge branch 'develop' into dev_newproject
|
2016-11-15 09:01:45 +08:00 |
|
cxt
|
edf8ceed7c
|
取消收藏的班级和项目动态不显示
|
2016-11-14 16:37:42 +08:00 |
|
huang
|
f08b04d645
|
My Issue未完
|
2016-11-14 16:06:54 +08:00 |
|
cxt
|
b06dcc9db4
|
780班级访问分班报500
|
2016-11-14 15:38:00 +08:00 |
|
cxt
|
0ed878e718
|
404、403、500页面
|
2016-11-14 15:36:36 +08:00 |
|
cxt
|
96bc35552a
|
未收藏的班级和项目动态不显示
|
2016-11-14 15:11:37 +08:00 |
|
huang
|
d1f9ce3ab2
|
课程中资源库导入不能用
|
2016-11-11 18:19:03 +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
|
442fb8a531
|
添加fork成员列表
|
2016-11-11 16:09:43 +08:00 |
|
cxt
|
d1bfdde261
|
班级名称命名和显示规范调整
|
2016-11-11 15:19:22 +08:00 |
|
daiao
|
812c74134a
|
Merge branch 'develop' into dev_newproject
|
2016-11-11 14:55:29 +08:00 |
|
cxt
|
07b97c8eb9
|
学生列表增加删除功能、删除学生时删除其对应的作品
|
2016-11-11 13:58:07 +08:00 |
|
huang
|
b633200ab6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 10:38:10 +08:00 |
|
huang
|
aab24ea34a
|
解决顶部fork路由错误，已经fork过该项目的添加提示
|
2016-11-11 10:37:20 +08:00 |
|
yuanke
|
c59081c824
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-11 10:24:22 +08:00 |
|
cxt
|
4a5e350615
|
个人主页：删除个人留言动态，却跳转到个人留言页面去了，不合理
|
2016-11-10 17:24:00 +08:00 |
|
daiao
|
43e72813b4
|
当指派着为空时，导出统计为空
|
2016-11-10 11:11:28 +08:00 |
|
yuanke
|
88d489b485
|
作业列表设留言at消息为已读改为delay_job执行
|
2016-11-10 10:41:35 +08:00 |
|
huang
|
3dcd38a059
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-10 10:31:40 +08:00 |
|
huang
|
0f328c9c58
|
解决用户ID转换成用户名后引发的问题
|
2016-11-10 10:27:57 +08:00 |
|
daiao
|
f6eb96cfdc
|
项目头部点击fork弹框
|
2016-11-09 13:34:03 +08:00 |
|
huang
|
2122a06608
|
版本库大写转小写，解决路径问题
|
2016-11-08 17:12:35 +08:00 |
|
daiao
|
27c8d53cad
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-08 16:19:23 +08:00 |
|
daiao
|
ac60940c34
|
1.项目头部样式调整
|
2016-11-08 16:18:59 +08:00 |
|
huang
|
736c93fc13
|
解决查看文件改动的时候403问题
|
2016-11-08 15:45:32 +08:00 |
|
huang
|
c27faf862f
|
版本库单个文件历史记录修改
|
2016-11-08 15:30:16 +08:00 |
|
huang
|
b5f035d286
|
版本库详情页面添加目录回退功能，部分功能及界面调整
|
2016-11-08 15:21:12 +08:00 |
|
huang
|
a3dfd03e81
|
项目顶端框架搭建及权限判断
|
2016-11-08 10:23:02 +08:00 |
|
yuanke
|
4f7531b0c4
|
修改群号
|
2016-11-08 09:28:32 +08:00 |
|
huang
|
cceadb02ce
|
Merge branch 'develop' into dev_newproject
|
2016-11-07 17:19:47 +08:00 |
|
huang
|
0ef3dbf5f8
|
Merge branch 'develop' into dev_newproject
|
2016-11-07 17:18:36 +08:00 |
|
cxt
|
f8316ee1ee
|
分组作业的缺评扣分
|
2016-11-07 14:06:11 +08:00 |
|
daiao
|
e70c66b5ac
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/views/projects/_act_issues.html.erb
|
2016-11-07 13:30:15 +08:00 |
|
daiao
|
8b5879217d
|
调整新建项目issue页面
|
2016-11-07 13:28:50 +08:00 |
|
cxt
|
4377fc1f9e
|
班级作业：评分设置中最终得分“教师优先”、“教辅优先”轮流切换多次后，得分计算错误
|
2016-11-04 20:04:27 +08:00 |