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

4465 Commits

Author SHA1 Message Date
guange b9156b271e Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2014-12-10 15:11:26 +08:00
guange 5eba06ddf9 加入api在线文档 2014-12-10 15:11:10 +08:00
z9hang 41fa6f02f1 关注列表、关注与取消关注接口 2014-12-10 15:07:41 +08:00
sw 2dab864199 #1689修改部分学生匿评得分大于5分 2014-12-10 15:04:35 +08:00
z9hang bd685e16ec Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2014-12-10 14:34:36 +08:00
z9hang fbd38b4a53 关注列表与关注 2014-12-10 14:33:05 +08:00
guange 70bc6acbd2 修改用户个人信息 2014-12-10 11:56:33 +08:00
z9hang 7efd2375ff 个人信息修改接口 2014-12-10 11:21:23 +08:00
sw 410d61022b #1692 
1.新建、修改作业时点击是否启用匿评选择框js的修改
2.修改匿评分配数量提示有歧义的问题
 2014-12-10 10:54:21 +08:00
sw f977a622a2 #1699 公共贴吧--没有回复就不要显示“最后回复”了 2014-12-10 10:23:43 +08:00
sw 66d8609c56 作业截止时间已到，此后提交的作品将记为迟交 -> 截止了，可补交 2014-12-10 09:44:03 +08:00
sw 0044f17fba #1688修改竞赛搜索报404 2014-12-10 09:37:24 +08:00
sw a69fdfe1ed #1691按钮上传资源->确认 2014-12-10 09:30:16 +08:00
sw 9b5cbb0b4e #1696作业提交时间已过->作业截止时间已到，此后提交的作品将记为迟交。 2014-12-10 09:25:24 +08:00
sw d9250231e5 #1698 1.修改标签查询结果中点击课程/项目列表报错的BUG 
2.修改页面代码
 2014-12-10 09:19:00 +08:00
guange c054852b4e 登录后返回用户资料 2014-12-09 16:57:08 +08:00
z9hang dbb46b07a6 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 
Conflicts:
	Gemfile.lock
 2014-12-09 16:43:06 +08:00
z9hang 890f49eb36 用户信息显示方法修改 2014-12-09 16:40:52 +08:00
guange 4a6c26d499 将entities重构 2014-12-09 16:36:43 +08:00
guange 41d9af1ab9 auto reload api folder in development mode. 2014-12-09 15:16:47 +08:00
alan 90a01c8d84 对新增功能《添加学生列表班内搜索和课内搜索》样式微调 
Signed-off-by: alan <547533434@qq.com>
 2014-12-09 15:16:43 +08:00
alan d8a568e685 增加《分班搜索学生》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-09 14:57:10 +08:00
guange ee3d998873 课程列表接口加入老师字段 2014-12-08 16:51:21 +08:00
alan 5c33c578bb 增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-08 16:50:20 +08:00
guange 3aea87b893 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2014-12-08 15:27:27 +08:00
guange c7c25edf17 加上pry支持 2014-12-08 15:27:18 +08:00
z9hang 5676770100 添加课程列表接口 2014-12-08 15:19:10 +08:00
guange db9eebbac7 [API]注册接口完成 2014-12-07 10:48:05 +08:00
guange 91ea1adad3 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2014-12-07 10:08:09 +08:00
alan e6efa0f483 修改《点击分班，搜索栏不见了》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-06 16:49:38 +08:00
sw 97765159a9 Merge branch 'szzh' into develop 2014-12-06 16:34:11 +08:00
sw 34a02b4f9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-06 16:33:33 +08:00
sw 47da84dee0 修改查询学生后查询框消失的BUG 2014-12-06 16:27:58 +08:00
alan a6fc79a474 将分组改成分班 
Signed-off-by: alan <547533434@qq.com>
 2014-12-06 15:09:19 +08:00
sw c44eeb4ff8 修改项目成员显示为 Member 2014-12-06 13:51:47 +08:00
sw af7de6e61c Merge branch 'szzh' into develop 2014-12-06 13:48:19 +08:00
sw 060b856b23 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/courses/_member_list.html.erb
 2014-12-06 13:46:42 +08:00
alan 19936fa05f 修改《角色发生变化时分班人数不对》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-06 13:32:47 +08:00
alan 03a8d8ccc9 修改《教师列表中不应该有搜索功能》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-06 12:34:02 +08:00
z9hang fa1e7c9a04 修正密码长度判断错误问题 2014-12-06 11:27:52 +08:00
sw b51cd1aabb 取消教师列表的搜索功能 2014-12-06 11:00:15 +08:00
alan b5d007ccf7 增加《点击分组名，该分组名底色发生改变》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-06 00:52:06 +08:00
alan fbe6ce16d7 修改《分组界面》样式 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 23:34:16 +08:00
alan 62497913d7 修改《分组名可以为空格》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 17:13:05 +08:00
sw 99d5bca033 Merge branch 'szzh' into develop 2014-12-05 16:46:35 +08:00
alan 63a9fcd483 修改《加入分组后分组人数未改变》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 16:44:05 +08:00
alan 747fb84ef6 修改《添加，修改分组名》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 16:33:55 +08:00
alan c5a7baa454 修改合并引起的bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 16:21:53 +08:00
alan a51d0e88dc Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/controllers/courses_controller.rb
 2014-12-05 16:05:53 +08:00
alan 9d0e39e708 修改孙涛提出的bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 16:03:41 +08:00