 huang
|
55c9faaf7b
|
Merge branch 'yuanke' into develop
|
2016-05-13 18:26:01 +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 |
 Tim
|
d384d1e2b4
|
名师榜样式调整
|
2016-05-13 16:28:16 +08:00 |
 yuanke
|
be97675aed
|
没带图片类型的图片不让点击放大看!
|
2016-05-13 16:09:26 +08:00 |
|
txz
|
8d338cff9e
|
微信锁定帖子关闭回复
|
2016-05-13 15:48:31 +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
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
|
yuanke
|
fc0f92738d
|
复制粘贴时将图片所带链接去掉
|
2016-05-13 14:58:35 +08:00 |
 cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
2016-05-13 14:33:06 +08:00 |
|
yuanke
|
80c6edd2d3
|
KE过滤html代码的时候表格的颜色等样式不能被过滤掉
|
2016-05-13 14:22:10 +08:00 |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
2016-05-13 14:08:34 +08:00 |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
2016-05-13 11:39:01 +08:00 |
|
yuanke
|
a1323e3d76
|
表格问题
|
2016-05-13 11:32:52 +08:00 |
|
Tim
|
61470c9bd4
|
名师榜css样式添加
|
2016-05-13 11:29:45 +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
|
f1821e54e1
|
通知和新闻详情页面的回复点击多次不会提交表单多次
|
2016-05-13 10:56:48 +08:00 |
|
Tim
|
51a6727b07
|
名师榜样式
|
2016-05-13 10:41:13 +08:00 |
 Linda
|
a2418396dd
|
邦本库zip下载样式界面
|
2016-05-13 10:30:38 +08:00 |
|
cxt
|
cc92105da9
|
作品列表添加序号及样式调整
|
2016-05-13 09:58:24 +08:00 |
|
yuanke
|
c31d4dc3bd
|
我要回复字不消失
|
2016-05-13 09:19:47 +08:00 |
|
yuanke
|
a39702f962
|
图片自动上传，代码测试编译错误过长。
|
2016-05-13 08:38:28 +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 |
|
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
2016-05-12 15:02:23 +08:00 |
|
cxt
|
ac5a9c87ac
|
消息通知中的“同意|拒绝”调整宽度
|
2016-05-12 14:59:12 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
huang
|
3dde8bd25a
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-11 16:21:17 +08:00 |
|
huang
|
52c8593b09
|
组织教师列表sql优化
|
2016-05-11 16:20:55 +08:00 |
|
Tim
|
7957beb64a
|
发送至按钮样式控制
|
2016-05-11 15:51:59 +08:00 |
|
cxt
|
d232a5241e
|
新建课程报404
|
2016-05-11 11:47:16 +08:00 |
|
yuanke
|
135e02504e
|
图片自动上传
|
2016-05-11 11:40:01 +08:00 |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
2016-05-10 15:26:08 +08:00 |
|
yuanke
|
e502aa7c43
|
KE表格项目问题，自动上传图片做了一点
|
2016-05-10 12:51:42 +08:00 |
|
cxt
|
11017d72c5
|
老师对作品的评分可为空
|
2016-05-10 11:28:24 +08:00 |
|
Tim
|
c8e0ffbdae
|
左二和右二文字隐藏时的更多显示
|
2016-05-10 10:30:28 +08:00 |
|
Tim
|
2461a5c918
|
组织门户二级目录位置重新设置
|
2016-05-09 19:40:53 +08:00 |
|
Tim
|
b32693ca2a
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-09 18:44:43 +08:00 |
|
Tim
|
cf1cf58bab
|
组织门户二级目录添加分栏"|"以及登录未登录位置控制
|
2016-05-09 18:44:20 +08:00 |
|
huang
|
fc36e4c01e
|
教师列表
|
2016-05-09 18:10:22 +08:00 |
|
huang
|
e8c458c163
|
Merge branch 'yuanke' into develop
|
2016-05-06 22:03:36 +08:00 |
|
yuanke
|
350e3f8eb4
|
表格颜色问题没改好暂时还原之前的
|
2016-05-06 21:34:08 +08:00 |
|
huang
|
3469d928d8
|
图片变的很大问题
|
2016-05-06 20:17:11 +08:00 |
|
huang
|
23a23fd085
|
组织logo上传图片
|
2016-05-06 19:53:13 +08:00 |
|
huang
|
f4a5aeec07
|
样式优化
|
2016-05-06 18:29:26 +08:00 |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
2016-05-06 18:12:08 +08:00 |
|
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
2016-05-06 18:07:24 +08:00 |
|
yuanke
|
34ea7662b2
|
将内容省略显示的固定字数改为传参
|
2016-05-06 17:59:27 +08:00 |