 txz
|
4a58777bb9
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-21 15:56:31 +08:00 |
|
txz
|
0a0f8aefac
|
微信加入班级弹框css兼容；app页面meta标签修改
|
2016-07-21 15:56:27 +08:00 |
 yuanke
|
86731c34d5
|
单个课程作业不显示的BUG修改，加入班级时如果班级已被删除需要提示!
|
2016-07-21 15:21:09 +08:00 |
 cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
2016-07-21 14:31:43 +08:00 |
|
yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
2016-07-21 14:29:04 +08:00 |
|
cxt
|
60bbe89c0d
|
博客的自动保存
|
2016-07-21 14:05:15 +08:00 |
|
yuanke
|
92ffbcfce6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-21 14:03:16 +08:00 |
|
yuanke
|
7cd505ea4b
|
博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
|
2016-07-21 14:03:04 +08:00 |
|
txz
|
24ee25e095
|
课程列表点击管理课程图标，列表展开bug修复
|
2016-07-21 13:54:03 +08:00 |
|
cxt
|
9a4c210d16
|
组织文章的“点击展开隐藏楼层”
|
2016-07-21 10:55:56 +08:00 |
|
cxt
|
0146ac1f11
|
访问他人主页时，对于动态过滤按钮，“我的动态”应改为“他的动态”；但浏览自己的主页时，应该显示为“我的动态”。
|
2016-07-21 10:50:53 +08:00 |
|
cxt
|
c84a9e6e10
|
个人主页，不需要对其他用户显示关注人的动态。例如，我看周老师的个人主页时，不应该显示我的博客动态；但他本人看自己的主页时，应该显示尹刚的博客动态，因为他关注我了。
|
2016-07-21 10:47:01 +08:00 |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
2016-07-21 10:30:48 +08:00 |
|
Tim
|
53c515b8d1
|
课程大纲侧导航js控制
|
2016-07-21 10:28:50 +08:00 |
 daiao
|
7c2495c8a1
|
统一在线测验新建单选选项时，样式出现的bug
|
2016-07-21 10:20:45 +08:00 |
|
Tim
|
fe105c84ad
|
弹框定位改为fixed
|
2016-07-21 10:18:58 +08:00 |
|
Tim
|
541440135f
|
css中引用图片路径修改
|
2016-07-21 10:11:02 +08:00 |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
2016-07-21 09:55:47 +08:00 |
 huang
|
d58167f4bc
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-07-21 09:27:33 +08:00 |
|
huang
|
6357f5be2a
|
解决成员列表获取单位不准确的问题
|
2016-07-21 09:27:14 +08:00 |
|
Tim
|
efd452db2c
|
Merge branch 'cs_optimize_txz' into develop
|
2016-07-20 17:13:40 +08:00 |
|
Tim
|
dcb541e889
|
资源库资源列表取消虚线
|
2016-07-20 17:10:51 +08:00 |
|
Tim
|
2850fe1b2b
|
预览图片边框阴影效果
|
2016-07-20 17:08:31 +08:00 |
|
huang
|
f979e80f24
|
Gitlab数据清理及迁移，主要是历史数据
|
2016-07-20 17:05:55 +08:00 |
|
Tim
|
85c9fb5dce
|
二级回复图片超出显示
|
2016-07-20 17:00:54 +08:00 |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
2016-07-20 17:00:18 +08:00 |
|
Tim
|
635b3beb32
|
新建issue版本图标问题
|
2016-07-20 16:46:58 +08:00 |
|
Tim
|
5adc4e1e5a
|
项目issue上传附件与填写正确加间距
|
2016-07-20 16:41:53 +08:00 |
|
Tim
|
bf87ffb992
|
组织历史版本弹框文件夹图标问题
|
2016-07-20 16:21:58 +08:00 |
|
Tim
|
f3494489c2
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-20 15:14:32 +08:00 |
|
Tim
|
525169fa4a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-20 15:12:44 +08:00 |
|
Tim
|
78e4d37d8b
|
大纲base页引入弹框样式；作业列表调整
|
2016-07-20 15:09:01 +08:00 |
|
daiao
|
a55e64dfb3
|
保持组织动态用户名颜色与其他动态用户名颜色显示一直
|
2016-07-20 14:46:33 +08:00 |
|
yuanke
|
ff42de619b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-20 14:06:16 +08:00 |
|
txz
|
c56f7732a1
|
二级回复新样式
|
2016-07-20 14:05:17 +08:00 |
|
yuanke
|
67e87df4d5
|
微信动态详情回复显示修改
|
2016-07-20 13:34:58 +08:00 |
|
huang
|
3a43b7beb5
|
redirect to repository when delete jenkins job
|
2016-07-20 11:20:48 +08:00 |
|
huang
|
e99c76a0de
|
resolve edit problem of jenkins job
|
2016-07-20 10:09:55 +08:00 |
|
yuanke
|
bf600e8f76
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-20 10:09:37 +08:00 |
|
yuanke
|
1ce7b22c0e
|
博客动态回复二级回复修改
|
2016-07-20 10:09:27 +08:00 |
|
huang
|
1935176500
|
Merge branch 'develop' into rep_quality
|
2016-07-20 09:38:59 +08:00 |
|
huang
|
14e6db457b
|
rake
|
2016-07-20 09:38:23 +08:00 |
|
txz
|
53feb0bbd4
|
课程列表课程名称宽度限制
|
2016-07-20 09:11:05 +08:00 |
 guange
|
674c45f1d9
|
去掉上传的csrf报错
|
2016-07-19 17:44:27 +08:00 |
|
daiao
|
763ebcbf74
|
修复课程总学时结果，总学时=理论学时+时间学时
|
2016-07-19 17:39:20 +08:00 |
|
huang
|
0c0dfbd093
|
changeset关联
|
2016-07-19 17:38:11 +08:00 |
|
daiao
|
7808bb5ebe
|
修复非管理远用户帖子出现管理员帖子置顶的问题
|
2016-07-19 17:37:39 +08:00 |
|
Tim
|
eb503cc3e8
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-19 16:50:30 +08:00 |
|
Tim
|
ce5cf8bf4f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-19 16:44:14 +08:00 |
|
txz
|
707df88c7f
|
tab容器宽度百分百
|
2016-07-19 16:05:39 +08:00 |