 ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
2016-01-13 15:17:13 +08:00 |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-13 09:58:14 +08:00 |
|
ouyangxuhua
|
8ead573872
|
组织设置url
|
2016-01-13 09:56:24 +08:00 |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
2016-01-13 09:34:33 +08:00 |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
2016-01-12 16:43:40 +08:00 |
 huang
|
83881766b2
|
提交总数接口获取修改
|
2016-01-12 11:01:58 +08:00 |
|
huang
|
28c3dca099
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 22:30:48 +08:00 |
 cxt
|
66c3cee3f8
|
课程关联组织列表
|
2016-01-08 22:30:04 +08:00 |
|
huang
|
c719fd96a3
|
0
|
2016-01-08 22:29:57 +08:00 |
|
cxt
|
a3370b693c
|
课程关联组织列表为空
|
2016-01-08 21:46:10 +08:00 |
|
huang
|
f9bc1efd7c
|
issue编辑的时候ajax刷新附件
|
2016-01-08 21:18:08 +08:00 |
|
huang
|
3df542ff6a
|
Merge branch 'szzh' into develop
|
2016-01-08 20:46:06 +08:00 |
|
huang
|
64889fd14a
|
项目资源提供新分页
|
2016-01-08 20:10:43 +08:00 |
|
ouyangxuhua
|
5d819625c0
|
快捷菜单上传文件使用最新的上传方式
|
2016-01-08 20:09:57 +08:00 |
|
ouyangxuhua
|
3a62db6475
|
Merge branch 'dev_hjq' into szzh
|
2016-01-08 19:34:36 +08:00 |
|
ouyangxuhua
|
ceeec3af12
|
修改一些bug
|
2016-01-08 19:33:58 +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 |
|
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 |
|
huang
|
0ab500986a
|
发送搜索功能
|
2016-01-08 18:03:59 +08:00 |
|
huang
|
57af22e3af
|
项目资源库tag增、删、改ajax
|
2016-01-08 16:30:04 +08:00 |
|
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页
|
2016-01-08 16:16:57 +08:00 |
|
ouyangxuhua
|
c500fc13db
|
解决组织动态中，第二页重复显示第一页动态的问题
|
2016-01-08 15:21:24 +08:00 |
|
ouyangxuhua
|
5eceb3d841
|
解决一些bug; 增加已设为首页标签
|
2016-01-08 14:42:21 +08:00 |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
2016-01-08 14:12:55 +08:00 |
|
huang
|
fd2197a73d
|
项目资源库历史数据迁移
搜索功能添加Version类型判断
|
2016-01-08 11:01:29 +08:00 |
|
cxt
|
2aea4da310
|
导出的测验成绩列表添加”班级“
|
2016-01-08 10:37:10 +08:00 |
 guange
|
067f3be598
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 09:42:04 +08:00 |
|
guange
|
5ebfbc901a
|
at排序按照拼音来
|
2016-01-08 09:41:12 +08:00 |
|
huang
|
e56382a899
|
tag云ajax更新后自动刷新
|
2016-01-07 17:15:19 +08:00 |
|
cxt
|
05f822a5c2
|
导出在线测验成绩列表
|
2016-01-07 16:43:03 +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 |
|
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 |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
2016-01-06 16:22:13 +08:00 |
|
huang
|
c4718f992c
|
项目资源搜索
|
2016-01-06 11:05:52 +08:00 |
 Tim
|
17800e8cf2
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-06 10:36:28 +08:00 |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
2016-01-05 16:46:06 +08:00 |
|
huang
|
0d6ad9ffac
|
修改课程删除后可以显示的问题
|
2016-01-04 17:08:15 +08:00 |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
2016-01-04 17:05:32 +08:00 |
|
ouyangxuhua
|
8dd34f91c3
|
课程/项目配置关联组织，仅关联用户的组织
|
2016-01-04 15:12:38 +08:00 |
|
huang
|
9e87e63b82
|
系统消息去掉附件
|
2016-01-04 10:36:27 +08:00 |
|
huang
|
3394af7ad5
|
Merge branch 'develop' into hjq_new_course
|
2016-01-04 10:29:13 +08:00 |
|
cxt
|
7f751cfc63
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-31 17:58:59 +08:00 |
|
huang
|
11444f43f0
|
解决issue多附件，删除一个附件后，提交弹出白色框框的问题
|
2015-12-31 17:55:48 +08:00 |