 huang
|
0a881f14e8
|
导入添加自动搜索
|
2016-03-16 17:06:11 +08:00 |
|
huang
|
064dc81ed6
|
解决公共资源删除资源后统计数字不减少的问题
（增加删除回调）
|
2016-03-16 13:48:02 +08:00 |
|
huang
|
9aab10c05a
|
代码更新
|
2016-03-15 17:29:37 +08:00 |
|
huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
2016-03-15 16:28:35 +08:00 |
|
huang
|
22ce591c36
|
资源库添加搜索过滤
|
2016-03-15 15:42:20 +08:00 |
|
huang
|
5681d329d6
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/news_controller.rb
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-15 11:12:24 +08:00 |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
2016-03-15 11:09:11 +08:00 |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
2016-03-15 09:26:26 +08:00 |
|
huang
|
3bfaddc80f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 18:31:09 +08:00 |
 ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
2016-03-14 18:29:50 +08:00 |
|
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
2016-03-14 18:25:26 +08:00 |
|
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
2016-03-14 18:20:19 +08:00 |
 yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
2016-03-14 18:19:23 +08:00 |
|
ouyangxuhua
|
46b50ab065
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 17:46:47 +08:00 |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
2016-03-14 17:31:53 +08:00 |
|
ouyangxuhua
|
2899f29b5f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 17:29:06 +08:00 |
|
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
2016-03-14 17:16:11 +08:00 |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
2016-03-14 16:35:18 +08:00 |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
2016-03-14 15:39:45 +08:00 |
 cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
2016-03-11 19:34:33 +08:00 |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 19:31:22 +08:00 |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
2016-03-11 19:31:06 +08:00 |
|
cxt
|
a845da5c17
|
点赞有延迟
|
2016-03-11 19:25:24 +08:00 |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
2016-03-11 18:06:43 +08:00 |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-11 17:25:30 +08:00 |
|
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 16:18:10 +08:00 |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
2016-03-11 16:17:51 +08:00 |
|
huang
|
97a7694778
|
访问统计数--views
|
2016-03-11 15:58:16 +08:00 |
 Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 15:51:59 +08:00 |
|
huang
|
8079254089
|
首页增加访问统计
|
2016-03-11 15:51:45 +08:00 |
|
Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 15:49:54 +08:00 |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
2016-03-11 15:49:24 +08:00 |
|
huang
|
c18634be86
|
课程通知。新闻代码优化
|
2016-03-11 15:21:40 +08:00 |
 luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2016-03-11 14:40:07 +08:00 |
|
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
2016-03-11 11:34:16 +08:00 |
|
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
2016-03-11 11:23:16 +08:00 |
|
cxt
|
ef5625ccdf
|
延期发布的课程资源设为公开后不应对学生可见
|
2016-03-11 11:17:44 +08:00 |
|
huang
|
47ca79c317
|
news消息已读修改
|
2016-03-11 10:49:17 +08:00 |
|
cxt
|
2812fcd2fb
|
删除无用代码
|
2016-03-11 10:45:29 +08:00 |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
2016-03-11 10:21:59 +08:00 |
|
luoquan
|
7d70e63f8d
|
代码重置
|
2016-03-11 10:18:10 +08:00 |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
2016-03-10 17:41:53 +08:00 |
|
huang
|
440cd04414
|
Merge branch 'develop' into hjq_new_course
|
2016-03-10 17:14:19 +08:00 |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
2016-03-10 17:04:26 +08:00 |
|
huang
|
5818860a4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-10 16:44:05 +08:00 |
|
huang
|
08cb7b642c
|
附件上传样式
|
2016-03-10 16:43:25 +08:00 |
|
huang
|
1644442d2e
|
修改附件描述样式
|
2016-03-10 16:41:56 +08:00 |
|
huang
|
627580a9ac
|
标签问题（未完）
|
2016-03-10 16:25:39 +08:00 |