 yanxd
|
db61ecc255
|
合并user_score属性
|
2014-06-06 16:17:27 +08:00 |
 nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
2014-06-06 13:56:48 +08:00 |
|
yanxd
|
1c7923e5bd
|
sql
|
2014-06-05 16:53:41 +08:00 |
 wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
2014-06-05 10:28:36 +08:00 |
|
yanxd
|
8fb82bbdc4
|
register Mod
|
2014-06-04 14:20:26 +08:00 |
|
nwb
|
4404222437
|
0604
|
2014-06-04 14:13:26 +08:00 |
|
yanxd
|
51bfb6cae8
|
user model save bug
|
2014-06-04 10:08:54 +08:00 |
|
nwb
|
d87b52bedd
|
课程成员迁移
|
2014-06-04 09:19:01 +08:00 |
|
yanxd
|
510b1c4233
|
merge gem
|
2014-06-03 16:45:35 +08:00 |
|
yanxd
|
37232cd5b2
|
把所有user_extensions的逻辑移到了user中，业务代码还没有修改,下一步是user_score和projectxxx,先测测效果
|
2014-06-03 16:41:12 +08:00 |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
2014-05-30 20:32:37 +08:00 |
 z9hang
|
45d17db8b6
|
实现给教师发课程留言邮件时根据教师设置判断是否发送邮件
|
2014-05-30 09:49:53 +08:00 |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
2014-05-28 18:04:16 +08:00 |
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 11:42:41 +08:00 |
|
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
2014-05-23 11:00:46 +08:00 |
|
yanxd
|
213939b474
|
realname
|
2014-05-23 10:59:52 +08:00 |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
2014-05-23 09:49:36 +08:00 |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
2014-05-22 19:59:50 +08:00 |
|
yanxd
|
62f9ed052b
|
issues#655
|
2014-05-22 19:58:13 +08:00 |
 sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
2014-05-22 16:37:39 +08:00 |
|
yanxd
|
19aba25625
|
course revert search project
|
2014-05-21 15:31:10 +08:00 |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
2014-05-19 17:44:36 +08:00 |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
2014-05-19 17:39:51 +08:00 |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
2014-05-14 16:06:29 +08:00 |
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
2014-04-22 14:53:25 +08:00 |
yanxd
|
daf7e8d200
|
user added rater
|
2014-04-21 16:03:55 +08:00 |
 baiyu
|
f0b497e455
|
user score merge
|
2014-04-21 11:15:41 +08:00 |
|
baiyu
|
36cd91401f
|
user score
|
2014-04-21 11:13:45 +08:00 |
|
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
|
2014-04-18 16:03:52 +08:00 |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
2014-04-11 16:40:09 +08:00 |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
2014-04-11 10:53:51 +08:00 |
|
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
2014-04-10 08:33:30 +08:00 |
|
xianbo
|
b1fc33a697
|
add by nyan
|
2014-04-04 16:59:50 +08:00 |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
2014-02-24 10:40:45 +08:00 |
|
Wen
|
d22e1056fb
|
xxxxx
|
2014-01-22 21:05:57 +08:00 |
|
baiyu
|
13fdbde1cf
|
个人分数
|
2014-01-16 10:34:39 +08:00 |
|
yanxd
|
f05d2131bd
|
组织留言数据方法
|
2013-12-25 15:40:34 +08:00 |
|
nieguanghui
|
f3ce918699
|
留言修改
|
2013-12-24 16:42:56 +08:00 |
|
yanxd
|
7226186316
|
to login using validate with email.
|
2013-12-20 10:30:41 +08:00 |
|
baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
2013-11-14 15:55:56 +08:00 |
|
nieguanghui
|
dd6563cf8c
|
优化用户搜索
|
2013-11-08 11:01:28 +08:00 |
 huangjingquan
