Commit Graph

22 Commits

Author SHA1 Message Date
cxt dc11ad31f1 3241缺陷的修复 2015-07-22 15:38:56 +08:00
sw 1f7f1eff1a 课程添加成员输入空格键会搜索出所有任务 2015-04-23 10:26:27 +08:00
sw 7239f6a641 1、成员列表分页空间翻页不可用
2、当五输入时显示,无用户显示
2015-04-17 14:21:44 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
2015-04-16 10:26:03 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
2015-04-14 19:34:01 +08:00
huang 5ae5cfda03 项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
2015-04-14 15:34:04 +08:00
huang b98a67f50d 完成项目配置-成员模块 2015-04-14 11:47:47 +08:00
sw 0743ac2c78 课程成员配置-添加成员:没有搜索条件则显示空 2015-04-09 14:32:14 +08:00
huang c8f9add566 修改项目成员邀请界面(添加按钮点击搜索) 2015-04-09 11:20:09 +08:00
huang df43274565 新版项目界面(部分未完成,先合并)
1、项目框架整理
2、各页面样式
2015-04-07 12:48:47 +08:00
sw 083a3b9de6 1、课程成员列表显示昵称
2、添加课程成员功能
2015-03-30 13:47:19 +08:00
sw 2ee04d55f2 修改项目邀请用户的界面 2015-03-12 15:46:24 +08:00
linhk fcaeb86687 项目‘课程 添加成员显示Bug修改 2014-08-16 10:49:27 +08:00
sw 22335b23a6 修复新建账号申请项目时在申请列表无法显示的BUG #1180 2014-08-06 15:10:53 +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
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