 ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
 cxt
|
e5f8c4c4a8
|
测试结果的对齐显示
|
10 years ago |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
10 years ago |
|
cxt
|
a93539da5e
|
课程学期往前推一个学期
|
10 years ago |
 huang
|
5d68d185d5
|
资源样式冲突
|
10 years ago |
|
cxt
|
a206a1d7f1
|
样式
|
10 years ago |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
huang
|
0ab500986a
|
发送搜索功能
|
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 |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
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 |
|
huang
|
2efcb5b89a
|
课程讨论区添加展开、收缩
|
10 years ago |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
10 years ago |
|
huang
|
680e861620
|
项目资源搜索功能
|
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 |
 Tim
|
077368f597
|
匿评增加系统评分显示，对应样式调整
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
ouyangxuhua
|
5334a3d40f
|
链接样式还原
|
10 years ago |
|
ouyangxuhua
|
33ea55ecca
|
项目/课程帖子发送弹窗样式修改
|
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 |
|
lizanle
|
3b08adfc68
|
课程资源页面修改。
|
10 years ago |
|
huang
|
533be61cf7
|
添加底部样式
|
10 years ago |
|
Tim
|
1a24505eac
|
footer新增图片，样式修改
|
10 years ago |
|
huang
|
a92d33300b
|
里程碑 添加 “已解决”，区分已解决和已关闭
|
10 years ago |
|
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
10 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
lizanle
|
2aa241bffa
|
issue
|
10 years ago |
|
lizanle
|
02a9f08fe6
|
表单长度对齐
|
10 years ago |
|
lizanle
|
68aceaa7df
|
issue下载
|
10 years ago |
|
guange
|
4ce9eb428e
|
at样式问题
|
10 years ago |
|
Tim
|
75d79c6c47
|
问题跟踪样式调整
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
10 years ago |
|
huang
|
edf9b4a6b5
|
修改样式
|
10 years ago |
|
huang
|
4d5d012ecf
|
版本库相关界面调整
|
10 years ago |
|
huang
|
8ec2dc3196
|
多版本库情况：
1、没有新增项目提供接口
2、新建页面历史版本库列表
|
10 years ago |
|
cxt
|
958d781997
|
作品列表的样式修改
|
10 years ago |
|
Tim
|
1a2edd9103
|
课程大纲图标等修改
|
10 years ago |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
25d6ed520e
|
首页的问题动态增加附件上传时间
|
10 years ago |
|
cxt
|
2f4b29085c
|
首页动态中的表格超出边框
|
10 years ago |
|
huang
|
2221fb4d7a
|
committers跳转问题
按钮样式
|
10 years ago |
|
Tim
|
4bedc81524
|
作品列表提交按钮位置调整
|
10 years ago |
|
cxt
|
e2990fb55c
|
控制动态描述的高度为20行，可展开和收起。
|
10 years ago |
|
huang
|
4c5843a169
|
1、title数据更新
2、summary调整
3、本版库显示，变更页面
4、相关CSS
|
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
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
10 years ago |
|
Tim
|
d33a6b763d
|
引用资源库弹窗外观调整
|
10 years ago |
|
Tim
|
9e91429b1e
|
鼠标在侧导航左侧文字颜色不变修复
|
10 years ago |
|
huang
|
ddac70c9b8
|
项目成员角色Gitlab一致，单选
添加成员按钮样式调整
|
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
|
548a18d1fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
edf6f8e1f0
|
消息提示，显示新消息数目
|
10 years ago |
 sw
|
9edfa49bcb
|
项目内上传图片按钮
|
10 years ago |
|
sw
|
6194be8933
|
界面样式调整。js修改
在课程内发布作业时无课程id
|
10 years ago |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
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 |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
|
sw
|
f9f51557dd
|
增加关闭反馈功能
|
10 years ago |
|
huang
|
6449b2563b
|
1、去掉项目隐藏代码库的功能
2、同步圈子的描述
3、圈子JS实现
|
10 years ago |
|
cxt
|
76afbdec3f
|
隐藏kindeditor的“插入代码”，调整项目编号/符号的样式
|
10 years ago |
|
sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
10 years ago |
|
sw
|
2d48161928
|
新版作品列表界面
|
10 years ago |
|
cxt
|
8883093b96
|
"关于我们"的图片居中
|
10 years ago |
|
cxt
|
facd12640a
|
个人动态的回复为0时不显示“回复(0)”
|
10 years ago |
|
huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
10 years ago |
|
sw
|
281e97e468
|
课程内老师可以对作业进行编辑、删除、开启匿评
|
10 years ago |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
10 years ago |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
10 years ago |
|
sw
|
fa00285529
|
css文件更新
|
10 years ago |
|
cxt
|
b3c73811fc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
f1a6e3d7e3
|
“关于我们”的样式调整
|
10 years ago |
|
huang
|
0d595c5feb
|
修改系统消息提交按钮
|
10 years ago |
|
cxt
|
6ed0a151dc
|
头像下拉框的样式修改
|
10 years ago |
|
cxt
|
8fec99114a
|
"关于我们"的样式调整
|
10 years ago |
|
ouyangxuhua
|
a159af8139
|
项目--邀请--发送邮件邀请用户对输入的邮箱进行判断，同时修改提示样式
|
10 years ago |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
10 years ago |
suntao
|
efe5c1e3f4
|
课程宽度调整
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
huang
|
7ff93753c6
|
css
|
10 years ago |
|
huang
|
15b3d527dc
|
footer
|
10 years ago |
|
sw
|
d5cf0c65a7
|
验证正确和错误之后，可以继续点击进行验证
|
10 years ago |
|
sw
|
f163cdac51
|
老师点击测试自动刷新，每组测试对标准代码的返回结果存储
|
10 years ago |
