 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 |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
2016-05-13 11:39:01 +08:00 |
|
huang
|
2d701b7d03
|
Merge branch 'cxt_course' into develop
|
2016-05-13 11:34:39 +08:00 |
|
yuanke
|
a1323e3d76
|
表格问题
|
2016-05-13 11:32:52 +08:00 |
|
huang
|
343e9d9434
|
修改日志分割关闭
|
2016-05-13 11:32:50 +08:00 |
|
Tim
|
21a56509fc
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 11:30:08 +08:00 |
|
huang
|
457bac0b9d
|
0
|
2016-05-13 11:30:49 +08:00 |
|
Tim
|
61470c9bd4
|
名师榜css样式添加
|
2016-05-13 11:29:45 +08:00 |
|
huang
|
7bd047f7e4
|
组织模式二中名师榜样式
|
2016-05-13 11:25:05 +08:00 |
|
huang
|
f7a888ac3d
|
名师默认创建
|
2016-05-13 11:11:09 +08:00 |
|
cxt
|
979598f334
|
课程问答区帖子的发送防止连续提交
|
2016-05-13 11:06:47 +08:00 |
|
cxt
|
17497cd74e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-13 10:57:54 +08:00 |
|
cxt
|
345e1c0a48
|
评分的回复连续点击多次防止提交多次表单
|
2016-05-13 10:57:45 +08:00 |
|
cxt
|
f1821e54e1
|
通知和新闻详情页面的回复点击多次不会提交表单多次
|
2016-05-13 10:56:48 +08:00 |
|
huang
|
61803aa696
|
删除名师榜的时候局部刷新
|
2016-05-13 10:54:33 +08:00 |
|
huang
|
e8d76f449f
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 10:50:47 +08:00 |
|
huang
|
1673ae451b
|
名师榜新增一个后就不能再新增
|
2016-05-13 10:50:34 +08:00 |
|
Tim
|
51a6727b07
|
名师榜样式
|
2016-05-13 10:41:13 +08:00 |
 Linda
|
aec7366594
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 10:31:12 +08:00 |
|
Linda
|
a2418396dd
|
邦本库zip下载样式界面
|
2016-05-13 10:30:38 +08:00 |
|
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
2016-05-13 10:29:22 +08:00 |
|
cxt
|
cc92105da9
|
作品列表添加序号及样式调整
|
2016-05-13 09:58:24 +08:00 |
|
huang
|
37ee03374e
|
完成设置名师功能
|
2016-05-13 09:53:22 +08:00 |
|
yuanke
|
c31d4dc3bd
|
我要回复字不消失
|
2016-05-13 09:19:47 +08:00 |
|
yuanke
|
6237bcb6cd
|
加个gem 'certified'
|
2016-05-13 09:10:08 +08:00 |
|
yuanke
|
a39702f962
|
图片自动上传，代码测试编译错误过长。
|
2016-05-13 08:38:28 +08:00 |
|
cxt
|
f74e5eb6ae
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-12 17:49:13 +08:00 |
|
cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
2016-05-12 17:49:07 +08:00 |
|
Tim
|
2ac201ffdd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-12 17:41:42 +08:00 |
|
Tim
|
565d5e3bcc
|
作业测验列表html代码重构，添加序号列
|
2016-05-12 17:41:27 +08:00 |
|
cxt
|
8af0459519
|
首页动态中不应出现已删除的课程动态
|
2016-05-12 16:56:50 +08:00 |
|
cxt
|
582c305a47
|
申请引用过的作业在课程删除后不应该在申请题库中显示
|
2016-05-12 16:29:39 +08:00 |
|
huang
|
2be8e64748
|
内容和查看更多重复问题
|
2016-05-12 16:00:23 +08:00 |