jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,533 Commits 98 Branches 0 Tags 0 B
Commit Graph

137 Commits

Author SHA1 Message Date
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
nwb e367c03f6e 修正课程作业列表显示BUG 2014-06-23 17:50:45 +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 9c3605320e 加入、退出课程逻辑优化 2014-06-16 17:14:05 +08:00
z9hang 4478c86cea 添加课程 查看真名、查看成员、作业导出权限代码（未应用） 2014-06-06 10:37:06 +08:00
z9hang d83899e3e4 添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用） 2014-06-05 17:39:48 +08:00
z9hang 2e36949604 添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看） 2014-05-28 18:04:16 +08:00
z9hang bf12692de4 登录名==》账号/邮箱 
老师在课程动态中看到学生真名
 2014-05-27 17:04:29 +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
nwb 9c75b701f4 修改BUG 2014-05-22 18:59:09 +08:00
nwb dd4ef11b3d 添加项目管理员审核已申请用户界面及逻辑 2014-05-22 11:58:43 +08:00
nwb 5a5db45af2 添加文本文件的预览功能 2014-05-21 14:44:53 +08:00
wanglinchun 9fb9d2dbdf 初步增加了新建参赛作品中参赛作品所属的托管项目列表 2014-05-19 17:39:51 +08:00
yanxd a76620a741 welcome footer 
判断成员列表的查看
 2014-05-19 16:12:18 +08:00
nwb 4f7087f9ae 课程修正为只有的教师才能查看学生学号 2014-05-15 17:36:39 +08:00
z9hang 5649cc545e 修正项目列表界面搜索空值报错问题 2014-05-14 15:22:08 +08:00
sw 5d2bb4ccbd 1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样 
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
 2014-05-13 10:30:15 +08:00
yanxd 2f47cc1cd8 Merge branch 'test', remote-tracking branch 'origin/szzh' into develop 2014-05-08 18:15:58 +08:00
yanxd d257f4e853 随便关闭课程禁止//临时 2014-05-06 09:16:48 +08:00
kg 0f51480bab amend course search 2014-04-29 10:36:09 +08:00
kg e9bd8a8f3e revise project index,course,search 2014-04-28 09:53:22 +08:00
yanxd 8f5958abc1 mao 2014-04-25 16:08:00 +08:00
yanxd f4595dfcd2 修改部分拍段project、course方式 
projectlist 报错
 2014-04-25 08:29:20 +08:00
kg 14511c079a Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-04-24 14:38:32 +08:00
kg 0ff3734aae delete nothing 2014-04-24 14:37:19 +08:00
kg 77ea0092b7 add course homepage activity 2014-04-24 14:33:15 +08:00
yanxd 2052d36abe issue:socialForge#381 2014-04-24 10:16:47 +08:00
kg daa19de51d Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-04-24 09:13:51 +08:00
kg 709629bcdf add course activity 2014-04-24 09:13:06 +08:00
Wen cf762e6aa3 bug fix~ 2014-04-23 21:35:03 +08:00
Wen 473a44d11a 学校-课程模式！ 2014-04-23 21:20:03 +08:00
Wen 3dbe7c5896 课程的学校ID自动设置为开课教师的学校ID 
去掉课程添加界面上的学校选择
 2014-04-22 15:25:50 +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
Wen 5699a947ec 建立了学校与用户的关联 
课程与用户的学校字段均为学校id而不再是学校名称

页面暂时改了想到的地方= =
 2014-04-17 17:36:41 +08:00
Wen c34f2da385 课程注册与用户注册页面的学校选择全部搞定！ 2014-04-15 17:37:38 +08:00
yanxd 634dd15be3 project html 2014-04-12 09:40:26 +08:00
yanxd 96fcdbacf2 课程里搜东西 没有内容项目里也跳出来的问题 2014-04-11 16:43:05 +08:00
wanglinchun 120e84cfc7 新竞赛代码移植 2014-04-03 17:26:56 +08:00
Wen 24d7234fec 作业顺序按照截止日期排序 2014-04-02 16:04:14 +08:00
Wen 4448fdfaca Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-04-02 14:44:10 +08:00
alan 5c2a037a8f user dup 2014-04-01 21:04:10 +08:00
yanxd 850ff6194f issue#509,#510 2014-03-30 17:03:15 +08:00
yanxd 8c251da25d Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色 2014-03-30 15:46:56 +08:00
yanxd 35d1c33a29 ... 2014-03-27 10:53:45 +08:00
yanxd 404568be89 留言url显示，以及留言分页的url处理 2014-03-22 09:27:29 +08:00
Wen ce7af30788 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-03-21 18:03:38 +08:00
Wen 31b7ab8ae5 创建课程处添加了学校 
数据库中存储学校的ID

但是学校与省份的级联还没有做好=A=
 2014-03-21 18:02:55 +08:00
yanxd 9c54c9c1b6 重构项目和课程排序部分，修复分页数量错误 2014-03-21 16:50:04 +08:00
yanxd 6877ff7e8d 解决设置跳转404.bug 2014-03-20 14:17:48 +08:00