 nwb
|
87b623bc51
|
1.文档添加密级设置
2.新建文档、修改文档视图修改
|
2014-07-14 10:44:07 +08:00 |
|
nwb
|
6d698cb5d8
|
下载添加权限判断
|
2014-07-11 11:36:00 +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 |
 yanxd
|
056f86caad
|
can't download, html. after exception return;
|
2014-07-10 16:41:34 +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 |
|
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 |
|
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 |
xianbo
|
25ee1d8672
|
for adjust test domain and give a setting reposwq
|
2014-07-08 10:59:20 +08:00 |
|
z9hang
|
0fa552c8d3
|
软件众包中点击我要参与报无权限问题
|
2014-07-08 09:34:41 +08:00 |
|
z9hang
|
b4bf320c2e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-08 09:12:28 +08:00 |
|
z9hang
|
5e3a763776
|
添加引用项目权限、修改引用判断
|
2014-07-08 09:12:16 +08:00 |
|
yanxd
|
4dbe149b42
|
删掉user里的扩展表信息，防止第一次迁移失败
|
2014-07-07 17:24:51 +08:00 |
|
yanxd
|
ab03962e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-07 16:53:00 +08:00 |
|
yanxd
|
aca63146e9
|
搜索文件归属，课程相关逻辑修改，查询把过滤去掉了。暂时没想有什么过滤的好办法
|
2014-07-07 16:52:39 +08:00 |
|
nwb
|
8b2199e28c
|
新建竞赛时的日期判断优化
|
2014-07-07 15:01:10 +08:00 |
|
nwb
|
431b4541c3
|
新建竞赛时奖励设置为不能为空
|
2014-07-07 14:37:32 +08:00 |
|
nwb
|
b4ee106ce9
|
竞赛搜索项为空时给出提示
|
2014-07-07 14:31:21 +08:00 |
|
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
2014-07-07 13:41:44 +08:00 |
|
nwb
|
633c4278d8
|
修改课程列表视图
|
2014-07-07 10:12:07 +08:00 |
|
nwb
|
0471446ac8
|
新增、修改缺陷发送邮件的缺陷编写优化
|
2014-07-07 10:07:50 +08:00 |
|
nwb
|
beeb707347
|
用户未登陆时首页不提示“该学校未开设任何课程”
|
2014-07-07 09:37:45 +08:00 |
|
nwb
|
5f18b1a38c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 15:11:57 +08:00 |
|
z9hang
|
f5b69be967
|
新建贴吧描述为空不能新建、搜索空内容添加提示
|
2014-07-05 14:43:15 +08:00 |
|
nwb
|
fb8e97ff61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/show.html.erb
|
2014-07-05 13:51:41 +08:00 |
|
nwb
|
eb15edd5ff
|
1.添加文档
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
|
2014-07-05 13:31:32 +08:00 |
|
z9hang
|
5c93442c79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:44:21 +08:00 |
|
z9hang
|
01da0852e3
|
新建贴吧错误提示修改
|
2014-07-05 11:44:05 +08:00 |
|
sw
|
6365d01051
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:21:27 +08:00 |
|
sw
|
f1b8b7caed
|
t
|
2014-07-05 11:20:59 +08:00 |
|
z9hang
|
470f40db82
|
去除绝对网址
|
2014-07-05 11:00:01 +08:00 |
|
z9hang
|
011d161f8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 09:49:57 +08:00 |
|
yanxd
|
db28ecd883
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 09:40:11 +08:00 |
|
yanxd
|
2fa9a4855c
|
最后创建人信息的正确显示（+去掉了乱78糟的table套table）
div-class内标明activity-title等，内嵌css属性等没有问题再移动出html文件
|
2014-07-05 09:39:58 +08:00 |
|
nwb
|
c927bb6fd6
|
首页课程列表修改
|
2014-07-05 09:33:52 +08:00 |