 huang
|
0d2a7d8bfd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
9 years ago |
|
huang
|
39c753fd25
|
名师列表排序
|
9 years ago |
|
huang
|
6ccb79a210
|
教师列表颜色
|
9 years ago |
|
huang
|
6d484e15fd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
39d014355b
|
科大名师，和名师列表添加标题
|
9 years ago |
 Tim
|
d384d1e2b4
|
名师榜样式调整
|
9 years ago |
|
Tim
|
afbe5317cb
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
a88ab59489
|
名师榜添加右侧banner
|
9 years ago |
|
txz
|
1f95495f52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
txz
|
8d338cff9e
|
微信锁定帖子关闭回复
|
9 years ago |
|
huang
|
467ee60657
|
名师默认显示5个，没有则不显示
|
9 years ago |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
1cd74121ae
|
Merge branch 'yuanke' into develop
|
9 years ago |
 yuanke
|
a67ee38ac9
|
将复制粘贴的图片 链接及class都去掉
|
9 years ago |
|
huang
|
f1c0347ee2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
huang
|
5ae580aab0
|
添加用户连接
|
9 years ago |
 cxt
|
3e340b6ef9
|
博客微信api
|
9 years ago |
|
yuanke
|
fc0f92738d
|
复制粘贴时将图片所带链接去掉
|
9 years ago |
|
cxt
|
22523d25b8
|
贴吧发帖防止多次提交表单
|
9 years ago |
|
huang
|
660cf7ef73
|
名师列表局部搜索
|
9 years ago |
|
cxt
|
89749b853b
|
微信帖子api
|
9 years ago |
|
cxt
|
01287ff93c
|
学生打开新建的作业列表报500
|
9 years ago |
|
cxt
|
dc6c5fe18b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
9 years ago |
|
Tim
|
1833f15e19
|
课程资源库导入资源样式修改
|
9 years ago |
|
huang
|
91f3fddb16
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
0feb1280fd
|
名师更多列表
及相关入口路由
|
9 years ago |
|
yuanke
|
80c6edd2d3
|
KE过滤html代码的时候表格的颜色等样式不能被过滤掉
|
9 years ago |
|
Tim
|
4ea7d5ed57
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
9 years ago |
|
huang
|
e90da9d812
|
teachers页面
|
9 years ago |
|
huang
|
3853d5b7ad
|
右三模式定制
|
9 years ago |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
2d701b7d03
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
yuanke
|
a1323e3d76
|
表格问题
|
9 years ago |
|
huang
|
343e9d9434
|
修改日志分割关闭
|
9 years ago |
|
Tim
|
21a56509fc
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
457bac0b9d
|
0
|
9 years ago |
|
Tim
|
61470c9bd4
|
名师榜css样式添加
|
9 years ago |
|
huang
|
7bd047f7e4
|
组织模式二中名师榜样式
|
9 years ago |
|
huang
|
f7a888ac3d
|
名师默认创建
|
9 years ago |
|
cxt
|
979598f334
|
课程问答区帖子的发送防止连续提交
|
9 years ago |
|
cxt
|
17497cd74e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
345e1c0a48
|
评分的回复连续点击多次防止提交多次表单
|
9 years ago |
|
cxt
|
f1821e54e1
|
通知和新闻详情页面的回复点击多次不会提交表单多次
|
9 years ago |
|
huang
|
61803aa696
|
删除名师榜的时候局部刷新
|
9 years ago |
|
huang
|
e8d76f449f
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
1673ae451b
|
名师榜新增一个后就不能再新增
|
9 years ago |
