 z9hang
|
dbb46b07a6
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
Conflicts:
Gemfile.lock
|
11 years ago |
|
z9hang
|
890f49eb36
|
用户信息显示方法修改
|
11 years ago |
guange
|
4a6c26d499
|
将entities重构
|
11 years ago |
|
guange
|
41d9af1ab9
|
auto reload api folder in development mode.
|
11 years ago |
 alan
|
90a01c8d84
|
对新增功能《添加学生列表班内搜索和课内搜索》样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d8a568e685
|
增加《分班搜索学生》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
ee3d998873
|
课程列表接口加入老师字段
|
11 years ago |
|
alan
|
5c33c578bb
|
增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
3aea87b893
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
guange
|
c7c25edf17
|
加上pry支持
|
11 years ago |
|
z9hang
|
5676770100
|
添加课程列表接口
|
11 years ago |
|
guange
|
db9eebbac7
|
[API]注册接口完成
|
11 years ago |
|
guange
|
91ea1adad3
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
alan
|
e6efa0f483
|
修改《点击分班，搜索栏不见了》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 sw
|
97765159a9
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
34a02b4f9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
47da84dee0
|
修改查询学生后查询框消失的BUG
|
11 years ago |
|
alan
|
a6fc79a474
|
将分组改成分班
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
c44eeb4ff8
|
修改项目成员显示为 Member
|
11 years ago |
|
sw
|
af7de6e61c
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
060b856b23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/courses/_member_list.html.erb
|
11 years ago |
|
alan
|
19936fa05f
|
修改《角色发生变化时分班人数不对》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
03a8d8ccc9
|
修改《教师列表中不应该有搜索功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
fa1e7c9a04
|
修正密码长度判断错误问题
|
11 years ago |
|
sw
|
b51cd1aabb
|
取消教师列表的搜索功能
|
11 years ago |
|
alan
|
b5d007ccf7
|
增加《点击分组名，该分组名底色发生改变》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fbe6ce16d7
|
修改《分组界面》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
62497913d7
|
修改《分组名可以为空格》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
99d5bca033
|
Merge branch 'szzh' into develop
|
11 years ago |
|
alan
|
63a9fcd483
|
修改《加入分组后分组人数未改变》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
747fb84ef6
|
修改《添加，修改分组名》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c5a7baa454
|
修改合并引起的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
a51d0e88dc
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/controllers/courses_controller.rb
|
11 years ago |
|
alan
|
9d0e39e708
|
修改孙涛提出的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
1706fffb4b
|
修改留言的父级留言删除后，页面报错的BUG
|
11 years ago |
|
sw
|
4b11e78b89
|
#1630 删除文件的同时在硬盘和数据库上删除该文件
|
11 years ago |
|
sw
|
2ce49c041b
|
#1664 用户个人主页中的留言页面中登陆用户可以删除别人回复
|
11 years ago |
|
sw
|
0d793ee4bc
|
解决冲突
|
11 years ago |
|
sw
|
d5de3dcb56
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/courses_controller.rb
|
11 years ago |
|
sw
|
dc5be133c2
|
课程留言、讨论区增加权限控制
|
11 years ago |
|
sw
|
a2537899b7
|
课程通知访问增加权限控制
|
11 years ago |
|
sw
|
d2814b4b47
|
课程教师列表增加权限控制
|
11 years ago |
|
sw
|
9fd48e5cfe
|
修改作业打包下载时有一个README的文件
|
11 years ago |
|
sw
|
4d9fc8d74f
|
#1657 新建课程时如用户没有对应的身份、姓名信息，跳转到修改资料界面
|
11 years ago |
|
sw
|
1084cda730
|
#1665 “软件创客”链接入口，点击报404
|
11 years ago |
|
sw
|
f2cfa6d4a1
|
修改课程老师、学生数量显示为实际数字，而不是+
|
11 years ago |
|
alan
|
020242a8c9
|
增减《查询显示人数以及显示全部人数》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
078639b35a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
11 years ago |
|
alan
|
cfb8edbfe2
|
分组功能样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
a64cae5da3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