|
477e299e24
|
修改了用户主页课程列表显示
去掉了作业和关注需求，将关注需求统计显示
|
2013-10-31 15:18:42 +08:00 |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
2013-10-24 08:24:56 +08:00 |
|
xianbo
|
0238001721
|
modify destroy project and user can't destroy biding_project
|
2013-10-14 20:57:31 +08:00 |
 fanqiang
|
2fbf025c2f
|
调整需求的评价，隐藏个人账户的首选项内容
|
2013-10-14 10:09:10 +08:00 |
|
xianbo
|
3b6f0e3d34
|
modify delete project and user and define a course is a public
|
2013-10-09 22:26:03 +08:00 |
|
xianbo
|
806fae7b19
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
app/controllers/account_controller.rb
app/controllers/my_controller.rb
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/helpers/projects_helper.rb
app/helpers/users_helper.rb
app/models/project.rb
app/models/user.rb
app/models/user_extensions.rb
app/views/account/register.html.erb
app/views/bids/_bid_show.html.erb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
app/views/files/index.html.erb
app/views/layouts/base_bids.html.erb
app/views/layouts/base_users.html.erb
app/views/my/account.html.erb
app/views/users/watch_bids.html.erb
config/locales/en.yml
config/locales/zh.yml
config/routes.rb
db/schema.rb
lib/redmine.rb
public/stylesheets/application.css
|
2013-09-23 20:18:03 +08:00 |
baiyu
|
4fb040bc61
|
modify register bug
|
2013-09-23 16:42:19 +08:00 |
 huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
2013-09-16 08:49:39 +08:00 |
|
huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
|
xianbo
|
1e7d127998
|
new course table
|
2013-09-06 16:39:38 +08:00 |
|
fanqiang
|
b4b4956ab7
|
添加留言删除前身份确认，修改活动列表中问题部分的显示，添加了项目信息
|
2013-08-28 15:29:18 +08:00 |
 william
|
0c22d409fc
|
添加写project_status和user_status两表的方法，
在关注中写这2个表，
重构了tag的过滤方法，
拿掉了user_extension.rb.
|
2013-08-27 11:27:25 +08:00 |
|
fanqiang
|
c7beefa556
|
修改用户活动页面，添加了过滤功能。修改留言中引用和删除功能的显示问题
|
2013-08-27 11:09:34 +08:00 |
|
baiyu
|
72b37a915a
|
添加留言提醒
|
2013-08-25 20:19:44 +08:00 |
|
william
|
d62ad9e863
|
给tag search结果添加了分页。
|
2013-08-19 17:28:59 +08:00 |
|
nieguanghui
|
c00575ce84
|
修改新建项目显示，优化列表显示速度
|
2013-08-12 17:11:41 +08:00 |
|
fanqiang
|
69e3dcee6c
|
修改用户活动，用户主页的其他部分添加分页
|
2013-08-12 15:37:42 +08:00 |
|
fanqiang
|
238b9a416f
|
修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈
|
2013-08-11 10:36:55 +08:00 |
|
fanqiang
|
f3c0f9cde9
|
解决冲突
|
2013-08-09 10:42:07 +08:00 |
|
nieguanghui
|
a8d2c5789c
|
修正数据库表不存在错误
|
2013-08-09 10:06:24 +08:00 |
|
william
|
80e74e4dd7
|
修改了一些赞的bug，添加了显示所有tag的功能。
|
2013-08-08 22:25:32 +08:00 |
|
william
|
9cc86f3cd8
|
移除seems_ratabale插件。
|
2013-08-08 17:26:37 +08:00 |
|
william
|
0b5ea87f11
|
加入了对赞功能模块，同时预留了踩功能，但暂时不使用。
|
2013-08-08 17:01:56 +08:00 |
|
fanqiang
|
4835cab6e4
|
添加了用户查找反馈的功能，可以查看对用户评论的引用和对用户需求的评论。解决了留言问题
|
2013-08-06 22:26:52 +08:00 |
|
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |