 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
|
60fb21d2fc
|
班级主页的样式调整
|
2016-08-29 16:30:37 +08:00 |
|
cxt
|
eb255d84b1
|
issue详情页里的点赞刷新
|
2016-08-29 16:25:30 +08:00 |
|
cxt
|
45f0234ff7
|
组织logo点击可编辑
|
2016-08-29 16:19:06 +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
|
b3b0d8e8f3
|
Merge branch 'cxt_course' into develop
|
2016-08-29 15:40:18 +08:00 |
|
cxt
|
15ba4a6136
|
头像调整
|
2016-08-29 15:38:58 +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 |
|
Tim
|
a8d551105b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 15:28:45 +08:00 |
|
Tim
|
64b7aedd1c
|
footer部分logo与链接替换更新
|
2016-08-29 15:28:32 +08:00 |
|
cxt
|
1e169985a4
|
访问计数的颜色调整
|
2016-08-29 15:23:35 +08:00 |
|
cxt
|
cbcf414e63
|
班级主页的访问计数
|
2016-08-29 14:44:33 +08:00 |
|
cxt
|
547fb8a1a5
|
未登录用户访问个人主页时的头像显示
|
2016-08-29 14:41:01 +08:00 |
|
cxt
|
0b0a23f270
|
issue详情页面的点赞
|
2016-08-29 14:26:25 +08:00 |
|
cxt
|
95ec047653
|
班级名称过长时，动态中标题显示与动态编辑图标按钮重叠
|
2016-08-29 14:12:42 +08:00 |
|
cxt
|
313bc8573d
|
首页访问计数失效
|
2016-08-29 14:01:40 +08:00 |
|
Tim
|
a467338161
|
iphone定位js
|
2016-08-29 11:32:11 +08:00 |
 huang
|
0551c450b5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 10:21:59 +08:00 |
|
huang
|
a6f9c3375e
|
代码质量分析加入“未解决质量问题数”
|
2016-08-29 10:21:42 +08:00 |
|
cxt
|
885cc820a8
|
批量添加学生
|
2016-08-26 19:50:47 +08:00 |
|
cxt
|
5dab473eb1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-26 19:39:47 +08:00 |
|
cxt
|
0047f7bfdf
|
学生身份的编辑
|
2016-08-26 19:39:41 +08:00 |
|
huang
|
8c4f943f83
|
注释掉资源提示
|
2016-08-26 19:33:18 +08:00 |
|
huang
|
6359e44b86
|
Merge branch 'rep_quality' into develop
|
2016-08-26 18:54:59 +08:00 |
|
huang
|
5237d9664f
|
css for avatar
|
2016-08-26 18:52:20 +08:00 |
|
huang
|
3fabfdb039
|
Merge branch 'develop' into rep_quality
|
2016-08-26 18:47:35 +08:00 |
|
huang
|
16dfae4415
|
0
|
2016-08-26 18:47:17 +08:00 |
|
Tim
|
ed12928c98
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-26 18:37:10 +08:00 |
|
Tim
|
d940f957ec
|
css问题更改
|
2016-08-26 18:36:59 +08:00 |
|
cxt
|
816a480991
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-26 18:34:44 +08:00 |
|
cxt
|
ff95567926
|
基本资料中从业者的身份判断
|
2016-08-26 18:34:35 +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
|
f0c0a30bde
|
Merge branch 'rep_quality' into develop
|
2016-08-26 17:53:46 +08:00 |
|
huang
|
9b86661f4a
|
<ul class=contribute-list>
|
2016-08-26 17:49:31 +08:00 |
|
huang
|
420a17a7e4
|
资源提示统计数字及权限修改
|
2016-08-26 17:34:17 +08:00 |
|
cxt
|
f25a90cccd
|
项目的非创建者管理员也可编辑项目头像
|
2016-08-26 17:33:04 +08:00 |
|
cxt
|
5fbb9f56a6
|
Merge branch 'dev_shcool' into develop
|
2016-08-26 17:10:15 +08:00 |
|
cxt
|
148aa9cda9
|
首页头像调整
|
2016-08-26 16:42:29 +08:00 |
|
huang
|
af68f4ca76
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/files/_course_file.html.erb
app/views/files/_project_file.html.erb
|
2016-08-26 16:27:14 +08:00 |
|
huang
|
a71f948f41
|
项目、课程资源库添加私有资源提示
|
2016-08-26 16:26:12 +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 |
|
cxt
|
0ce61bfee8
|
学生删除作品时将作品还原为初始状态
|
2016-08-26 16:20:14 +08:00 |
 yuanke
|
21df119c59
|
Merge branch 'weixin_guange' into develop
|
2016-08-26 16:19:50 +08:00 |
|
yuanke
|
a66ecf6c28
|
修改图片地址
|
2016-08-26 16:18:57 +08:00 |
|
Tim
|
3f7c623163
|
新增资源提示框
|
2016-08-26 15:57:45 +08:00 |
|
huang
|
a434942b6d
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-26 15:14:07 +08:00 |
|
huang
|
60a76e64a5
|
贡献列表
|
2016-08-26 15:13:07 +08:00 |
|
cxt
|
cdffaed1ea
|
班级主页设置班级为公开私有时刷新资源库页面
|
2016-08-26 15:11:57 +08:00 |