 huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
9 years ago |
 Tim
|
bb4d93f911
|
图片路径有效化
|
9 years ago |
 cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
ec33569033
|
取消拖拽
|
9 years ago |
|
Tim
|
a3738c4cb2
|
新建组织，题库和资源库弹框样式检查
|
9 years ago |
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
Tim
|
a28d775cb2
|
资源库，题库样式检查
|
9 years ago |
|
guange
|
f9075e08ba
|
merge
|
9 years ago |
|
guange
|
d348981721
|
加入邀请码
|
9 years ago |
Your Name
|
e17aa4c5d8
|
color
|
9 years ago |
|
Your Name
|
05eb71036d
|
some css to added
|
9 years ago |
|
Tim
|
d14a462f2b
|
替换css文件源，css样式修改
|
9 years ago |
|
Your Name
|
8438bc7bcd
|
somethint to added
|
9 years ago |
|
huang
|
9f15a8aa4e
|
代码质量分析样式
|
9 years ago |
|
guange
|
7700445c17
|
加入课程
|
9 years ago |
 yuanke
|
b68e227531
|
没激活的帐号界面
|
9 years ago |
|
cxt
|
1b12c56960
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
9 years ago |
|
Tim
|
1a4865be09
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
2176ad1ede
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
guange
|
62a1b5de7c
|
加入班级更新
|
9 years ago |
|
yuanke
|
301556b9c3
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
d3f3f019a0
|
下拉菜单有时候不显示
|
9 years ago |
|
yuanke
|
fde06a2327
|
更新资源描述样式修改
|
9 years ago |
|
guange
|
4db1df0a4d
|
css
|
9 years ago |
|
guange
|
311f21ee5a
|
css
|
9 years ago |
|
cxt
|
f4d67bc027
|
未读消息弹窗“点击展开”显示10条未读消息
|
9 years ago |
|
guange
|
47c443e59d
|
输入框变大一点
|
9 years ago |
|
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
9 years ago |
|
txz
|
b17b92cc3e
|
微信回复后先加载后启用回复按钮
|
9 years ago |
|
guange
|
98c6548e39
|
重写登录和注册
|
9 years ago |
|
yuanke
|
f3014c3993
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
2464586ed2
|
组织样式问题
|
9 years ago |
|
yuanke
|
948ec58248
|
作业二级回复未登录显示样式问题
|
9 years ago |
|
txz
|
18df93ba9f
|
微信动态列表界面问题
|
9 years ago |
|
txz
|
acf17d6252
|
微信详情页面链接添加颜色
|
9 years ago |
|
txz
|
994ce342d7
|
微信ul布局优化
|
9 years ago |
|
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
0f17ac0e9e
|
Merge branch 'lingbing' into develop
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
9 years ago |
|
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
9 years ago |
|
yuanke
|
747b2007cd
|
项目中未登录提示按钮样式问题
|
9 years ago |
|
huang
|
227f2343a4
|
登录注册背景图片替换
|
9 years ago |
|
huang
|
260bef0ebb
|
登录祖册鼠标经过颜色
|
9 years ago |
|
huang
|
006965df50
|
导航背景颜色还原
|
9 years ago |
|
huang
|
3f697355d2
|
chorm浏览器兼容问题
|
9 years ago |
|
huang
|
312fa61489
|
输入框线条
|
9 years ago |
|
huang
|
6707868915
|
登录页面新样式
|
9 years ago |
|
huang
|
d2d15710b5
|
解决chrome浏览器背景黄色问题
|
9 years ago |
|
huang
|
a63dffd9d3
|
资源库导航颜色一致
|
9 years ago |
|
huang
|
d4760bcd6d
|
一个像素问题
|
9 years ago |
|
Tim
|
24458ecb48
|
table可拖拽，在线测验表格布局优化
|
9 years ago |
|
huang
|
474c183050
|
导航颜色一致
|
9 years ago |
|
huang
|
5e3df51ad9
|
完成新版登录注册
|
9 years ago |
|
Tim
|
9cd1630651
|
优化css添加，将课程，项目，个人主页，组织首页样式替换，登录与个人主页详细css替换
|
9 years ago |
|
huang
|
a2c5cc6da1
|
登录界面base及新页面
|
9 years ago |
 Linda
