 nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-14 11:32:01 +08:00 |
|
nwb
|
0031f90c64
|
1.课程动态中的私有的资源、文档进行权限判断
2.项目动态中的私有的资源、文档进行权限判断
|
2014-07-14 11:31:24 +08:00 |
 z9hang
|
3aab1b172c
|
修正执行数据迁移时的‘page_type=’ undefine错误
|
2014-07-14 11:28:29 +08:00 |
|
nwb
|
87b623bc51
|
1.文档添加密级设置
2.新建文档、修改文档视图修改
|
2014-07-14 10:44:07 +08:00 |
 yanxd
|
fd5747f4dc
|
test 3-framework
|
2014-07-14 10:27:54 +08:00 |
|
z9hang
|
98ddd6940d
|
修正错误
|
2014-07-14 09:31:55 +08:00 |
|
z9hang
|
f44c715cfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-14 09:18:46 +08:00 |
|
z9hang
|
6b6fd2906f
|
竞赛列表。贴吧列表的非空判断
数据迁移报错问题修改
|
2014-07-14 09:18:31 +08:00 |
 sw
|
59a5541e45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-11 14:52:15 +08:00 |
|
sw
|
9da70f9a20
|
调整项目列表样式
|
2014-07-11 14:51:33 +08:00 |
|
sw
|
9472a7eb5c
|
未登录时取消显示我的学校按钮
|
2014-07-11 13:41:05 +08:00 |
|
z9hang
|
e1c7aaa220
|
冲突编辑
|
2014-07-11 11:53:31 +08:00 |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-11 11:45:46 +08:00 |
|
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
2014-07-11 11:41:54 +08:00 |
|
nwb
|
48e2d8ecee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-11 11:36:19 +08:00 |
|
nwb
|
6d698cb5d8
|
下载添加权限判断
|
2014-07-11 11:36:00 +08:00 |
|
yanxd
|
2be5041d0d
|
文件界面的样式修改
|
2014-07-11 10:42:55 +08:00 |
|
sw
|
4f2298fd22
|
修复个人动态首页中留言等动态显示有误的问题
|
2014-07-11 10:31:52 +08:00 |
|
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
2014-07-11 09:08:50 +08:00 |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
2014-07-11 09:07:09 +08:00 |
|
sw
|
bed662c2e5
|
修复项目缺陷列表描述显示不正常的BUG
|
2014-07-10 17:42:40 +08:00 |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
2014-07-10 17:38:04 +08:00 |
|
sw
|
86adfaecce
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-10 16:59:59 +08:00 |
|
sw
|
51ef3fa5a1
|
修复主页课程介绍显示有误的BUG
|
2014-07-10 16:58:57 +08:00 |
|
sw
|
7bcb1cbe2e
|
修复个人主页中作业、项目介绍不正确的BUG
|
2014-07-10 16:57:04 +08:00 |
|
sw
|
47ad20421e
|
修复当课程描述中有特殊标签是，课程列表描述显示有误的BUG
|
2014-07-10 16:48:13 +08:00 |
|
yanxd
|
056f86caad
|
can't download, html. after exception return;
|
2014-07-10 16:41:34 +08:00 |
|
sw
|
39434766e3
|
1.修复超级管理员无法访问课程作业列表的BUG
2.修改作业描述样式
|
2014-07-10 16:35:53 +08:00 |
|
yanxd
|
803e9cbdb5
|
globel issue#858, 中国高校--输入无效条件点击搜索，建议给出提示信息
|
2014-07-10 16:21:55 +08:00 |
|
yanxd
|
e573438e43
|
eager_load
|
2014-07-10 15:39:40 +08:00 |
|
yanxd
|
249ea19c0c
|
神坑，users和user_statuses表中，关注信息不同步，按照影响力排序还会有问题。以及users表中在us表没有对应条目，排序中是不会显示的
|
2014-07-10 15:27:24 +08:00 |
|
sw
|
a5518363c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-10 11:31:44 +08:00 |
|
sw
|
65c137e617
|
修复进入课程作业报错的问题
|
2014-07-10 11:27:06 +08:00 |
|
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
2014-07-10 10:15:20 +08:00 |
|
yanxd
|
2ff24841fd
|
optimization image check.
|
2014-07-10 10:12:16 +08:00 |
|
yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
2014-07-10 10:05:45 +08:00 |
|
sw
|
76db0e61c3
|
调整页面样式
|
2014-07-10 09:21:24 +08:00 |
|
sw
|
aec6d33db7
|
添加wiki编辑插件
|
2014-07-10 09:12:44 +08:00 |
|
sw
|
41823fbddf
|
test
|
2014-07-10 09:10:44 +08:00 |
|
yanxd
|
91eb7751da
|
issue global 859. 搜索处理空格
|
2014-07-10 09:02:28 +08:00 |
|
Administrator
|
6082eca117
|
test
|
2014-07-10 08:56:52 +08:00 |
|
z9hang
|
4d75fbfcb8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-09 16:02:36 +08:00 |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
2014-07-09 16:02:15 +08:00 |
|
yanxd
|
0998438e67
|
bootstrap fine tuning.
|
2014-07-09 15:20:00 +08:00 |
|
yanxd
|
4259f63fbf
|
预览在issue和new里报错
|
2014-07-09 14:53:29 +08:00 |
|
z9hang
|
fd71435b30
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-09 14:40:11 +08:00 |
|
yanxd
|
38b3e86e62
|
ip=nil
|
2014-07-09 14:38:52 +08:00 |
|
z9hang
|
b87abf1f68
|
权限管理优化
|
2014-07-08 18:02:10 +08:00 |
|
yanxd
|
449b87e38d
|
remove cnzz
|
2014-07-08 15:38:37 +08:00 |
|
z9hang
|
4c6fb2a266
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-08 14:29:34 +08:00 |