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 |
nwb
|
b4e78d2b0c
|
课程添加成员逻辑更改
|
2014-06-16 15:00:35 +08:00 |
sw
|
e5fec207aa
|
1.修改判断当前用户是否为指定课程成员、学生、老师的方法
2.新建作业时获取当前项目学生方法
3.增加checkbox生成方法
|
2014-06-10 08:47:21 +08:00 |
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
2014-05-22 11:58:43 +08:00 |
nwb
|
6f0e621f3c
|
添加项目成员界面,显示用户的account
|
2014-05-14 16:06:29 +08:00 |
william
|
0c22d409fc
|
添加写project_status和user_status两表的方法,
在关注中写这2个表,
重构了tag的过滤方法,
拿掉了user_extension.rb.
|
2013-08-27 11:27:25 +08:00 |
zhangyang
|
4eb9a0950e
|
top-menu背景颜色;项目配置tab样式;content上方横线;用户列表分页框样式
|
2013-08-05 11:19:53 +08:00 |
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |