 z9hang
|
80c35dcd96
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 16:49:24 +08:00 |
|
z9hang
|
27a4e462de
|
jpeg图片预览
|
2015-03-20 16:49:04 +08:00 |
 huang
|
72d41fd07a
|
修改邮件邀请提示信息！
|
2015-03-20 16:17:48 +08:00 |
|
huang
|
ec8b7e4128
|
修改项目tag删除判断错误
|
2015-03-20 16:12:46 +08:00 |
|
huang
|
99dd66d8de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 16:08:11 +08:00 |
|
huang
|
e171f7b249
|
项目标签添加删除功能
|
2015-03-20 16:07:52 +08:00 |
whimlex
|
d73d842e31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 15:59:53 +08:00 |
|
z9hang
|
5e8f29eb5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 15:59:44 +08:00 |
|
whimlex
|
34579e395f
|
附件上传bug修改；意见反馈收拉一致
|
2015-03-20 15:59:30 +08:00 |
|
z9hang
|
473a8805e2
|
发布取消发布问卷时提示信息有下拉框问题
|
2015-03-20 15:59:16 +08:00 |
|
huang
|
885b2092e4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 15:52:49 +08:00 |
|
huang
|
83d63bf479
|
修改竞赛关注中关注项目读取错误
|
2015-03-20 15:52:32 +08:00 |
|
z9hang
|
eebcccd4bb
|
编辑贴吧等不显示附件问题
|
2015-03-20 15:20:11 +08:00 |
|
z9hang
|
aa1782a48d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 15:12:17 +08:00 |
|
z9hang
|
1cd2984c05
|
#2066 网站中的图片附件链接，能否点击后直接在浏览器中显示，而不是下载？
|
2015-03-20 15:11:53 +08:00 |
|
huang
|
cea43cb045
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 15:03:24 +08:00 |
|
huang
|
69eb7fbd77
|
关注、加入项目样式，处理样式冲突
|
2015-03-20 15:02:20 +08:00 |
|
whimlex
|
5924cd6432
|
commit
|
2015-03-20 11:37:57 +08:00 |
|
z9hang
|
5278d4dd2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 11:37:22 +08:00 |
|
z9hang
|
4ca5687b3b
|
#2072测试版--项目--问题跟踪：成功新建问题后建议提示信息为“问题已创建”就好
|
2015-03-20 11:37:09 +08:00 |
|
whimlex
|
93838f604d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 11:35:18 +08:00 |
|
whimlex
|
3837e1fcf5
|
申请加入：附件上传
|
2015-03-20 11:34:59 +08:00 |
 lizanle
|
cdad43fdfc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-20 11:08:47 +08:00 |
|
lizanle
|
a4567396e4
|
如果没有上传图片就会报空指针
|
2015-03-20 11:08:27 +08:00 |
|
z9hang
|
0d8786f7dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 09:32:44 +08:00 |
|
z9hang
|
74d1ebed4e
|
课程资源中样式显示问题
|
2015-03-20 09:31:54 +08:00 |
 sw
|
a596662791
|
Merge branch 'guange_dev' into szzh
|
2015-03-19 17:50:06 +08:00 |
|
sw
|
7c9d007785
|
Merge branch 'szzh' into guange_dev
|
2015-03-19 17:49:41 +08:00 |
 guange
|
7decf34cc7
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-03-19 17:48:40 +08:00 |
|
guange
|
92b72c995a
|
纠正合并
|
2015-03-19 17:47:51 +08:00 |
|
sw
|
7085beb3ab
|
Merge branch 'guange_dev' into szzh
|
2015-03-19 17:44:32 +08:00 |
|
sw
|
0c4f88ca29
|
Merge branch 'szzh' into guange_dev
|
2015-03-19 17:43:56 +08:00 |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
2015-03-19 17:41:45 +08:00 |
|
sw
|
6edbb3c7ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 17:29:17 +08:00 |
|
whimlex
|
45475c3612
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 17:28:38 +08:00 |
|
whimlex
|
6995ead66c
|
项目ID
|
2015-03-19 17:28:12 +08:00 |
 dingxu
|
f4dff55377
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 17:24:14 +08:00 |
|
dingxu
|
073cb07f70
|
邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、
展开条样式修改
|
2015-03-19 17:23:53 +08:00 |
|
whimlex
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-19 17:22:25 +08:00 |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
2015-03-19 17:21:11 +08:00 |
|
dingxu
|
7b3af413cd
|
邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
|
2015-03-19 16:51:07 +08:00 |
|
dingxu
|
79588489e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 16:25:38 +08:00 |
|
dingxu
|
440855c0e6
|
修改项目tag样式
|
2015-03-19 16:25:18 +08:00 |
|
z9hang
|
191261e47f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 14:42:28 +08:00 |
|
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
2015-03-19 14:41:31 +08:00 |
|
lizanle
|
0424fc55db
|
项目资源数显示错误
|
2015-03-19 11:26:31 +08:00 |
|
lizanle
|
966f93012d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-19 11:16:11 +08:00 |
|
lizanle
|
c209bccba0
|
项目资源数显示错误
|
2015-03-19 11:15:58 +08:00 |
|
huang
|
f5b528dc4d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 10:44:24 +08:00 |
|
huang
|
371f25b61f
|
修改邀请页面分页异常（冲突引起）
|
2015-03-19 10:44:03 +08:00 |