|
01bd394a59
|
门户首页按照祎欣0613版本设计修改
|
9 years ago |
|
txz
|
270399c5da
|
点赞时图标移动修复
|
9 years ago |
|
txz
|
962470c582
|
微信文字显示不全bug
|
9 years ago |
|
txz
|
8bbdf3688c
|
微信加入班级css新增
|
9 years ago |
|
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
txz
|
0e63a3a24c
|
指派文字显示不全
|
9 years ago |
|
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
txz
|
719774f159
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
b57f6fbc65
|
微信回复框增加padding
|
9 years ago |
|
cxt
|
00528bec60
|
学生列表没有分班就不显示分班列
|
9 years ago |
|
guange
|
36fedd4d15
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
981b199a0f
|
微信图标与数字间距调整，作业增加作业类型
|
9 years ago |
|
txz
|
5f26e9e3ee
|
微信回复文字格式不一致，微信回复换行处理
|
9 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
b6eb5a3668
|
还原作品列表的拖动
|
9 years ago |
|
yuanke
|
4cb4213a52
|
修改blockquote样式
|
9 years ago |
|
yuanke
|
ec39c16c66
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
txz
|
24a17d719e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
9b4a3a704d
|
锁定帖子不能回复
|
9 years ago |
|
yuanke
|
5999189f3a
|
1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
|
9 years ago |
|
huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
09ff5954bd
|
字体过长演示问题（模式二子页面）
|
9 years ago |
|
cxt
|
de58cfb5e5
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
1d44116841
|
作品列表可拖拽
|
9 years ago |
|
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
9 years ago |
|
Tim
|
253d9da345
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
df8df117a8
|
解决匿名用户登录问题（控制器和view）
|
9 years ago |
|
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
9 years ago |
|
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
d27a050ffa
|
消息弹窗的显示
|
9 years ago |
|
huang
|
4367cf2233
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
Tim
|
3c6c617d09
|
门户样式冲突问题
|
9 years ago |
|
cxt
|
1396cae14c
|
消息弹框
|
9 years ago |
|
yuanke
|
c3c639aa77
|
超链接颜色修改
|
9 years ago |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
9 years ago |
|
huang
|
76732a3034
|
新模式有一
|
9 years ago |
|
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
|
9 years ago |
|
Tim
|
513fe1a93d
|
作品列表可拖拽
|
9 years ago |
|
guange
|
1bdf8800bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
txz
|
e121d7d927
|
二级回复显示边框区分
|
9 years ago |
|
txz
|
91be3b9f85
|
回复提交时按钮变灰
|
9 years ago |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
9 years ago |
|
huang
|
471ed7cbd2
|
组织logo获取，添加样式图片
|
9 years ago |
|
Tim
|
9cc749bd57
|
门户样式统一，防止冲突
|
9 years ago |
|
huang
|
46e4f2c143
|
组织新base框架
|
9 years ago |
|
huang
|
389172e5b2
|
CSS样式
|
9 years ago |
|
yuanke
|
98244d2a3d
|
将文章标题的颜色恢复正常
|
9 years ago |
|
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
9 years ago |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
9 years ago |
|
Tim
|
5f27519c67
|
table可拖拽
|
9 years ago |
|
cxt
|
400a470a2b
|
作品列表的样式调整
|
9 years ago |
|
cxt
|
3b33732e6f
|
学生列表的姓名、学号、分班和加入时间做成不可点击的
|
9 years ago |
|
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
txz
|
9134e55606
|
动态纯文本模式，图标处理
|
9 years ago |
|
txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
c73ce61afe
|
微信动态可点击，icon图片替换
|
9 years ago |
|
guange
|
01428fad14
|
merge
|
9 years ago |
|
cxt
|
8257770ec9
|
课程和项目留言的点赞
|
9 years ago |
|
cxt
|
5c9ec49457
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
9 years ago |
|
txz
|
c4c0dd3c60
|
回复内容换行符未显示
|
9 years ago |
|
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
9 years ago |
|
Tim
|
1c0a68e57b
|
组织配置成员tab，搜索结果太多导致换页断行问题
|
9 years ago |
|
txz
|
29ceb7b8e9
|
微信图标清晰问题，回复点赞右对齐
|
9 years ago |
|
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
9 years ago |
|
yuanke
|
e7d20c2b98
|
1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
|
9 years ago |
|
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
9 years ago |
|
cxt
|
c3ec7289b7
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
huang
|
c749fe381b
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
huang
|
cdde844e44
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
f94806bcdf
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
dd4786d639
|
作品列表查看详情定位
|
9 years ago |
|
txz
|
d329b60a8a
|
微信加载中去白底，内容去除固定行高
|
9 years ago |
|
Tim
|
5f4a9304fe
|
提交成绩后，列表成绩没刷新修改；分组作业列表宽度调整
|
9 years ago |
|
huang
|
8ebe8b0d0c
|
删除提示顺序
消息样式
|
9 years ago |
|
huang
|
fc8cbc2b38
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
ef1a5d32f2
|
顶端背景色
|
9 years ago |
|
huang
|
d108f0a684
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
9 years ago |
|
Tim
|
13f83719c1
|
作品列表改为table布局
|
9 years ago |
|
yuanke
|
ed58e78065
|
KE表格颜色问题
|
9 years ago |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
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
|
9 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
3ebef0eae2
|
消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面
|
9 years ago |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
9 years ago |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
9 years ago |
|
Tim
|
0b2fe1d88a
|
分组作业样式
|
9 years ago |
|
huang
|
61ba7b0c30
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
yuanke
|
c0de43ecc0
|
修改KE字体间距问题，代码测试出错提示。
|
9 years ago |
|
Tim
|
76d1251546
|
将组织门户登录栏挪到与logo同行
|
9 years ago |
|
Tim
|
fa788ced1b
|
资源库添加私有资源
|
9 years ago |
|
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 |
|
Tim
|
d384d1e2b4
|
名师榜样式调整
|
9 years ago |
|
txz
|
8d338cff9e
|
微信锁定帖子关闭回复
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
9 years ago |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
9 years ago |
|
Tim
|
61470c9bd4
|
名师榜css样式添加
|
9 years ago |
|
cxt
|
17497cd74e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
51a6727b07
|
名师榜样式
|
9 years ago |
|
Linda
|
a2418396dd
|
邦本库zip下载样式界面
|
9 years ago |
|
cxt
|
cc92105da9
|
作品列表添加序号及样式调整
|
9 years ago |
|
Tim
|
2ac201ffdd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
565d5e3bcc
|
作业测验列表html代码重构，添加序号列
|
9 years ago |
|
cxt
|
ac5a9c87ac
|
消息通知中的“同意|拒绝”调整宽度
|
9 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
|
Tim
|
7957beb64a
|
发送至按钮样式控制
|
9 years ago |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
9 years ago |
|
yuanke
|
e502aa7c43
|
KE表格项目问题，自动上传图片做了一点
|
9 years ago |
|
Tim
|
c8e0ffbdae
|
左二和右二文字隐藏时的更多显示
|
9 years ago |
|
Tim
|
2461a5c918
|
组织门户二级目录位置重新设置
|
9 years ago |
|
Tim
|
b32693ca2a
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
cf1cf58bab
|
组织门户二级目录添加分栏"|"以及登录未登录位置控制
|
9 years ago |
|
huang
|
fc36e4c01e
|
教师列表
|
9 years ago |
|
huang
|
3469d928d8
|
图片变的很大问题
|
9 years ago |
|
huang
|
23a23fd085
|
组织logo上传图片
|
9 years ago |
|
huang
|
f4a5aeec07
|
样式优化
|
9 years ago |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
9 years ago |
|
huang
|
b40a112015
|
配置页面一级域名超过的时候显示样式
|
9 years ago |
|
huang
|
9c18b37349
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
Tim
|
c3aec4d115
|
组织一级栏目名称过长时溢出
|
9 years ago |
|
huang
|
7f9a327166
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/sub_document_comments/show.html.erb
|
9 years ago |
|
Tim
|
cd95ed0558
|
二级回复展开更多效果实现
|
9 years ago |
|
yuanke
|
d32e07bda9
|
项目符号有的地方多余，issue详情里面项目符号显示为数字改为圆点.
|
9 years ago |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
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
|
9 years ago |
|
yuanke
|
a863c143f3
|
收缩箭头修改
|
9 years ago |
|
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
|
9 years ago |
|
Tim
|
4bf1883ba2
|
组织门户导航栏二级显隐
|
9 years ago |
|
yuanke
|
283a83013c
|
KE 修改项目符号、表格颜色问题
|
9 years ago |
|
Tim
|
d0f97275cc
|
组织二级栏目显隐效果
|
9 years ago |
|
cxt
|
55718f2d44
|
设置课程大纲时若博客标题太长以省略号结束
|
9 years ago |
|
Tim
|
c3514f5b6a
|
二级栏目名长度控制
|
9 years ago |
|
Tim
|
787dbaaffc
|
二维码处文字样式处理
|
9 years ago |
|
Tim
|
abbbe9b7d6
|
二级子目录样式处理
|
9 years ago |
|
cxt
|
6c184b9248
|
题库的分享请求
|
9 years ago |
|
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
|
9 years ago |
|
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
9 years ago |
|
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
|
9 years ago |
|
Linda
|
0fc142d822
|
组织配置logo样式
|
9 years ago |
|
Tim
|
714deebe21
|
二级导航调整
|
9 years ago |
|
huang
|
7fbf6f4011
|
模式二帖子列表添加分页
|
9 years ago |
|
cxt
|
ff160ff793
|
题库的申请改为绿色按钮
|
9 years ago |
|
cxt
|
d3e3e9d22b
|
补交作品的样式
|
9 years ago |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
9 years ago |
|
txz
|
de8b303b93
|
微信数据请求时显示加载中
|
9 years ago |
|
yuanke
|
5f24fb6496
|
锁的样式修改
|
9 years ago |
|
cxt
|
14a539bd0a
|
样式冲突
|
9 years ago |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
9 years ago |
|
Tim
|
56a4a64d09
|
北斗详情翻页更改；位置超出省略号
|
9 years ago |
|
Tim
|
1f87d105d0
|
添加二级目录弹窗，翻页css
|
9 years ago |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
9 years ago |
|
Tim
|
ebe6004833
|
组织二级目录添加列表
|
9 years ago |
|
Tim
|
5c795b92ee
|
图片百分百显示； 默认大图尺寸调整
|
9 years ago |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
9 years ago |
|
Tim
|
024667d035
|
title多行实现省略号效果，默认页面不对齐显示问题，高度控制，标题单行省略显示等
|
9 years ago |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
9 years ago |
|
Tim
|
5d44dc5bba
|
滚动栏js效果修改
|
9 years ago |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
9 years ago |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
Tim
|
c9cc4739aa
|
北斗组织微信块调整
|
9 years ago |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
9 years ago |
|
Tim
|
b8d6ca0229
|
北斗组织门户样式更改
|
9 years ago |
|
huang
|
17b2e82963
|
banner类型
|
9 years ago |
|
Tim
|
86751e31fb
|
题库加入私有课程题目，可申请使用
|
9 years ago |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
9 years ago |
|
Tim
|
53e6b41d93
|
北斗登录效果调整
|
9 years ago |
|
huang
|
81210fd475
|
顶部导航及样式
|
9 years ago |
|
huang
|
c1437bb75b
|
北斗界面
|
9 years ago |
|
txz
|
dcb150559e
|
angularjs路径修改
|
10 years ago |
|
yuanke
|
5c5d212193
|
博客列表
|
10 years ago |
|
huang
|
cccc2a7eb7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
10 years ago |
|
txz
|
0bab42256c
|
微信loading弹框改
|
10 years ago |
|
txz
|
39c64c9198
|
解决冲突
|
10 years ago |
|
txz
|
8e254ff722
|
微信loading弹框
|
10 years ago |
|
yuanke
|
29115bca3a
|
博客列表修改
|
10 years ago |
|
txz
|
0b82bf50c2
|
微信内容中图片正常显示
|
10 years ago |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
10 years ago |
|
txz
|
d0331da0c2
|
微信最新动态样式调整
|
10 years ago |
|
huang
|
4e4cb309a9
|
版本库目录最新动态
|
10 years ago |
|
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
10 years ago |
|
txz
|
73b89cdde5
|
微信边框，回复点赞样式更改
|
10 years ago |
|
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
10 years ago |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
10 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
10 years ago |
|
Tim
|
f479277a96
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
10 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
10 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
Tim
|
deda05b048
|
作业下拉选择
|
10 years ago |
|
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
10 years ago |
|
huang
|
04849659de
|
版本库统计
|
10 years ago |
|
txz
|
3665597153
|
详情页面排版调整
|
10 years ago |
|
txz
|
f82ad97a68
|
详情页面回复框宽度问题
|
10 years ago |
|
txz
|
0262e3b8ab
|
回复长单词显示问题
|
10 years ago |
|
txz
|
707127631e
|
微信公众号样式调整
|
10 years ago |
|
guange
|
4e50a9e289
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
guange
|
aa9cb4e579
|
merge
|
10 years ago |
|
txz
|
f3738519e9
|
长单词折行问题
|
10 years ago |
|
huang
|
3501d6f1d6
|
完成组织模块的开发
|
10 years ago |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
10 years ago |
|
huang
|
86aecd21b9
|
上传图片
|
10 years ago |
 Yiang Gan
