 huang
|
580e4d7327
|
迁移问题
|
2016-01-08 18:55:17 +08:00 |
|
huang
|
d7994c42c1
|
Merge branch 'szzh' into develop
|
2016-01-08 18:12:18 +08:00 |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-08 18:11:54 +08:00 |
|
huang
|
5079113f73
|
Merge branch 'hjq_new_course' into szzh
|
2016-01-08 18:10:38 +08:00 |
 ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-08 18:09:21 +08:00 |
|
huang
|
762ebb150b
|
解决课程资源重复分页问题
|
2016-01-08 18:09:11 +08:00 |
 cxt
|
90f6f07f19
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 18:06:28 +08:00 |
|
cxt
|
6d97673181
|
Merge branch 'cxt_course' into szzh
|
2016-01-08 18:06:18 +08:00 |
|
huang
|
0ab500986a
|
发送搜索功能
|
2016-01-08 18:03:59 +08:00 |
|
cxt
|
f1e9718f56
|
隐藏复制学期的上传图片按钮
|
2016-01-08 18:03:17 +08:00 |
|
ouyangxuhua
|
d574521b48
|
样式更新
|
2016-01-08 18:03:12 +08:00 |
|
ouyangxuhua
|
09b8373e12
|
组织配置https改成http
|
2016-01-08 17:13:34 +08:00 |
|
ouyangxuhua
|
7f465d1766
|
修改bug
|
2016-01-08 17:12:19 +08:00 |
|
huang
|
dc90976497
|
项目资源库添加 “发送”功能
|
2016-01-08 17:09:32 +08:00 |
|
huang
|
57af22e3af
|
项目资源库tag增、删、改ajax
|
2016-01-08 16:30:04 +08:00 |
|
cxt
|
17aeff1587
|
复制学期时密码修改无效
|
2016-01-08 16:20:14 +08:00 |
|
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页
|
2016-01-08 16:16:57 +08:00 |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
2016-01-08 16:05:36 +08:00 |
|
ouyangxuhua
|
c500fc13db
|
解决组织动态中，第二页重复显示第一页动态的问题
|
2016-01-08 15:21:24 +08:00 |
|
cxt
|
c5a10c504e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-08 14:53:20 +08:00 |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
2016-01-08 14:53:12 +08:00 |
|
huang
|
6a9ebb572b
|
资源库添加上传按钮
|
2016-01-08 14:51:47 +08:00 |
|
huang
|
6a9dc43d03
|
版权修改、issue编辑
|
2016-01-08 14:42:28 +08:00 |
|
ouyangxuhua
|
5eceb3d841
|
解决一些bug; 增加已设为首页标签
|
2016-01-08 14:42:21 +08:00 |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
2016-01-08 14:12:55 +08:00 |
|
huang
|
dd4d687559
|
修改项目资源附件统计功能
|
2016-01-08 11:11:11 +08:00 |
|
huang
|
fd2197a73d
|
项目资源库历史数据迁移
搜索功能添加Version类型判断
|
2016-01-08 11:01:29 +08:00 |
 Tim
|
125479f671
|
课程复制样式调整
|
2016-01-08 10:49:02 +08:00 |
|
cxt
|
2aea4da310
|
导出的测验成绩列表添加”班级“
|
2016-01-08 10:37:10 +08:00 |
|
ouyangxuhua
|
9e286ef8a5
|
对于当前用户，鼠标经过该用户头像显示详细信息时，有编辑资料按钮
|
2016-01-08 10:11:47 +08:00 |
|
cxt
|
2d73933f4f
|
已经删除了的课程还显示在新建作业的发布课程列表中
|
2016-01-08 09:46:07 +08:00 |
 guange
|
067f3be598
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 09:42:04 +08:00 |
|
ouyangxuhua
|
178f9e167c
|
1.申请子域名时，对子域名进行规范，仅能输入字母、数字和下划线；
2.博客主页，添加取消主页按钮；
3.私信只能发送者和接收者能看到
|
2016-01-08 09:41:56 +08:00 |
|
guange
|
5ebfbc901a
|
at排序按照拼音来
|
2016-01-08 09:41:12 +08:00 |
|
cxt
|
2de42afdae
|
开启匿评的提示信息修改
|
2016-01-08 09:09:57 +08:00 |
|
cxt
|
5e0ee0426a
|
作业动态的附件放在扣分上面
|
2016-01-07 17:23:32 +08:00 |
|
huang
|
e56382a899
|
tag云ajax更新后自动刷新
|
2016-01-07 17:15:19 +08:00 |
|
cxt
|
05f822a5c2
|
导出在线测验成绩列表
|
2016-01-07 16:43:03 +08:00 |
|
ouyangxuhua
|
539d971901
|
组织页面也增加项目/课程快捷菜单
|
2016-01-07 16:37:41 +08:00 |
|
cxt
|
5b234580a8
|
学生作品列表打开报500
|
2016-01-07 15:59:51 +08:00 |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
2016-01-07 15:58:22 +08:00 |
|
cxt
|
1263e4cac0
|
关联项目的样式修改
|
2016-01-07 15:33:21 +08:00 |
|
cxt
|
2b75c1e11a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-07 15:29:38 +08:00 |
|
cxt
|
151c08ac5c
|
复制学期
|
2016-01-07 15:29:25 +08:00 |
|
ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
2016-01-07 15:09:09 +08:00 |
|
huang
|
8f7d5c8a35
|
项目资源库，上传资源类型，创建资源
|
2016-01-07 14:47:47 +08:00 |
|
huang
|
972f2bfea8
|
完成项目资源库tag云的查询统计
|
2016-01-07 10:31:22 +08:00 |
|
ouyangxuhua
|
80668d6a47
|
增加以下功能：
鼠标经过用户头像时，显示用户的详细信息，并且可以添加/取消关注，可以私信/留言。
|
2016-01-07 10:10:24 +08:00 |
|
huang
|
d0a8b4bc18
|
项目资源云搜索
|
2016-01-06 18:07:35 +08:00 |
|
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-06 16:27:42 +08:00 |