 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
|
420a17a7e4
|
资源提示统计数字及权限修改
|
2016-08-26 17:34:17 +08:00 |
 cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 16:23:07 +08:00 |
 daiao
|
a3ec35c008
|
个人主页报500
|
2016-08-24 15:56:03 +08:00 |
|
daiao
|
90803fbb2a
|
Merge branch 'dev_shcool' into develop
|
2016-08-24 14:53:31 +08:00 |
|
daiao
|
078900088a
|
修复：新建组织关联trustie-forge项目，点击组织动态的论坛动态报500
|
2016-08-24 14:41:26 +08:00 |
|
daiao
|
5088770214
|
修复：文章附件和资源栏目下载权限一致
|
2016-08-23 16:34:11 +08:00 |
|
cxt
|
b8dc444cc7
|
普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表
复制班级功能里，勾选“作业”，同上
对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
|
2016-08-23 10:17:08 +08:00 |
|
huang
|
d7177713ff
|
勾选游客后，游客能够下载资源
|
2016-08-14 11:16:43 +08:00 |
|
huang
|
7c28f97208
|
get quality analisys update time
|
2016-08-14 10:45:01 +08:00 |
|
huang
|
ff592c106e
|
sonar最新触发时间获取
|
2016-08-14 10:29:52 +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 |
|
huang
|
9003040d6a
|
版本库获取动态API修改
|
2016-08-13 14:42:24 +08:00 |
|
huang
|
00f032816c
|
版本库获取方式修改
|
2016-08-13 13:48:23 +08:00 |
|
huang
|
75971120f7
|
Merge branch 'develop' into rep_quality
|
2016-08-12 17:14:18 +08:00 |
|
cxt
|
4a25b6357b
|
我的作业报500
|
2016-08-11 16:12:48 +08:00 |
|
huang
|
8eaeea299a
|
相同分支和项目消息JS提示
|
2016-08-11 15:19:58 +08:00 |
|
huang
|
a9942fd4b3
|
change integer to A
|
2016-08-11 10:48:48 +08:00 |
|
huang
|
98a8702ba6
|
记录谁合并的pull request请求
|
2016-08-10 16:49:48 +08:00 |
|
cxt
|
71326c901d
|
学生在启动匿评后再提交作品，此时该学生及该学生的作品是不被匿评的，应该是“查看作品”
|
2016-08-10 16:09:13 +08:00 |
|
huang
|
867434531d
|
pull request 列表页面添加分页
|
2016-08-09 15:28:06 +08:00 |
|
huang
|
518d6bacbe
|
添加关闭pull request功能
|
2016-08-08 15:23:55 +08:00 |
|
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
2016-08-05 16:32:10 +08:00 |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +08:00 |
|
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
2016-08-05 15:28:39 +08:00 |
|
huang
|
f4bda16469
|
fork分支PR
|
2016-08-04 18:30:04 +08:00 |
|
daiao
|
7f62de59e1
|
优化周二代码审查的代码
|
2016-08-03 17:36:04 +08:00 |
|
huang
|
b8cccdffda
|
完成changes数据获取及展示
|
2016-08-03 15:56:07 +08:00 |
|
huang
|
be081f5c66
|
添加Api（提交内容，改动）及相关方法路由
|
2016-08-03 13:57:59 +08:00 |
|
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
2016-08-02 14:53:33 +08:00 |
 Tim
|
1fc617d5fa
|
pull request页面删除
|
2016-08-01 16:57:55 +08:00 |
|
huang
|
b718803bd9
|
修改控制器名称及控制器查询访问权限
|
2016-08-01 16:54:31 +08:00 |
|
huang
|
685f9d8090
|
项目左侧权限控制
|
2016-08-01 16:19:15 +08:00 |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
2016-08-01 15:33:47 +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 |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
2016-07-29 19:37:15 +08:00 |
|
cxt
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +08:00 |
|
huang
|
450217e7c2
|
同意加入消息发送，及添加成员
|
2016-07-29 15:58:24 +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 |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
2016-07-28 16:22:33 +08:00 |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
2016-07-28 14:42:36 +08:00 |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
2016-07-28 10:19:37 +08:00 |
|
huang
|
7413298aad
|
项目邀请码申请及弹框
|
2016-07-28 10:18:35 +08:00 |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
2016-07-27 10:54:38 +08:00 |
|
cxt
|
1f8fa1c70a
|
班级动态去掉“>”
|
2016-07-26 17:16:42 +08:00 |
|
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
2016-07-26 16:54:34 +08:00 |