|
4088fb9cb4
|
课程作业详情页面
|
10 years ago |
|
huang
|
8f4ff2bf91
|
列表样式问题
|
10 years ago |
|
Yiang Gan
|
392c5708f2
|
作业详情页面
|
10 years ago |
|
huang
|
5866dfb7ff
|
登录
没内容more
logo不加链接
|
10 years ago |
|
huang
|
45343a44b8
|
修改链接
|
10 years ago |
|
huang
|
f662bfa40b
|
组织科配置
|
10 years ago |
|
huang
|
c431658333
|
setting中后台编辑
|
10 years ago |
|
huang
|
0244008b32
|
一些链接和样式
|
10 years ago |
|
huang
|
7c55356ace
|
组织新界面修改
|
10 years ago |
|
huang
|
961a264e05
|
创建时间统一date
|
10 years ago |
|
huang
|
65e80b1978
|
用户图像样式
|
10 years ago |
|
huang
|
2728cccd41
|
Merge branch 'develop' into hjq_beidou
|
10 years ago |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
10 years ago |
 ouyangxuhua
|
74d8dffc14
|
发送功能样式调整
|
10 years ago |
|
huang
|
2b9ddf3594
|
组织新版
|
10 years ago |
|
huang
|
b80bc98fcb
|
组织首页
|
10 years ago |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
10 years ago |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
10 years ago |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
10 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
10 years ago |
|
cxt
|
f90b25b230
|
作业附件的用户名省略号太早
|
10 years ago |
|
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
10 years ago |
|
guange
|
6ae4cd0767
|
merge
|
10 years ago |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
54a00ca867
|
题库作业信息框的样式调整
|
10 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
10 years ago |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
10 years ago |
 alan
