 ouyangxuhua
|
5334a3d40f
|
链接样式还原
|
2015-12-28 17:14:15 +08:00 |
|
ouyangxuhua
|
d77625e4e9
|
Merge branch 'develop' into dev_hjq
|
2015-12-28 17:04:12 +08:00 |
|
ouyangxuhua
|
33ea55ecca
|
项目/课程帖子发送弹窗样式修改
|
2015-12-28 17:03:13 +08:00 |
 lizanle
|
174f7c1972
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
app/views/issues/_list.html.erb
|
2015-12-28 16:57:05 +08:00 |
|
lizanle
|
5ce9a5109d
|
issue存在重复
|
2015-12-28 16:55:46 +08:00 |
|
lizanle
|
e35d2daa0a
|
课程资源库
|
2015-12-28 16:19:30 +08:00 |
 huang
|
900d7d62cb
|
邮件按天发送添加提示
|
2015-12-28 16:14:32 +08:00 |
|
ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
2015-12-28 15:32:03 +08:00 |
 cxt
|
7713356d55
|
Merge branch 'szzh' into cxt_course
|
2015-12-28 15:18:01 +08:00 |
|
cxt
|
c821826bd8
|
附件描述-》追加理由
|
2015-12-28 15:17:16 +08:00 |
|
ouyangxuhua
|
ad4816ca4a
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
|
2015-12-28 15:09:56 +08:00 |
|
huang
|
af9bc9a124
|
解决版本库点击新增版本版本信息丢失
|
2015-12-28 15:09:41 +08:00 |
|
huang
|
77722f0211
|
修改issue中ke高度
|
2015-12-28 14:52:36 +08:00 |
|
ouyangxuhua
|
805d785140
|
解决点击转发项目/课程帖子没有反应的问题
|
2015-12-28 14:35:13 +08:00 |
|
cxt
|
7bc030b789
|
组织模块：关联项目弹框的项目列表的高度要限制
|
2015-12-28 11:31:23 +08:00 |
|
lizanle
|
3b08adfc68
|
课程资源页面修改。
|
2015-12-27 23:24:21 +08:00 |
|
huang
|
6504e3d867
|
Merge branch 'szzh' into develop
|
2015-12-25 19:45:34 +08:00 |
|
cxt
|
37aee434e2
|
缺陷动态的回复图片超出边框
|
2015-12-25 19:43:49 +08:00 |
|
huang
|
5ca2896cc4
|
Merge branch 'szzh' into develop
|
2015-12-25 19:03:03 +08:00 |
|
cxt
|
b991dc1edd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 19:02:34 +08:00 |
|
cxt
|
d2f56693b4
|
课程通知新建报404
|
2015-12-25 19:02:26 +08:00 |
|
huang
|
8ea626ec40
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 18:05:52 +08:00 |
|
huang
|
ce740170ca
|
Merge branch 'hjq_new_course' into szzh
Conflicts:
public/stylesheets/public.css
处理冲突
|
2015-12-25 18:05:36 +08:00 |
|
huang
|
cd36a6874e
|
修改issue动态错位
|
2015-12-25 18:03:32 +08:00 |
 guange
|
4cd4d7b6dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 17:47:02 +08:00 |
|
guange
|
e3b395960c
|
base64的+号要处理一下
|
2015-12-25 17:46:45 +08:00 |
|
cxt
|
8ed01bf572
|
issue列表报500
|
2015-12-25 17:16:47 +08:00 |
|
cxt
|
f63f38fb82
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 17:07:34 +08:00 |
|
cxt
|
bca503f171
|
追加附件必须填写描述
|
2015-12-25 17:07:27 +08:00 |
|
huang
|
68751e53d0
|
Merge branch 'szzh' into develop
|
2015-12-25 16:36:02 +08:00 |
 Tim
|
445d5dc379
|
组织下拉菜单修改
|
2015-12-25 16:30:09 +08:00 |
|
huang
|
801651cba6
|
解决组织两个footer冲突问题
|
2015-12-25 16:16:06 +08:00 |
|
huang
|
533be61cf7
|
添加底部样式
|
2015-12-25 16:13:17 +08:00 |
|
huang
|
e5b4b9915d
|
添加footer图片
|
2015-12-25 16:06:24 +08:00 |
|
huang
|
5d1b63d6fa
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 16:05:07 +08:00 |
|
huang
|
7412c1caf6
|
添加footer
|
2015-12-25 16:04:49 +08:00 |
|
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:59:33 +08:00 |
|
cxt
|
914c1ad369
|
Merge branch 'cxt_course' into szzh
|
2015-12-25 15:59:24 +08:00 |
|
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
2015-12-25 15:57:30 +08:00 |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:48:41 +08:00 |
|
huang
|
a0c8e52d0a
|
Merge branch 'hjq_new_course' into szzh
|
2015-12-25 15:48:00 +08:00 |
|
huang
|
f4fc978b23
|
课程留言bug
|
2015-12-25 15:47:22 +08:00 |
|
Tim
|
06b89c5108
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
|
2015-12-25 15:28:15 +08:00 |
|
Tim
|
1a24505eac
|
footer新增图片，样式修改
|
2015-12-25 15:27:45 +08:00 |
|
cxt
|
b8d8cece02
|
关联项目的样式修改
|
2015-12-25 14:56:08 +08:00 |
|
cxt
|
aa653d558f
|
作品确认弹框的按钮样式调整
|
2015-12-25 11:26:48 +08:00 |
|
cxt
|
0b42430e2d
|
课程通知动态无法回复
|
2015-12-25 11:10:26 +08:00 |
|
cxt
|
ce5f0eb855
|
关联项目的样式修改
|
2015-12-25 11:00:41 +08:00 |
|
huang
|
e7a109d28f
|
Merge branch 'develop' into hjq_new_course
|
2015-12-25 10:40:40 +08:00 |
|
cxt
|
e86778a9c7
|
删除不存在的留言动态
|
2015-12-25 10:13:29 +08:00 |