 Tim
|
0200590a70
|
待处理合并无更新内容时，页尾显示偏移bug
|
2016-08-05 18:42:14 +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 |
|
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 |
 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 |
|
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
|
huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
2016-08-05 15:30:03 +08:00 |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
2016-08-05 15:28:39 +08:00 |
|
huang
|
8cf0048b1a
|
gemfile恢复
|
2016-08-05 15:27:04 +08:00 |
|
Tim
|
be5e74897a
|
项目弹框位置调整
|
2016-08-05 15:26:15 +08:00 |
|
huang
|
43a4e0a2bf
|
fork成功不跳转提示
|
2016-08-05 15:23:52 +08:00 |
|
huang
|
308b050612
|
link to路由问题
|
2016-08-05 14:43:44 +08:00 |
|
Tim
|
82644bcd81
|
加入班级、项目弹框可拖拽
|
2016-08-05 14:36:01 +08:00 |
|
huang
|
b62ac02c15
|
自身分支创建PR修改
|
2016-08-05 14:19:09 +08:00 |
|
Tim
|
56452d69f4
|
侧导航字体大小，颜色更改
|
2016-08-05 14:11:35 +08:00 |
|
huang
|
4ec8cc9a50
|
PR新建相关功能完善
|
2016-08-05 11:19:36 +08:00 |
|
huang
|
f3c0c25d76
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-05 11:10:59 +08:00 |
|
huang
|
b86b2299a7
|
fork分支选择 js
|
2016-08-05 11:10:39 +08:00 |
|
Tim
|
c679b986d6
|
侧导航新增请求快捷链接
|
2016-08-05 11:07:44 +08:00 |
|
huang
|
b297446778
|
select选择框
|
2016-08-05 10:42:06 +08:00 |
|
cxt
|
f9bfe278c0
|
多重身份的学生匿评变为了教辅评分
|
2016-08-05 10:03:47 +08:00 |
|
huang
|
ab6acb460e
|
forke项目发送pull request API
|
2016-08-04 19:32:44 +08:00 |
|
huang
|
f4bda16469
|
fork分支PR
|
2016-08-04 18:30:04 +08:00 |
 yuanke
|
735e6d1b71
|
Merge branch 'weixin_guange' into develop
|
2016-08-04 18:11:35 +08:00 |
|
yuanke
|
491b6fcb72
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-04 18:10:47 +08:00 |
|
yuanke
|
bb46aa4745
|
微信点击已审批模版消息进入界面显示修改
|
2016-08-04 18:09:54 +08:00 |
|
Tim
|
1335dc1b76
|
提示文字取消粗体
|
2016-08-04 17:27:53 +08:00 |
|
huang
|
5419103268
|
修改API(gitlab中创建所有pullrequest为Admin的问题)
|
2016-08-04 17:01:19 +08:00 |
|
Tim
|
28a29fa724
|
拖拽删除
|
2016-08-04 16:50:33 +08:00 |
|
yuanke
|
d5df45e8fb
|
项目动态点入详情后返回需回到点入的项目动态处
|
2016-08-04 16:35:07 +08:00 |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
2016-08-04 16:33:51 +08:00 |
|
huang
|
99fa39371d
|
接受请求ajax刷新
|
2016-08-04 15:36:02 +08:00 |
|
yuanke
|
14ca135586
|
Merge branch 'weixin_guange' into develop
|
2016-08-04 15:33:22 +08:00 |
|
yuanke
|
55afb84aef
|
模版消息标题加上句号，审核模版消息再次点击显示修改
|
2016-08-04 15:32:25 +08:00 |
|
huang
|
9eb084c3bd
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/_show.html.erb
|
2016-08-04 15:08:05 +08:00 |
|
huang
|
515649beb6
|
接受PR局部刷新及跳转
|
2016-08-04 15:07:15 +08:00 |
|
Tim
|
33467d3152
|
已处理页面样式；新建时选择项目刷新分支js
|
2016-08-04 15:04:27 +08:00 |
|
yuanke
|
ee019cd364
|
修改测试版微信加入项目审核通知
|
2016-08-04 14:47:39 +08:00 |