 Tim
|
5838e8f810
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-09 10:45:33 +08:00 |
|
Tim
|
5dd6244a34
|
pull request添加留言
|
2016-08-09 10:45:14 +08:00 |
 cxt
|
547aae0743
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-09 10:40:25 +08:00 |
|
cxt
|
2951259d23
|
左侧项目列表的展开
|
2016-08-09 10:40:00 +08:00 |
|
cxt
|
153e02c4fa
|
消息列表报500
|
2016-08-09 10:39:32 +08:00 |
|
cxt
|
40dc9b761f
|
未配置课程的班级报404
|
2016-08-09 10:39:12 +08:00 |
|
cxt
|
6c9a4a6620
|
首页的左侧项目栏无法展开
|
2016-08-09 10:38:44 +08:00 |
 huang
|
d1b4e83fee
|
完成pull request 关闭功能
|
2016-08-09 10:29:18 +08:00 |
 yuanke
|
b53979d91c
|
修改微信头像不显示的BUG，动态暂时全部去掉认证！
|
2016-08-09 10:20:21 +08:00 |
|
yuanke
|
bd908af765
|
修改报错BUG
|
2016-08-09 09:33:34 +08:00 |
|
yuanke
|
61ba668818
|
函数写错名称
|
2016-08-09 09:30:30 +08:00 |
|
yuanke
|
57f3aaa9e8
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-09 09:23:19 +08:00 |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
2016-08-09 09:23:06 +08:00 |
|
Tim
|
39c50a6e4c
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/_show.html.erb
|
2016-08-08 16:35:52 +08:00 |
|
Tim
|
53dd41ec37
|
显示页面添加留言
|
2016-08-08 16:33:39 +08:00 |
|
huang
|
26c11693fd
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-08 15:24:27 +08:00 |
|
huang
|
518d6bacbe
|
添加关闭pull request功能
|
2016-08-08 15:23:55 +08:00 |
|
huang
|
fbdb1249c2
|
Merge branch 'develop' into rep_quality
|
2016-08-08 10:07:45 +08:00 |
|
yuanke
|
762fdfe634
|
微信修改
|
2016-08-05 20:31:51 +08:00 |
|
huang
|
ecc6f5601e
|
接受请求后显示admin问题
|
2016-08-05 20:14:19 +08:00 |
|
huang
|
2bdf3d573b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 19:45:06 +08:00 |
|
huang
|
20fac3852d
|
合并信息
|
2016-08-05 19:44:52 +08:00 |
 daiao
|
85c16ca9e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 19:02:41 +08:00 |
|
daiao
|
e89d7398aa
|
申请管理消息通知
|
2016-08-05 19:02:05 +08:00 |
|
cxt
|
90e480f7e9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 18:52:39 +08:00 |
|
cxt
|
5b8883960b
|
Merge branch 'cxt_course' into develop
|
2016-08-05 18:52:09 +08:00 |
|
Tim
|
0200590a70
|
待处理合并无更新内容时，页尾显示偏移bug
|
2016-08-05 18:42:14 +08:00 |
|
cxt
|
d3db6719eb
|
“我的作业”中编辑作业不跳转到“题库”，而是返回到“我的作业”
|
2016-08-05 18:41:32 +08:00 |
|
huang
|
910fe0f48c
|
css
|
2016-08-05 18:23:03 +08:00 |
|
huang
|
f54eafce76
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 18:12:29 +08:00 |
|
huang
|
a46aba1491
|
样式调整
|
2016-08-05 18:12:08 +08:00 |
|
cxt
|
55637808ff
|
班级作品：两种角色的成员，先学生身份提交作品，再教辅身份评阅自己的作品，评阅结果不能自动刷新
|
2016-08-05 18:07:54 +08:00 |
|
Tim
|
ee1d30b277
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 18:01:23 +08:00 |
|
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
2016-08-05 18:01:11 +08:00 |
|
huang
|
42e616bdea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 18:00:32 +08:00 |
|
huang
|
7c484b4f4a
|
页面显示问题
|
2016-08-05 18:00:10 +08:00 |
|
Tim
|
920e470f6d
|
pull request列表省略号显示
|
2016-08-05 17:51:39 +08:00 |
|
cxt
|
f5a2d6acdb
|
班级作品：学生提交作品弹出作品校验框，点击重试后，作品列表中默认生成的作品记录就没有了
|
2016-08-05 17:33:31 +08:00 |
|
Tim
|
d4f08f6498
|
课程logo替换，邀请码样式更改，班级路径显示主讲教师
|
2016-08-05 17:30:13 +08:00 |
|
cxt
|
ea4f0d7d9d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 16:52:01 +08:00 |
|
cxt
|
aaaeb4b8da
|
子域名申请消息报错
|
2016-08-05 16:51:51 +08:00 |
|
huang
|
3afdeda4d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 16:42:44 +08:00 |
|
huang
|
af7e507279
|
合并权限
|
2016-08-05 16:42:06 +08:00 |
|
huang
|
3ef2509d27
|
报告人员加入项目不用提醒
|
2016-08-05 16:35:22 +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
|
fb5a969fd3
|
消息弹窗
|
2016-08-05 16:30:08 +08:00 |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +08:00 |
|
daiao
|
7fbca5f260
|
单位审查消息及其BUG修复
|
2016-08-05 16:14:26 +08:00 |
|
Tim
|
e8d4bc0772
|
弹框可拖拽
|
2016-08-05 16:13:37 +08:00 |
|
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |