 sw
|
27314f8b54
|
Merge branch 'memcached_alan' into szzh
|
10 years ago |
 alan
|
98f38b0a5b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
10 years ago |
 yutao
|
4494e5cd64
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
065c196edc
|
...
|
10 years ago |
|
yutao
|
709c026910
|
...
|
10 years ago |
 huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
10 years ago |
|
alan
|
32a6c29c7c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
Gemfile
app/views/layouts/base_projects.html.erb
app/views/projects/_development_group.html.erb
app/views/projects/_research_team.html.erb
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
95f3d89afa
|
项目新闻添加编辑器：显示页面、列表页面新样式显示
|
10 years ago |
|
huang
|
a6da2b4a01
|
项目添加新的编辑器
显示页面显示样式调整
|
10 years ago |
|
huang
|
052d293f82
|
新建项目时候：
如果我的项目中有重名的项目不允许新建
|
10 years ago |
|
alan
|
1c9b9dff79
|
修改《编辑器还原》《提示信息的添加》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
c18d1d9585
|
修改《匿名发布新帖》《编辑时出现跳转错误》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
a0ca31780e
|
修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
guange
|
689ec5cdfc
|
课程通知列表更多功能bug
|
10 years ago |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
alan
|
f1f871ffda
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
4a588506a4
|
增加编辑器
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
3f744d46f2
|
超级管理员界面--贴吧回复成功
|
10 years ago |
|
huang
|
fa563b60d5
|
项目issue添加周报功能
|
10 years ago |
|
alan
|
ab9d74f364
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
052868a6b4
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
6c6ae38f7a
|
课程主页私有样式
|
10 years ago |
|
guange
|
e3633e702c
|
firefox样式问题
|
10 years ago |
|
yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
10 years ago |
|
guange
|
1226f74750
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
10 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
10 years ago |
|
sw
|
a44cba2e6a
|
Merge branch 'develop' into guange_dev
|
10 years ago |
|
guange
|
d2a7d41963
|
头像加入大小限制
|
10 years ago |
|
sw
|
659ff254e1
|
background背景图片拉伸
|
10 years ago |
|
guange
|
66e2bc5ef2
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
588d96a0c0
|
头像上传只允许图片
|
10 years ago |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
99e3d09e83
|
IE浏览器中li前面有个点
|
10 years ago |
|
guange
|
907d89e1cc
|
merge
|
10 years ago |
|
yutao
|
233c68e965
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
68cf5fa55e
|
修复:当1个页面存在多个上传控件时的各种bug
|
10 years ago |
|
huang
|
7db9e2eb7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
2fb5871058
|
缺陷显示新界面
|
10 years ago |
|
guange
|
e5a9d87ce1
|
新建贴吧如果放个图片就会撑坏版面
|
10 years ago |
|
alan
|
372bf71ca5
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
cc5738c12f
|
课程讨论区回复样式错误
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
a77a572a4d
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
guange
|
06b17581b1
|
图片撑出在firefox上的问题
|
10 years ago |
|
sw
|
9bbae3d7ac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
|
10 years ago |
|
sw
|
3dc1b2642a
|
发布竞赛日期选择图标有问题
|
10 years ago |
|
sw
|
c241fc00e9
|
测试版--课程--课程作业：如图作业附件显示与图标重叠
|
10 years ago |
|
sw
|
c129e767e5
|
测试版：公共贴吧：显示页数应该与虚线分开
|
10 years ago |
|
huang
|
574e79ff57
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
725a6e4238
|
解决发布竞赛日历问题
|
10 years ago |
