 Tim
|
eda735db58
|
footer文字居中
|
2016-08-31 14:40:34 +08:00 |
 huang
|
bbe44b3957
|
Merge branch 'develop' into rep_quality
|
2016-08-30 11:18:49 +08:00 |
|
huang
|
ee2ae456ac
|
unresolved issues for sonar
|
2016-08-30 10:43:47 +08:00 |
|
Tim
|
ac0cc37fe4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 16:39:23 +08:00 |
|
Tim
|
ea0211c9ca
|
组织搜索成员时，页数过多折行问题
|
2016-08-29 16:39:13 +08:00 |
 cxt
|
4ff45c15a3
|
还原质量分析的代码
|
2016-08-29 15:43:32 +08:00 |
|
cxt
|
acb18ca4c6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 15:40:26 +08:00 |
|
cxt
|
3c5afb2b4f
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-08-29 15:35:04 +08:00 |
|
cxt
|
1e169985a4
|
访问计数的颜色调整
|
2016-08-29 15:23:35 +08:00 |
|
cxt
|
95ec047653
|
班级名称过长时，动态中标题显示与动态编辑图标按钮重叠
|
2016-08-29 14:12:42 +08:00 |
|
huang
|
a6f9c3375e
|
代码质量分析加入“未解决质量问题数”
|
2016-08-29 10:21:42 +08:00 |
|
Tim
|
d940f957ec
|
css问题更改
|
2016-08-26 18:36:59 +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
|
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 |
|
Tim
|
3f7c623163
|
新增资源提示框
|
2016-08-26 15:57:45 +08:00 |
|
Tim
|
3e78dec32a
|
将课程、项目公用类放至public.css中
|
2016-08-25 16:07:57 +08:00 |
|
Tim
|
df1039cd09
|
项目收藏按钮位置调整
|
2016-08-25 15:55:36 +08:00 |
|
Tim
|
a13ec60173
|
修复无效的css
|
2016-08-24 17:02:59 +08:00 |
|
huang
|
0c6e1b2ccb
|
版本库样式修改，显示全时间
|
2016-08-13 14:42:51 +08:00 |
|
huang
|
1b19d227f9
|
项目列表样式及连接
|
2016-08-13 10:17:38 +08:00 |
|
huang
|
56afad9242
|
质量分析列表中添加时间和版本
|
2016-08-11 09:48:29 +08:00 |
|
huang
|
867434531d
|
pull request 列表页面添加分页
|
2016-08-09 15:28:06 +08:00 |
|
huang
|
87c5f50545
|
PULL request 评论创建及局部刷新
|
2016-08-09 14:51:48 +08:00 |
|
Tim
|
5dd6244a34
|
pull request添加留言
|
2016-08-09 10:45:14 +08:00 |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +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 |
|
Tim
|
be5e74897a
|
项目弹框位置调整
|
2016-08-05 15:26:15 +08:00 |
|
Tim
|
56452d69f4
|
侧导航字体大小，颜色更改
|
2016-08-05 14:11:35 +08:00 |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
2016-08-04 16:33:51 +08:00 |
|
Tim
|
b8a40862ce
|
改变行代码格式化，不折行
|
2016-08-04 14:04:55 +08:00 |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
2016-08-04 11:05:34 +08:00 |
|
Tim
|
a5fe620452
|
题库翻页居中对齐
|
2016-08-03 14:57:02 +08:00 |
|
cxt
|
718b13e6c1
|
新版题库
|
2016-08-03 11:12:55 +08:00 |
|
Tim
|
e7fa38e52c
|
pull request show页面
|
2016-08-03 11:00:31 +08:00 |
|
Tim
|
3e95b070d0
|
合并请求代码
|
2016-08-02 15:00:05 +08:00 |
|
Tim
|
9af8757ceb
|
项目合并请求
|
2016-08-02 10:03:42 +08:00 |
|
Tim
|
be36755d95
|
代码合并页面
|
2016-08-01 16:53:33 +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
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
2016-07-28 14:42:36 +08:00 |
|
Tim
|
6078db7e39
|
sy_public.css样式重用处理
|
2016-07-27 16:44:21 +08:00 |
|
Tim
|
9d7fa86cb6
|
syllabus.css样式重用处理
|
2016-07-27 16:33:27 +08:00 |
|
Tim
|
52475099dc
|
博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理
|
2016-07-27 14:36:46 +08:00 |
|
huang
|
463c09f02c
|
项目邀请弹框
|
2016-07-26 08:55:07 +08:00 |
|
cxt
|
6c7925a7b4
|
样式调整
|
2016-07-22 18:20:11 +08:00 |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
2016-07-22 16:46:01 +08:00 |
|
cxt
|
9422e2886c
|
新版班级主页
|
2016-07-22 15:32:37 +08:00 |
|
cxt
|
1e28ff880d
|
新版课程大纲
|
2016-07-22 10:20:28 +08:00 |
|
Tim
|
fe105c84ad
|
弹框定位改为fixed
|
2016-07-21 10:18:58 +08:00 |