 nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
11 years ago |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
 z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
|
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
11 years ago |
 sw
|
76db0e61c3
|
调整页面样式
|
11 years ago |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
|
z9hang
|
b87abf1f68
|
权限管理优化
|
11 years ago |
|
z9hang
|
5e3a763776
|
添加引用项目权限、修改引用判断
|
11 years ago |
|
z9hang
|
470f40db82
|
去除绝对网址
|
11 years ago |
|
z9hang
|
a7fa444f9e
|
修正项目个人得分问题：统计时只计算项目成员，user_grade表user_id和project_id联合不重复验证，user_grade分数部位负验证
|
12 years ago |
|
z9hang
|
2501f31ef1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
12 years ago |
|
z9hang
|
7399e1aca2
|
添加项目个人得分统计功能
|
12 years ago |
|
nwb
|
a115edea9d
|
修改课程标签页选中状态
|
12 years ago |
|
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
12 years ago |
|
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
12 years ago |
|
nwb
|
d1b438953a
|
wiki_format更新
|
12 years ago |
|
sw
|
91408cc960
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
d0843861ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
f33dc6bff6
|
1.修改测试环境搭建文档
2.添加部分测试用例
|
12 years ago |
|
sw
|
358d4a53b8
|
修复未公开项目动态仍在主页最新动态显示的问题
|
12 years ago |
|
z9hang
|
f16bec924c
|
处理undefined method `update_user_level' for nil:NilClass问题
|
12 years ago |
|
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
12 years ago |
|
z9hang
|
f9a17241da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
697a6034b2
|
新得分显示
|
12 years ago |
|
nwb
|
e698f3a6c6
|
修改新建课程成员时的唯一性判断
|
12 years ago |
 yanxd
|
d2b5560d5e
|
userscore 事务
|
12 years ago |
|
nwb
|
59a261d96d
|
1.优化课程通知动态和权限判断
2.优化课程通知讨论区动态和权限判断
|
12 years ago |
|
nwb
|
755e758596
|
优化课程资源文件动态和权限判断
|
12 years ago |
|
yanxd
|
63cd19c15c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
b2756650cf
|
修正课程留言动态引起的首页错误
|
12 years ago |
|
z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
12 years ago |
|
nwb
|
8a274981ce
|
修改课程动态
|
12 years ago |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
12 years ago |
|
nwb
|
517a29116f
|
修改message_controller与课程相关方法及视图
|
12 years ago |
|
nwb
|
97d920c195
|
修改新增课程通知视图
|
12 years ago |
|
nwb
|
d6280befca
|
修改新闻model、路由、index方法
|
12 years ago |
|
z9hang
|
e606fd89d2
|
被关注+2分、取消关注-2分
讨论区帖子加顶踩功能
顶踩帖子加减分接口
|
12 years ago |
|
nwb
|
59051972e1
|
1.修改课程资源删除
2.修改课程资源上传后的界面刷新
|
12 years ago |
|
nwb
|
b6c9415a4b
|
1.给各角色添加浏览课程资源文件权限
2.修改课程动态显示逻辑
|
12 years ago |
|
yanxd
|
73f5bab075
|
document css/
wiki h2 bug
|
12 years ago |
|
nwb
|
f741b0581c
|
修改课程资源文件视图BUG
|
12 years ago |
|
nwb
|
a20feafa4e
|
1.添加课程动态model
2.优化课程动态逻辑及权限处理
|
12 years ago |
|
yanxd
|
541b22b84d
|
score statistics init
|
12 years ago |
|
nwb
|
54505340eb
|
1.修正新建课程错误
2.优化课程角色权限判断
|
12 years ago |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
12 years ago |
|
z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码（未应用）
|
12 years ago |
|
z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用）
|
12 years ago |
|
nwb
|
ebe771db88
|
创建课程修改
|
12 years ago |
|
nwb
|
6ff26d06ab
|
修改课程基础页面逻辑(base_courses.html.erb)
|
12 years ago |
 wanglinchun
|
8b78929190
|
修改竞赛通知中评论的相关文件
|
12 years ago |
|
z9hang
|
ae5ced6a51
|
课程权限添加（部分）
|
12 years ago |
|
nwb
|
4404222437
|
0604
|
12 years ago |
|
nwb
|
d87b52bedd
|
课程成员迁移
|
12 years ago |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
12 years ago |
|
nwb
|
cd10dd5433
|
课程权限判断变更，从项目权限分离
|
12 years ago |
|
wanglinchun
|
81a45fe977
|
dfs
|
12 years ago |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
12 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
12 years ago |
|
yanxd
|
8c33cf0afb
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
12 years ago |
xianbo
|
325bb85cc5
|
fix linchun
|
12 years ago |
|
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
12 years ago |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
12 years ago |
|
yanxd
|
c7d6a07b72
|
gems
|
12 years ago |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
12 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
12 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
12 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
12 years ago |
|
wanglinchun
|
8f0ee69b8b
|
隐藏竞赛中的参赛项目和参赛应用
|
12 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
12 years ago |
|
wanglinchun
|
b182debc16
|
将竞赛页面中“新建参赛作品”的弹出形式由弹出新页面改为本页弹出下拉框，目前已有效果，写数据库有问题
|
12 years ago |
|
wanglinchun
|
30f9bc9178
|
隐藏竞赛页面参赛项目和参赛应用；
隐藏竞赛页面中关注的“更多”功能
|
12 years ago |
|
wanglinchun
|
f2dbbc48fc
|
发布作品和关联作品都可以用了，参赛应用也可以取出来了，接下来通过判断来去参赛项目和参赛应用
|
12 years ago |
|
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
12 years ago |
yanxd
|
d9cadfc43e
|
未登录500报错
|
12 years ago |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
12 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
12 years ago |
|
wanglinchun
|
982ff342fd
|
显示竞赛页面参赛项目菜单
|
12 years ago |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
12 years ago |
|
wanglinchun
|
e136254c8d
|
回复了项目页面中的头像
|
12 years ago |
|
yanxd
|
d137e78f19
|
remove tmp file rake task/
|
12 years ago |
|
yanxd
|
bde4e0f4f7
|
fix courselist
|
12 years ago |
 kg
|
e92383940f
|
#b2896c16453fc51
|
12 years ago |
|
xianbo
|
b2896c1645
|
fix
|
12 years ago |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
12 years ago |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
12 years ago |
|
xianbo
|
20cd5941a8
|
modify project main page
|
12 years ago |
|
xianbo
|
cd246fc9c2
|
fix redmine
|
12 years ago |
|
xianbo
|
3f55e78f49
|
add diff url in navigation
|
12 years ago |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
12 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
12 years ago |
|
yanxd
|
eb7e2539b8
|
留言问题
|
12 years ago |
|
yanxd
|
d202c84b44
|
导航条下拉菜单. [Version] alpha v0.1
|
12 years ago |
|
yanxd
|
ad09978020
|
资源库 -> 资源索引, 判断搜索结果
|
12 years ago |
|
yanxd
|
6edfda3a95
|
add store_url to header
|
12 years ago |
|
xianbo
|
da74c97b7d
|
fix the show of manager web
|
12 years ago |
