 cxt
|
c2efb7bdda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 18:28:07 +08:00 |
 huang
|
55c9faaf7b
|
Merge branch 'yuanke' into develop
|
2016-05-13 18:26:01 +08:00 |
|
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
2016-05-13 18:25:15 +08:00 |
|
cxt
|
5bc19d7ef0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 18:12:12 +08:00 |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
2016-05-13 18:12:06 +08:00 |
|
huang
|
a31ffbf8fb
|
教师栏目不能添加二级域名
|
2016-05-13 18:10:33 +08:00 |
|
huang
|
b9e5c77b91
|
资源500问题
|
2016-05-13 18:02:06 +08:00 |
|
cxt
|
695e870a26
|
作品的统计不见了
|
2016-05-13 17:30:05 +08:00 |
|
cxt
|
821cd8ad99
|
作品列表样式调整
|
2016-05-13 17:26:17 +08:00 |
|
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
2016-05-13 17:24:12 +08:00 |
|
huang
|
fbcae050ad
|
项目500问题
|
2016-05-13 17:16:09 +08:00 |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
2016-05-13 17:11:53 +08:00 |
|
huang
|
79e57e2b7f
|
代码和并冲突处理及连接参数
|
2016-05-13 17:00:25 +08:00 |
 yuanke
|
2c7a964470
|
复制粘贴图片相关
|
2016-05-13 16:59:59 +08:00 |
|
huang
|
0d2a7d8bfd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 16:57:39 +08:00 |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
2016-05-13 16:56:02 +08:00 |
|
huang
|
39c753fd25
|
名师列表排序
|
2016-05-13 16:54:27 +08:00 |
|
cxt
|
bc39b68bb2
|
新建测验题目、问卷题目防止多次提交表单
|
2016-05-13 16:50:41 +08:00 |
|
huang
|
6ccb79a210
|
教师列表颜色
|
2016-05-13 16:47:56 +08:00 |
|
huang
|
6d484e15fd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 16:30:57 +08:00 |
|
huang
|
39d014355b
|
科大名师，和名师列表添加标题
|
2016-05-13 16:30:45 +08:00 |
 Tim
|
d384d1e2b4
|
名师榜样式调整
|
2016-05-13 16:28:16 +08:00 |
|
Tim
|
afbe5317cb
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 16:11:35 +08:00 |
|
Tim
|
a88ab59489
|
名师榜添加右侧banner
|
2016-05-13 16:11:10 +08:00 |
|
yuanke
|
be97675aed
|
没带图片类型的图片不让点击放大看!
|
2016-05-13 16:09:26 +08:00 |
|
txz
|
1f95495f52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 15:48:38 +08:00 |
|
txz
|
8d338cff9e
|
微信锁定帖子关闭回复
|
2016-05-13 15:48:31 +08:00 |
|
huang
|
467ee60657
|
名师默认显示5个，没有则不显示
|
2016-05-13 15:37:04 +08:00 |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
2016-05-13 15:25:53 +08:00 |
|
huang
|
1cd74121ae
|
Merge branch 'yuanke' into develop
|
2016-05-13 15:25:04 +08:00 |
|
yuanke
|
a67ee38ac9
|
将复制粘贴的图片 链接及class都去掉
|
2016-05-13 15:18:48 +08:00 |
|
huang
|
f1c0347ee2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 15:12:40 +08:00 |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
|
huang
|
5ae580aab0
|
添加用户连接
|
2016-05-13 15:10:34 +08:00 |
|
cxt
|
3e340b6ef9
|
博客微信api
|
2016-05-13 15:01:36 +08:00 |
|
yuanke
|
fc0f92738d
|
复制粘贴时将图片所带链接去掉
|
2016-05-13 14:58:35 +08:00 |
|
cxt
|
22523d25b8
|
贴吧发帖防止多次提交表单
|
2016-05-13 14:52:38 +08:00 |
|
huang
|
660cf7ef73
|
名师列表局部搜索
|
2016-05-13 14:52:33 +08:00 |
|
cxt
|
89749b853b
|
微信帖子api
|
2016-05-13 14:43:22 +08:00 |
|
cxt
|
01287ff93c
|
学生打开新建的作业列表报500
|
2016-05-13 14:40:28 +08:00 |
|
cxt
|
dc6c5fe18b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-13 14:33:16 +08:00 |
|
cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
2016-05-13 14:33:06 +08:00 |
|
Tim
|
1833f15e19
|
课程资源库导入资源样式修改
|
2016-05-13 14:23:51 +08:00 |
|
huang
|
91f3fddb16
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 14:23:48 +08:00 |
|
huang
|
0feb1280fd
|
名师更多列表
及相关入口路由
|
2016-05-13 14:23:36 +08:00 |
|
yuanke
|
80c6edd2d3
|
KE过滤html代码的时候表格的颜色等样式不能被过滤掉
|
2016-05-13 14:22:10 +08:00 |
|
Tim
|
4ea7d5ed57
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 14:08:48 +08:00 |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
2016-05-13 14:08:34 +08:00 |
|
huang
|
e90da9d812
|
teachers页面
|
2016-05-13 14:00:05 +08:00 |
|
huang
|
3853d5b7ad
|
右三模式定制
|
2016-05-13 13:39:44 +08:00 |