 huang
|
733a91d160
|
新版pull 新建功能
|
2016-10-21 10:32:38 +08:00 |
 cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-08 13:18:46 +08:00 |
|
cxt
|
13bae8f8a5
|
线下作业
|
2016-07-08 13:17:14 +08:00 |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
2016-07-08 11:33:51 +08:00 |
|
huang
|
e588321ada
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 11:31:02 +08:00 |
|
huang
|
61e2e427fd
|
Merge branch 'rep_quality' into develop
|
2016-07-08 11:30:53 +08:00 |
|
cxt
|
3b418bc44c
|
如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。
|
2016-07-07 16:46:41 +08:00 |
|
huang
|
92b6171c36
|
sonar error puts
|
2016-07-07 11:08:29 +08:00 |
|
cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
2016-07-04 14:15:56 +08:00 |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
2016-07-04 14:14:51 +08:00 |
 yuanke
|
1bfb2918f0
|
KE间距改回原来的，修改课程大纲附件删除下载问题，修改博客标题与置顶样式问题
|
2016-07-01 20:06:12 +08:00 |
|
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
2016-07-01 09:31:19 +08:00 |
|
yuanke
|
5cc40408ee
|
修改KE单倍行距显示的时候不一致的BUG
|
2016-06-30 16:30:02 +08:00 |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
2016-06-29 14:18:17 +08:00 |
Your Name
|
a08edcca8a
|
quanxian
|
2016-06-28 17:18:50 +08:00 |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
2016-06-24 19:17:26 +08:00 |
|
Your Name
|
e17aa4c5d8
|
color
|
2016-06-24 11:20:39 +08:00 |
|
Your Name
|
05eb71036d
|
some css to added
|
2016-06-24 10:47:24 +08:00 |
|
huang
|
9f15a8aa4e
|
代码质量分析样式
|
2016-06-22 17:40:13 +08:00 |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
2016-06-21 16:53:31 +08:00 |
|
cxt
|
f4d67bc027
|
未读消息弹窗“点击展开”显示10条未读消息
|
2016-06-20 16:03:57 +08:00 |
|
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
2016-06-20 15:38:43 +08:00 |
|
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-06-17 14:36:12 +08:00 |
|
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
2016-06-17 14:31:14 +08:00 |
|
yuanke
|
747b2007cd
|
项目中未登录提示按钮样式问题
|
2016-06-17 13:44:11 +08:00 |
 Linda
|
01bd394a59
|
门户首页按照祎欣0613版本设计修改
|
2016-06-14 15:08:13 +08:00 |
|
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
2016-06-12 15:02:33 +08:00 |
|
cxt
|
00528bec60
|
学生列表没有分班就不显示分班列
|
2016-06-12 14:50:47 +08:00 |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
2016-06-08 11:37:58 +08:00 |
|
yuanke
|
4cb4213a52
|
修改blockquote样式
|
2016-06-08 10:44:58 +08:00 |
|
yuanke
|
ec39c16c66
|
Merge branch 'develop' into yuanke
|
2016-06-08 09:41:18 +08:00 |
|
yuanke
|
5999189f3a
|
1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
|
2016-06-08 09:02:00 +08:00 |
|
cxt
|
de58cfb5e5
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 16:02:08 +08:00 |
 Tim
|
253d9da345
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 09:01:53 +08:00 |
|
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 16:28:23 +08:00 |
|
cxt
|
d27a050ffa
|
消息弹窗的显示
|
2016-06-03 16:28:11 +08:00 |
|
huang
|
4367cf2233
|
Merge branch 'yuanke' into develop
|
2016-06-03 15:01:37 +08:00 |
|
Tim
|
3c6c617d09
|
门户样式冲突问题
|
2016-06-03 10:08:54 +08:00 |
|
cxt
|
1396cae14c
|
消息弹框
|
2016-06-03 08:59:17 +08:00 |
|
yuanke
|
c3c639aa77
|
超链接颜色修改
|
2016-06-02 15:27:16 +08:00 |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
2016-06-02 13:55:40 +08:00 |
|
Tim
|
3b55e9e39b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/student_work/_evaluation_un_title.html.erb
app/views/student_work/_evaluation_un_work.html.erb
|
2016-06-01 13:59:01 +08:00 |
|
Tim
|
513fe1a93d
|
作品列表可拖拽
|
2016-06-01 13:46:05 +08:00 |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
|
Tim
|
9cc749bd57
|
门户样式统一，防止冲突
|
2016-05-30 14:38:57 +08:00 |
|
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
2016-05-27 15:34:55 +08:00 |
|
cxt
|
400a470a2b
|
作品列表的样式调整
|
2016-05-27 14:42:12 +08:00 |
|
cxt
|
3b33732e6f
|
学生列表的姓名、学号、分班和加入时间做成不可点击的
|
2016-05-27 14:15:26 +08:00 |
|
yuanke
|
e7d20c2b98
|
1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
|
2016-05-24 09:11:50 +08:00 |
|
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
2016-05-23 15:58:32 +08:00 |