 sw
|
a39672dd14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-28 15:09:14 +08:00 |
|
sw
|
cc215e6c7b
|
修复个人动态图片显示不准确的问题
|
2014-07-28 09:47:11 +08:00 |
 nwb
|
00cf448bda
|
用户动态兼容空留言
|
2014-07-28 09:18:24 +08:00 |
|
sw
|
dd589c4811
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-24 08:50:44 +08:00 |
|
sw
|
a7debdae98
|
格式化代码
|
2014-07-23 09:16:06 +08:00 |
 z9hang
|
dee09aad75
|
修复导航bug
|
2014-07-22 15:59:35 +08:00 |
 yanxd
|
fb138d1593
|
remove user_activities path, 3path bug.
|
2014-07-21 16:41:11 +08:00 |
|
z9hang
|
40d8ec6c6e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 16:58:25 +08:00 |
|
z9hang
|
4bd083b059
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/show.html.erb
|
2014-07-18 16:56:00 +08:00 |
|
sw
|
9f02003bb9
|
用户课程列表增加自动换行
|
2014-07-18 16:42:18 +08:00 |
|
sw
|
41983833d7
|
用户项目列表增加自动换行
|
2014-07-18 16:40:57 +08:00 |
|
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
2014-07-18 16:39:39 +08:00 |
|
sw
|
e0f5708038
|
修改错误
|
2014-07-18 16:21:20 +08:00 |
|
sw
|
999a252f7b
|
修改软件创客搜索结果显示样式
|
2014-07-18 15:47:48 +08:00 |
|
sw
|
4a04d47c3c
|
commit
|
2014-07-18 14:15:30 +08:00 |
|
sw
|
bcaaa02bed
|
取消已完成课程在软件创客列表的显示
|
2014-07-18 10:01:54 +08:00 |
|
z9hang
|
036f8a3870
|
user.trustie.net域名下的用户列表课程项目链接跳转域名不正确
|
2014-07-18 09:46:11 +08:00 |
|
sw
|
8f8fb79a63
|
1.软件创客搜索功能修改表单提交为在js中提交
2.增加判断搜索条件是不是为空
|
2014-07-14 16:29:59 +08:00 |
|
sw
|
7a9b5156c9
|
修复软件创客列表当用户姓名比较长时，用户姓名会被个人得分覆盖掉的BUG
|
2014-07-14 11:46:52 +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
|
4f2298fd22
|
修复个人动态首页中留言等动态显示有误的问题
|
2014-07-11 10:31:52 +08:00 |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
2014-07-10 17:38:04 +08:00 |
|
sw
|
7bcb1cbe2e
|
修复个人主页中作业、项目介绍不正确的BUG
|
2014-07-10 16:57:04 +08:00 |
|
sw
|
bc9f1e5a01
|
1.修改软件创客中每个用户内容显示不一致的BUG
2.去掉用户项目列表最后一个项目后的逗号
|
2014-07-04 13:59:08 +08:00 |
|
sw
|
a1920ca54c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 11:31:09 +08:00 |
|
sw
|
1e6693cdcf
|
1.取消软件创客界面2个个人得分显示
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
|
2014-07-04 11:26:37 +08:00 |
|
yanxd
|
d54f37e630
|
个人动态，判断留言人逻辑有误
|
2014-07-04 11:15:58 +08:00 |
|
sw
|
108866b8ba
|
1
|
2014-07-04 10:29:31 +08:00 |
|
nwb
|
e94ed86ead
|
部分BUG修正
|
2014-07-01 16:56:23 +08:00 |
|
z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
2014-06-30 16:19:28 +08:00 |
|
nwb
|
3565b9da88
|
修正用户课程界面关闭、重启课程，数据刷新不及时的问题
|
2014-06-27 10:50:23 +08:00 |
|
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
2014-06-26 17:55:01 +08:00 |
|
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
|
2014-06-26 08:53:16 +08:00 |
|
z9hang
|
02e221eedb
|
修改：网站中的旧分数显示为新分数
|
2014-06-24 13:57:51 +08:00 |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
2014-06-21 15:34:10 +08:00 |
|
nwb
|
8cdab80d31
|
用户课程界面链接BUG修改
|
2014-06-20 10:32:51 +08:00 |
|
z9hang
|
9061a77221
|
修改user.user_score为空问题的解决方式
|
2014-06-19 10:45:30 +08:00 |
|
yanxd
|
b76f1c2b12
|
管理员用户粉丝列表出错。
|
2014-06-17 15:16:17 +08:00 |
|
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
|
2014-06-17 10:12:44 +08:00 |
|
z9hang
|
9e53ad67d0
|
去除个人分数显示的链接
|
2014-06-17 09:01:09 +08:00 |
|
z9hang
|
697a6034b2
|
新得分显示
|
2014-06-16 17:50:28 +08:00 |
|
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
2014-06-10 17:03:02 +08:00 |
|
z9hang
|
cae0893ea6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-09 17:38:01 +08:00 |
|
z9hang
|
ee030e6fb5
|
讨论区发帖协同得分+2
|
2014-06-09 17:37:48 +08:00 |
|
yanxd
|
ff6373badc
|
看用户列表出错
|
2014-06-09 15:07:08 +08:00 |
|
yanxd
|
8b176c0027
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-06 16:18:48 +08:00 |
|
yanxd
|
db61ecc255
|
合并user_score属性
|
2014-06-06 16:17:27 +08:00 |
|
z9hang
|
cf5c7a6610
|
修复学生从个人主页课程标签页未参加课程状态下点击加入课程进入课程列表搜索课程失败bug
|
2014-06-06 14:01:03 +08:00 |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
2014-06-06 13:56:48 +08:00 |
|
nwb
|
6a9037dde5
|
修改关闭课程逻辑
|
2014-06-05 10:33:32 +08:00 |