Your Name
|
8438bc7bcd
|
somethint to added
|
2016-06-23 14:31:23 +08:00 |
huang
|
9f15a8aa4e
|
代码质量分析样式
|
2016-06-22 17:40:13 +08:00 |
guange
|
7700445c17
|
加入课程
|
2016-06-22 16:42:20 +08:00 |
yuanke
|
b68e227531
|
没激活的帐号界面
|
2016-06-22 14:04:47 +08:00 |
cxt
|
1b12c56960
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-21 16:53:36 +08:00 |
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
2016-06-21 16:53:31 +08:00 |
Tim
|
1a4865be09
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-21 15:03:51 +08:00 |
cxt
|
2176ad1ede
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-21 11:18:37 +08:00 |
guange
|
62a1b5de7c
|
加入班级更新
|
2016-06-20 17:04:42 +08:00 |
yuanke
|
301556b9c3
|
Merge branch 'yuanke' into develop
|
2016-06-20 16:41:23 +08:00 |
yuanke
|
d3f3f019a0
|
下拉菜单有时候不显示
|
2016-06-20 16:40:56 +08:00 |
yuanke
|
fde06a2327
|
更新资源描述样式修改
|
2016-06-20 16:35:16 +08:00 |
guange
|
4db1df0a4d
|
css
|
2016-06-20 16:29:52 +08:00 |
guange
|
311f21ee5a
|
css
|
2016-06-20 16:23:59 +08:00 |
cxt
|
f4d67bc027
|
未读消息弹窗“点击展开”显示10条未读消息
|
2016-06-20 16:03:57 +08:00 |
guange
|
47c443e59d
|
输入框变大一点
|
2016-06-20 15:56:57 +08:00 |
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-20 15:43:15 +08:00 |
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
2016-06-20 15:38:43 +08:00 |
txz
|
b17b92cc3e
|
微信回复后先加载后启用回复按钮
|
2016-06-20 11:08:57 +08:00 |
guange
|
98c6548e39
|
重写登录和注册
|
2016-06-17 18:18:03 +08:00 |
yuanke
|
f3014c3993
|
Merge branch 'yuanke' into develop
|
2016-06-17 17:25:53 +08:00 |
huang
|
2464586ed2
|
组织样式问题
|
2016-06-17 17:20:17 +08:00 |
yuanke
|
948ec58248
|
作业二级回复未登录显示样式问题
|
2016-06-17 17:18:36 +08:00 |
txz
|
18df93ba9f
|
微信动态列表界面问题
|
2016-06-17 16:16:24 +08:00 |
txz
|
acf17d6252
|
微信详情页面链接添加颜色
|
2016-06-17 15:45:29 +08:00 |
txz
|
994ce342d7
|
微信ul布局优化
|
2016-06-17 15:35:58 +08:00 |
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-06-17 14:36:12 +08:00 |
huang
|
0f17ac0e9e
|
Merge branch 'lingbing' into develop
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
2016-06-17 14:33:31 +08:00 |
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
2016-06-17 14:31:14 +08:00 |
yuanke
|
747b2007cd
|
项目中未登录提示按钮样式问题
|
2016-06-17 13:44:11 +08:00 |
huang
|
227f2343a4
|
登录注册背景图片替换
|
2016-06-16 17:14:13 +08:00 |
huang
|
260bef0ebb
|
登录祖册鼠标经过颜色
|
2016-06-16 17:01:51 +08:00 |
huang
|
006965df50
|
导航背景颜色还原
|
2016-06-16 16:46:44 +08:00 |
huang
|
3f697355d2
|
chorm浏览器兼容问题
|
2016-06-16 16:01:56 +08:00 |
huang
|
312fa61489
|
输入框线条
|
2016-06-16 15:57:30 +08:00 |
huang
|
6707868915
|
登录页面新样式
|
2016-06-16 15:52:54 +08:00 |
huang
|
d2d15710b5
|
解决chrome浏览器背景黄色问题
|
2016-06-16 15:25:43 +08:00 |
huang
|
a63dffd9d3
|
资源库导航颜色一致
|
2016-06-16 14:54:27 +08:00 |
huang
|
d4760bcd6d
|
一个像素问题
|
2016-06-16 14:43:19 +08:00 |
Tim
|
24458ecb48
|
table可拖拽,在线测验表格布局优化
|
2016-06-16 11:31:39 +08:00 |
huang
|
474c183050
|
导航颜色一致
|
2016-06-16 10:35:53 +08:00 |
huang
|
5e3df51ad9
|
完成新版登录注册
|
2016-06-16 10:21:21 +08:00 |
Tim
|
9cd1630651
|
优化css添加,将课程,项目,个人主页,组织首页样式替换,登录与个人主页详细css替换
|
2016-06-16 08:52:13 +08:00 |
huang
|
a2c5cc6da1
|
登录界面base及新页面
|
2016-06-15 15:41:13 +08:00 |
Linda
|
01bd394a59
|
门户首页按照祎欣0613版本设计修改
|
2016-06-14 15:08:13 +08:00 |
txz
|
270399c5da
|
点赞时图标移动修复
|
2016-06-14 14:04:39 +08:00 |
txz
|
962470c582
|
微信文字显示不全bug
|
2016-06-13 17:23:35 +08:00 |
txz
|
8bbdf3688c
|
微信加入班级css新增
|
2016-06-13 15:25:26 +08:00 |
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-12 17:18:34 +08:00 |
txz
|
0e63a3a24c
|
指派文字显示不全
|
2016-06-12 15:37:52 +08:00 |
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
2016-06-12 15:02:33 +08:00 |
txz
|
719774f159
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 14:52:29 +08:00 |
txz
|
b57f6fbc65
|
微信回复框增加padding
|
2016-06-12 14:52:24 +08:00 |
cxt
|
00528bec60
|
学生列表没有分班就不显示分班列
|
2016-06-12 14:50:47 +08:00 |
guange
|
36fedd4d15
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 10:21:07 +08:00 |
txz
|
981b199a0f
|
微信图标与数字间距调整,作业增加作业类型
|
2016-06-08 15:34:14 +08:00 |
txz
|
5f26e9e3ee
|
微信回复文字格式不一致,微信回复换行处理
|
2016-06-08 15:02:06 +08:00 |
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
2016-06-08 11:37:58 +08:00 |
cxt
|
b6eb5a3668
|
还原作品列表的拖动
|
2016-06-08 11:28:20 +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 |
txz
|
24a17d719e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-08 09:15:41 +08:00 |
txz
|
9b4a3a704d
|
锁定帖子不能回复
|
2016-06-08 09:15:35 +08:00 |
yuanke
|
5999189f3a
|
1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
|
2016-06-08 09:02:00 +08:00 |
huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
2016-06-07 17:37:38 +08:00 |
huang
|
09ff5954bd
|
字体过长演示问题(模式二子页面)
|
2016-06-07 16:56:20 +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
|
1d44116841
|
作品列表可拖拽
|
2016-06-07 15:30:17 +08:00 |
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
2016-06-07 10:17:16 +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 |
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-06 15:11:59 +08:00 |
huang
|
df8df117a8
|
解决匿名用户登录问题(控制器和view)
|
2016-06-06 15:02:11 +08:00 |
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
2016-06-06 14:41:18 +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 |
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 14:58: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 |
huang
|
76732a3034
|
新模式有一
|
2016-06-02 13:17:38 +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 |
guange
|
1bdf8800bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-31 19:20:45 +08:00 |
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
txz
|
e121d7d927
|
二级回复显示边框区分
|
2016-05-31 14:55:25 +08:00 |
txz
|
91be3b9f85
|
回复提交时按钮变灰
|
2016-05-31 14:37:45 +08:00 |
huang
|
c57c575c84
|
新版组织静态页面模板
|
2016-05-30 16:24:51 +08:00 |
huang
|
471ed7cbd2
|
组织logo获取,添加样式图片
|
2016-05-30 14:58:46 +08:00 |
Tim
|
9cc749bd57
|
门户样式统一,防止冲突
|
2016-05-30 14:38:57 +08:00 |
huang
|
46e4f2c143
|
组织新base框架
|
2016-05-30 14:23:52 +08:00 |
huang
|
389172e5b2
|
CSS样式
|
2016-05-30 10:45:00 +08:00 |
yuanke
|
98244d2a3d
|
将文章标题的颜色恢复正常
|
2016-05-27 16:42:05 +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 |
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
2016-05-27 15:30:35 +08:00 |
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
2016-05-27 15:04:56 +08:00 |
Tim
|
5f27519c67
|
table可拖拽
|
2016-05-27 14:44:32 +08:00 |
cxt
|
400a470a2b
|
作品列表的样式调整
|
2016-05-27 14:42:12 +08:00 |
cxt
|
3b33732e6f
|
学生列表的姓名、学号、分班和加入时间做成不可点击的
|
2016-05-27 14:15:26 +08:00 |
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
2016-05-27 14:01:02 +08:00 |
txz
|
9134e55606
|
动态纯文本模式,图标处理
|
2016-05-26 17:40:22 +08:00 |
txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 10:55:18 +08:00 |
txz
|
c73ce61afe
|
微信动态可点击,icon图片替换
|
2016-05-26 10:55:00 +08:00 |
guange
|
01428fad14
|
merge
|
2016-05-26 10:51:01 +08:00 |
cxt
|
8257770ec9
|
课程和项目留言的点赞
|
2016-05-25 16:20:01 +08:00 |
cxt
|
5c9ec49457
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-25 15:27:00 +08:00 |
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
2016-05-25 14:26:49 +08:00 |
txz
|
c4c0dd3c60
|
回复内容换行符未显示
|
2016-05-25 13:50:59 +08:00 |
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
2016-05-24 20:51:24 +08:00 |
Tim
|
1c0a68e57b
|
组织配置成员tab,搜索结果太多导致换页断行问题
|
2016-05-24 15:47:22 +08:00 |
txz
|
29ceb7b8e9
|
微信图标清晰问题,回复点赞右对齐
|
2016-05-24 15:01:26 +08:00 |
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
2016-05-24 09:38:49 +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 |
cxt
|
c3ec7289b7
|
Merge branch 'develop' into cxt_course
|
2016-05-23 09:51:59 +08:00 |
huang
|
c749fe381b
|
Merge branch 'weixin_guange' into develop
|
2016-05-20 21:02:01 +08:00 |
huang
|
cdde844e44
|
Merge branch 'cxt_course' into develop
|
2016-05-20 21:01:30 +08:00 |
huang
|
f94806bcdf
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 21:01:18 +08:00 |
Tim
|
dd4786d639
|
作品列表查看详情定位
|
2016-05-20 20:44:13 +08:00 |
txz
|
d329b60a8a
|
微信加载中去白底,内容去除固定行高
|
2016-05-20 20:26:04 +08:00 |
Tim
|
5f4a9304fe
|
提交成绩后,列表成绩没刷新修改;分组作业列表宽度调整
|
2016-05-20 20:05:39 +08:00 |
huang
|
8ebe8b0d0c
|
删除提示顺序
消息样式
|
2016-05-20 18:55:17 +08:00 |
huang
|
fc8cbc2b38
|
Merge branch 'hjq_beidou' into develop
|
2016-05-20 16:18:47 +08:00 |
huang
|
ef1a5d32f2
|
顶端背景色
|
2016-05-20 16:18:23 +08:00 |
huang
|
d108f0a684
|
Merge branch 'yuanke' into develop
|
2016-05-20 15:37:44 +08:00 |
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 15:37:02 +08:00 |
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-05-20 15:35:08 +08:00 |
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
Tim
|
13f83719c1
|
作品列表改为table布局
|
2016-05-20 15:15:42 +08:00 |
yuanke
|
ed58e78065
|
KE表格颜色问题
|
2016-05-19 16:38:48 +08:00 |
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
2016-05-19 16:11:06 +08:00 |
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
2016-05-19 16:10:18 +08:00 |
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-19 16:01:07 +08:00 |
cxt
|
3ebef0eae2
|
消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面
|
2016-05-19 15:57:20 +08:00 |
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
2016-05-18 14:49:13 +08:00 |
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
2016-05-17 16:30:03 +08:00 |
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
2016-05-17 14:18:14 +08:00 |
Tim
|
0b2fe1d88a
|
分组作业样式
|
2016-05-17 11:24:29 +08:00 |
huang
|
61ba7b0c30
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-17 11:22:03 +08:00 |
yuanke
|
c0de43ecc0
|
修改KE字体间距问题,代码测试出错提示。
|
2016-05-17 10:31:10 +08:00 |
Tim
|
76d1251546
|
将组织门户登录栏挪到与logo同行
|
2016-05-17 09:36:55 +08:00 |
Tim
|
fa788ced1b
|
资源库添加私有资源
|
2016-05-16 15:00:08 +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 |
txz
|
8d338cff9e
|
微信锁定帖子关闭回复
|
2016-05-13 15:48:31 +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 |
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 |
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 |
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 |
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
|
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 |
Tim
|
7957beb64a
|
发送至按钮样式控制
|
2016-05-11 15:51:59 +08:00 |
cxt
|
5baf467d13
|
作品评分不覆盖
|
2016-05-10 15:26:08 +08:00 |
yuanke
|
e502aa7c43
|
KE表格项目问题,自动上传图片做了一点
|
2016-05-10 12:51:42 +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
|
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 |
cxt
|
10d26f89d9
|
作业列表的二级回复
|
2016-05-06 17:36:28 +08:00 |
huang
|
b40a112015
|
配置页面一级域名超过的时候显示样式
|
2016-05-06 17:25:50 +08:00 |
huang
|
9c18b37349
|
Merge branch 'hjq_beidou' into develop
|
2016-05-06 17:05:27 +08:00 |
Tim
|
c3aec4d115
|
组织一级栏目名称过长时溢出
|
2016-05-06 16:31:40 +08:00 |
huang
|
7f9a327166
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/sub_document_comments/show.html.erb
|
2016-05-06 16:25:41 +08:00 |
Tim
|
cd95ed0558
|
二级回复展开更多效果实现
|
2016-05-06 16:20:39 +08:00 |
yuanke
|
d32e07bda9
|
项目符号有的地方多余,issue详情里面项目符号显示为数字改为圆点.
|
2016-05-06 14:22:45 +08:00 |
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-05-06 11:35:27 +08:00 |
yuanke
|
a863c143f3
|
收缩箭头修改
|
2016-05-06 10:22:48 +08:00 |
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
2016-05-06 10:16:56 +08:00 |
Tim
|
4bf1883ba2
|
组织门户导航栏二级显隐
|
2016-05-06 10:02:31 +08:00 |
yuanke
|
283a83013c
|
KE 修改项目符号、表格颜色问题
|
2016-05-06 08:48:15 +08:00 |
Tim
|
d0f97275cc
|
组织二级栏目显隐效果
|
2016-05-05 16:20:49 +08:00 |
cxt
|
55718f2d44
|
设置课程大纲时若博客标题太长以省略号结束
|
2016-05-05 11:34:31 +08:00 |
Tim
|
c3514f5b6a
|
二级栏目名长度控制
|
2016-05-05 09:28:49 +08:00 |
Tim
|
787dbaaffc
|
二维码处文字样式处理
|
2016-05-05 09:08:01 +08:00 |
Tim
|
abbbe9b7d6
|
二级子目录样式处理
|
2016-05-04 16:53:59 +08:00 |
cxt
|
6c184b9248
|
题库的分享请求
|
2016-05-04 16:17:37 +08:00 |
huang
|
65a907bc99
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_sub_domain.html.erb
|
2016-05-04 15:06:20 +08:00 |
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
2016-05-04 15:05:54 +08:00 |
Linda
|
cbec7cc8f8
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_sub_domain.html.erb
|
2016-05-04 14:41:54 +08:00 |
Linda
|
0fc142d822
|
组织配置logo样式
|
2016-05-04 14:40:25 +08:00 |
Tim
|
714deebe21
|
二级导航调整
|
2016-05-04 14:08:57 +08:00 |
huang
|
7fbf6f4011
|
模式二帖子列表添加分页
|
2016-05-04 11:04:41 +08:00 |
cxt
|
ff160ff793
|
题库的申请改为绿色按钮
|
2016-05-04 10:15:22 +08:00 |
cxt
|
d3e3e9d22b
|
补交作品的样式
|
2016-05-03 18:15:40 +08:00 |
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
2016-05-03 17:15:46 +08:00 |