 cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
10 years ago |
 Tim
|
13e289dfb5
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
|
10 years ago |
|
Tim
|
88895ff262
|
英文文本强制折行修复
|
10 years ago |
 ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
10 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
10 years ago |
|
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
10 years ago |
|
Tim
|
e9d986b311
|
课程关联项目样式调整
|
10 years ago |
 huang
|
7ee4ff69b3
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
Tim
|
06fa32f0e2
|
博客高度控制
|
10 years ago |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
10 years ago |
guange
|
d2c7d12cd9
|
merge
|
10 years ago |
|
guange
|
8ea9430318
|
at链接问题修改
|
10 years ago |
 lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
533be61cf7
|
添加底部样式
|
10 years ago |
|
Tim
|
1a24505eac
|
footer新增图片，样式修改
|
10 years ago |
|
cxt
|
b8d8cece02
|
关联项目的样式修改
|
10 years ago |
|
Tim
|
c405950469
|
课程关联项目列表显示调整
|
10 years ago |
|
lizanle
|
70f93741d6
|
issue图标问题
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
10 years ago |
|
guange
|
ed649e0724
|
@颜色修改
|
10 years ago |
|
cxt
|
dc0f004021
|
关联项目的提示信息
|
10 years ago |
|
cxt
|
53f9141cf1
|
分组作业动态
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
10 years ago |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
|
Tim
|
269d2f992e
|
组织列表搜索框调整后注释
|
10 years ago |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
10 years ago |
|
cxt
|
c50bcf9331
|
对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中”
|
10 years ago |
|
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
10 years ago |
|
Tim
|
7dd299255b
|
博客页面微调
|
10 years ago |
|
Tim
|
465c5958f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
b8999e1c6e
|
博客标题输入框宽度调整
|
10 years ago |
|
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
10 years ago |
|
lizanle
|
82c377a60a
|
在导航处上传文件不可用
|
10 years ago |
|
lizanle
|
8d94f57ec3
|
上传文件的进度条不见了。
|
10 years ago |
|
lizanle
|
157ba12513
|
资源库虚线问题
|
10 years ago |
|
cxt
|
7f63ceea76
|
作品信息确认框的附件可下载
|
10 years ago |
|
Tim
|
7418330fdd
|
作品列表样式调整
|
10 years ago |
|
cxt
|
35c60c3253
|
作品列表的作品信息样式调整
|
10 years ago |
|
cxt
|
1133b35169
|
作业tag的调整 作业截止时间精确到分
|
10 years ago |
|
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
e06f08aa3b
|
作业状态的更改
|
10 years ago |
|
lizanle
|
b84628af9d
|
regist_btn color
|
10 years ago |
|
lizanle
|
3360a25a42
|
项目 主页 资源上传 不要翻页，直接弹出资源弹出框
|
10 years ago |
|
Tim
|
1a2edd9103
|
课程大纲图标等修改
|
10 years ago |
|
Tim
|
510a1f5fdb
|
搜索按钮鼠标覆盖效果
|
10 years ago |
|
Tim
|
e58dcc851b
|
资源库搜索图标替换
|
10 years ago |
|
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
25d6ed520e
|
首页的问题动态增加附件上传时间
|
10 years ago |
|
cxt
|
2f4b29085c
|
首页动态中的表格超出边框
|
10 years ago |
|
cxt
|
efe4b8609f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
2824b56481
|
增加首页教师加入课程的入口
|
10 years ago |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
10 years ago |
|
ouyangxuhua
|
a42a58fb42
|
修改火狐浏览器出现多余省略号的问题
|
10 years ago |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
10 years ago |
|
ouyangxuhua
|
16f0868df3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
bc3fbc270f
|
将学生改成同学
|
10 years ago |
|
Tim
|
4bedc81524
|
作品列表提交按钮位置调整
|
10 years ago |
|
Tim
|
83b984a909
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
b063be917b
|
附件图标更改；弹窗文字上padding减小
|
10 years ago |
|
ouyangxuhua
|
4a188dc81d
|
对所有作业消息，统一在内容前加圆点，并且调整颜色
|
10 years ago |
|
ouyangxuhua
|
9375227250
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
7845a0e712
|
修改作业消息的内容及样式
|
10 years ago |
|
cxt
|
e2990fb55c
|
控制动态描述的高度为20行，可展开和收起。
|
10 years ago |
|
cxt
|
26eda763fe
|
帖子锁定时动态的样式调整
|
10 years ago |
|
Tim
|
4dddbe9dc7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_journalsformessage.html.erb
|
10 years ago |
|
Tim
|
49b994b3fe
|
个人动态、系统消息动态、课程动态格式调整
|
10 years ago |
|
cxt
|
0a43f462f5
|
帖子动态添加置顶显示
|
10 years ago |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
10 years ago |
|
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
10 years ago |
|
Tim
|
752494e35e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
d33a6b763d
|
引用资源库弹窗外观调整
|
10 years ago |
|
ouyangxuhua
|
155dff7e27
|
1.增加消息列表对应的图标；
|
10 years ago |
|
Tim
|
0d85fb3c5f
|
导航栏链接在变色范围内都可点击
|
10 years ago |
|
Tim
|
9e91429b1e
|
鼠标在侧导航左侧文字颜色不变修复
|
10 years ago |
|
Tim
|
99e19c51f9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
48bd70b9f6
|
个人动态编辑图片显示
|
10 years ago |
|
lizanle
|
357a5d4139
|
添加点赞人数
|
10 years ago |
|
Tim
|
fb5eae3ae2
|
搜索框图标漂移效果清除
|
10 years ago |
|
Tim
|
0ff58b7631
|
修复了贴吧图片漂移的问题
|
10 years ago |
|
Tim
|
f5ff94d888
|
资源库固定宽度、作品描述margin、搜索框文字居中
|
10 years ago |
|
huang
|
326c05d0eb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
fd020b56f7
|
细调红点样式
|
10 years ago |
|
Tim
|
ff18381f64
|
引用资源库弹框调整
|
10 years ago |
|
Tim
|
78d11b57b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
42d4a5628d
|
引用资源库的icon修改
|
10 years ago |
|
huang
|
edf6f8e1f0
|
消息提示，显示新消息数目
|
10 years ago |
|
lizanle
|
4386f3fddf
|
样式问题
|
10 years ago |
|
Tim
|
1613f41e77
|
点赞判断
|
10 years ago |
|
Tim
|
971ff1e692
|
贴吧点赞位置调整
|
10 years ago |
|
Tim
|
21408f3843
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
cc99120f25
|
贴吧样式更改
|
10 years ago |
|
lizanle
|
de62798d4d
|
点赞按钮位置调整
|
10 years ago |
|
lizanle
|
4f63f3fd2a
|
导航
|
10 years ago |
 sw