|
9265186307
|
修改user动态中issue行高，使之与project中的一样
|
10 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
10 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
10 years ago |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
10 years ago |
 luoquan
|
006731ea61
|
修改以下问题：
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
|
10 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
10 years ago |
|
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
10 years ago |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
10 years ago |
|
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
10 years ago |
|
luoquan
|
1e256add7f
|
媒体播放默认样式
|
10 years ago |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
10 years ago |
|
luoquan
|
7d70e63f8d
|
代码重置
|
10 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
10 years ago |
|
yuanke
|
6fa2fd8b47
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
10 years ago |
|
luoquan
|
1c6deadfd7
|
修改KE编辑的内容与发布的样式对其不一致问题
|
10 years ago |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
10 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
10 years ago |
|
yuanke
|
0805bfce6a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
10 years ago |
|
yuanke
|
e073d58169
|
KE的几个问题修改
1.我要回复
2.段落颜色
3.变粗滚动条移动
4.没默认字体
|
10 years ago |
|
cxt
|
1cccf79bd8
|
课程资源库菜单中的删除资源无法点击
|
10 years ago |
|
Tim
|
56372fbdd5
|
积分规则显示样式调整
|
10 years ago |
|
huang
|
d30e73795d
|
积分规则
|
10 years ago |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
10 years ago |
|
huang
|
596d4e17e9
|
解决样式冲突
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 years ago |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
9b573248d8
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_show_user_homework_form.html.erb
app/views/users/_show_user_homeworks.html.erb
|
10 years ago |