|
22b9c6a866
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
lizanle
|
5002daad52
|
帖子内容显示不对
|
10 years ago |
|
sw
|
6194be8933
|
界面样式调整。js修改
在课程内发布作业时无课程id
|
10 years ago |
|
ouyangxuhua
|
29b4e174fd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f73865b771
|
1.修改作业消息的样式；
2.解决系统消息时间显示问题。
|
10 years ago |
|
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
10 years ago |
|
ouyangxuhua
|
0b932267c7
|
调整截止日期快到了的宽度
|
10 years ago |
|
ouyangxuhua
|
1935a9caaa
|
调整消息页面的宽度
|
10 years ago |
|
ouyangxuhua
|
4d1bc90161
|
匿名用户重新评阅作品，在消息显示中，需要正常显示
|
10 years ago |
|
Tim
|
c675a4c227
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
e8a7448a7c
|
资源库用户资源图标位置调整
|
10 years ago |
|
Tim
|
7e3ae446f5
|
资源库头像替换
|
10 years ago |
|
cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
10 years ago |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
10 years ago |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
10 years ago |
|
lizanle
|
38a24e8fe4
|
论坛消息回复改版
|
10 years ago |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
|
sw
|
f9f51557dd
|
增加关闭反馈功能
|
10 years ago |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
10 years ago |
|
lizanle
|
c8d07dedf6
|
帖子添加编辑 删除 链接
|
10 years ago |
|
lizanle
|
6ac5b738e3
|
论坛编辑功能
|
10 years ago |
|
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
10 years ago |
|
lizanle
|
eed530db2b
|
添加 上传附件的 文字
|
10 years ago |
|
ouyangxuhua
|
841c680bb1
|
1.作业消息增加显示老师、课程、课程季度等信息
2.作业内容为空时，tips中不显示内容
|
10 years ago |
|
sw
|
9d474d6528
|
设置匿评属性静态页面
|
10 years ago |
|
cxt
|
76afbdec3f
|
隐藏kindeditor的“插入代码”，调整项目编号/符号的样式
|
10 years ago |
|
lizanle
|
361b391d3c
|
修改分页的样式
|
10 years ago |
|
Tim
|
93804bcfa6
|
关于我们图片对齐
|
10 years ago |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
10 years ago |
|
cxt
|
8883093b96
|
"关于我们"的图片居中
|
10 years ago |
|
cxt
|
facd12640a
|
个人动态的回复为0时不显示“回复(0)”
|
10 years ago |
|
cxt
|
b9bac42c1a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
098be99b84
|
动态回复框的样式调整
|
10 years ago |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
9443c139f0
|
update forum
|
10 years ago |
|
huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
c8f7655d1e
|
系统消息样式
|
10 years ago |
|
cxt
|
cacb3e043a
|
动态回复框的焦点前焦点后样式调整
|
10 years ago |
|
sw
|
607c31c8c5
|
编辑图片按钮图片不正确
|
10 years ago |
|
ouyangxuhua
|
2db6b8311d
|
1.修改tips宽度；
2.修改图片的max-width
|
10 years ago |
|
sw
|
cf2a00d7a8
|
作业列表增加：编程语言提示，匿评阶段提示
|
10 years ago |
|
ouyangxuhua
|
d807180bf2
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
c024bb5e58
|
1.修改系统消息样式，放在application.css中；
2.修改消息提示样式
|
10 years ago |
