whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整
|
10 years ago |
 sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
10 years ago |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
10 years ago |
 alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
 huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
10 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
10 years ago |
|
sw
|
8c122a35f7
|
项目类型切换到其他类型后，再切回开发组，更多按钮不可用
|
10 years ago |
|
huang
|
48f096178c
|
修改配置modoule模块
|
10 years ago |
|
huang
|
2b063db0cc
|
修改版本界面
未完成部分，隔行换色
|
10 years ago |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
10 years ago |
|
sw
|
01f56a761f
|
完成配置---模块
|
10 years ago |
|
sw
|
7ad3c2d578
|
修改项目配置js
增加项目配置相关子界面
|
10 years ago |
|
sw
|
837fe88545
|
还原冲突，增加项目配置切换js
|
10 years ago |
|
whimlex
|
7e46885f3d
|
修改上传附件数目限制
|
10 years ago |
|
whimlex
|
5936d8d8e9
|
评论显示
|
10 years ago |
|
whimlex
|
874dcc2b89
|
附件上传国际化调整
|
10 years ago |
|
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
10 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
10 years ago |
|
huang
|
45fa01c773
|
修改缺陷不能显示的bug
|
10 years ago |
guange
|
0325554d24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
10 years ago |
|
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
10 years ago |
|
sw
|
dae907d0b8
|
1、课程通知无法添加评论
2、课程通知界面显示
3、课程通知评论取消按钮
|
10 years ago |
|
sw
|
663c9aad60
|
1、课程通知列表出现html代码
2、整理课程通知部分js
3、还原编辑器js代码
|
10 years ago |
|
guange
|
89af4b451b
|
#2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了
|
10 years ago |
|
sw
|
ba4894239c
|
1、部分浏览器下新建课程页面密码默认填写，课时默认填写为登录名
2、修改课程密码显示取消明码显示
|
10 years ago |
|
sw
|
3bedddd190
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
10 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
10 years ago |
|
whimlex
|
7b09fd0489
|
作业的时间选择器选择时间后不能自动关闭
|
10 years ago |
|
sw
|
b971147aa8
|
1、添加通知会alert
2、添加通知描述样式
3、通知添加评论样式
|
10 years ago |
 lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 years ago |
|
sw
|
046536230c
|
增加课程配置界面、成员的基本信息以及相关js
|
10 years ago |
|
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
10 years ago |
|
sw
|
7b70369438
|
上传文件样式调整
|
10 years ago |
 z9hang
|
41e372c16a
|
上传资源按钮样式调整
|
10 years ago |
|
sw
|
2ca2f90830
|
上传文件js问题
|
10 years ago |
|
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
10 years ago |
|
sw
|
c68349803e
|
1、课程讨论区、通知提示信息样式
2、整理js
|
10 years ago |
|
sw
|
519c119543
|
修改上传文件样式
|
10 years ago |
|
sw
|
9a2f572cf4
|
是否启用匿评功能异常
|
10 years ago |
|
sw
|
cb1fce32fe
|
配置课程
|
10 years ago |
|
sw
|
8f90fed8be
|
新建课程界面完成
|
10 years ago |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
10 years ago |
|
sw
|
ab3a3a8573
|
学生收索功能
|
10 years ago |
|
whimlex
|
05d17361e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
10 years ago |
|
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充；部分国际化
|
10 years ago |
|
sw
|
7b379456ed
|
课程作业描述很长时才显示更多按钮
|
10 years ago |
|
sw
|
6c5cf50bf0
|
去掉弹框js
|
10 years ago |
|
sw
|
27e7bc21b5
|
当课程简介内容很少时（点击显示更多没有反应），取消显示更多按钮的显示
|
10 years ago |
|
guange
|
4b636d8be6
|
#1801 打包上传分个数下载完成
|
10 years ago |
|
guange
|
bdf419438e
|
merge
|
10 years ago |
|
z9hang
|
8190d0cecc
|
修改留言页面样式
|
10 years ago |
|
z9hang
|
be46142b3c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
|
10 years ago |
|
z9hang
|
19eaa012b7
|
讨论区样式调整
|
10 years ago |
|
sw
|
2ef10e89ac
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
273e82f620
|
修改poll的show界面的样式
|
10 years ago |
|
sw
|
7970bd6df0
|
1、增加作业截至时间的js显示
2、截止时间到了之后的显示
|
10 years ago |
|
z9hang
|
a2ec9c661a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
f3fefe50f1
|
1、增加flash显示样式
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
|
10 years ago |
|
guange
|
1126d9b9a9
|
#2082 IE8浏览器--任意模块上传附件：上传附件后，“未上传文件”字样并未随着附件的上传变成“已上传X个文件”
|
10 years ago |
|
z9hang
|
cb278e65a2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
public/stylesheets/courses.css
|
10 years ago |
|
z9hang
|
d44bbe9de1
|
课程通知界面新建通知修改
|
10 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
10 years ago |
|
z9hang
|
bcfdac37a7
|
课程资源中的图片点击下载有弹框改为预览图片
|
10 years ago |
|
z9hang
|
27a4e462de
|
jpeg图片预览
|
10 years ago |
|
whimlex
|
d73d842e31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
34579e395f
|
附件上传bug修改；意见反馈收拉一致
|
10 years ago |
|
z9hang
|
1cd2984c05
|
#2066 网站中的图片附件链接，能否点击后直接在浏览器中显示，而不是下载？
|
10 years ago |
|
whimlex
|
5924cd6432
|
commit
|
10 years ago |
|
sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
10 years ago |
|
whimlex
|
3837e1fcf5
|
申请加入：附件上传
|
10 years ago |
|
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
10 years ago |
|
sw
|
b9ed34f86e
|
1、右边内容区域、增加js：最短为左侧长度
2、修改课程首页动态显示
3、修改course.css文件
|
10 years ago |
|
sw
|
64b0646281
|
base_course基本完成
|
10 years ago |
|
sw
|
16872597b6
|
实现课程搜索
|
10 years ago |
|
z9hang
|
943258aebe
|
#2025 项目--资源库：上传资源时，分类资源为“课件”或“研究报告”，成功上传后，都是源代码
|
10 years ago |
|
sw
|
d2c7861706
|
1、添加缺少图片
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
|
10 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
10 years ago |
|
guange
|
38c3b40ca1
|
#1701 修复在编辑作业时，删附件会导致名称编辑内容丢失
|
10 years ago |
|
guange
|
31351bc9e8
|
#1095 在issue主题下，输1个字符可以进行搜索，500错误解决
|
10 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
10 years ago |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
11 years ago |
|
lizanle
|
4461a66c7a
|
添加刷新函数
|
11 years ago |
|
lizanle
|
c82722c220
|
日期选择js
|
11 years ago |
|
sw
|
a1f21f3ebb
|
1、修改一次添加一个题目
2、新增题目时，新建题目获取焦点
3、新增题目后页面事件改变
|
11 years ago |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
ace5b514c6
|
修改bug<测试版--注册登录：成功激活注册的用户后，登录返回资料修改的页面，姓氏、名字还是标识为必填项>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6363208781
|
修改base_user
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
526e9bc923
|
修改《IE登录不了》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
90e4387395
|
修复登录
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
949867c50b
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
12de248e87
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
|
z9hang
|
e297bb2687
|
修改匿评
|
11 years ago |
|
z9hang
|
cd1be67b8c
|
学生可多次评分、评分完毕不在提示评分成功
|
11 years ago |
|
z9hang
|
cc71682e40
|
评分前添加无法修改提示
|
11 years ago |
|
alan
|
591fc409b3
|
修改bug<forge网站的项目缺陷的关联问题机制有问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
e2897b3d1a
|
修改匿评弹出框样式
|
11 years ago |
 gonglexin
|
4f3b1a670d
|
去掉 titlebar 的颜色
|
11 years ago |
|
z9hang
|
0723643ca6
|
#1410新建贴吧：输入贴吧描述为非汉字类型，编辑框不会自动换行
|
11 years ago |
|
alan
|
66aa72d210
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
3d860af48b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/contest.html.erb
app/views/welcome/index.html.erb
public/javascripts/attachments.js
|
11 years ago |
|
z9hang
|
269e1cf497
|
1、空数据库情况下3个主页布局修改。2、上传附件成功提交后公开自动变成私有的bug
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
gonglexin
|
6e0c916246
|
#1026 上传出现网络问题时给出提示
|
11 years ago |
|
sw
|
1361801723
|
上传文件描述最长限定254个字符
|
11 years ago |
linhk
|
879e93beb9
|
项目、竞赛、课程首页的微信部分样式修改并添加js跟随滚动处理
|
11 years ago |
|
z9hang
|
38c5c86a39
|
日期选择器不能用问题
|
11 years ago |
 nwb
|
095cb7fc32
|
加强对chrome浏览器文件上传的支持
|
11 years ago |
|
z9hang
|
6a45a0287d
|
添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）
|
11 years ago |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
11 years ago |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
|
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
11 years ago |
 yanxd
|
2ff24841fd
|
optimization image check.
|
11 years ago |
|
yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
11 years ago |
|
yanxd
|
654cb404e2
|
bootstrap test
|
11 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
11 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
11 years ago |
|
yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
yanxd
|
112b8de921
|
issues#575
|
11 years ago |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
11 years ago |
ganyiang
|
27ade53af3
|
针对OSP社区的新需求的界面展示：
1.开源项目社区(OSP)index界面增加[软件安全漏洞]展示
2.osp项目主页增加[项目安全态势]、[技术创新趋势] 展示
ps.此次为不负责任的提交~
|
11 years ago |
|
ganyiang
|
5e780e6872
|
修复新建问题中autocomplete在Firefox下的不正常
|
11 years ago |
|
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
11 years ago |
 wanglinchun
|
0634f36c10
|
"打分后不要显示英文，而且还要提示：您可以重新打分"问题解决
|
11 years ago |
yanxd
|
939e4cc100
|
footer 下方距离
welcome调整下主页
|
11 years ago |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
11 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
11 years ago |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
 kg
|
d450da9df8
|
footer , footer of base_course,upload files count and delete all upload
|
11 years ago |
|
yanxd
|
2a62bc822a
|
修改ajax提交过程中，等待indicator被覆盖的问题
|
11 years ago |
|
yanxd
|
3fad5abb5c
|
modal init
|
11 years ago |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
11 years ago |
|
yanxd
|
32510028aa
|
论坛留言里发帖的分界
|
12 years ago |
|
yanxd
|
8a1316cf8f
|
删除留言操作
|
12 years ago |
|
yanxd
|
7130347f39
|
回复框 设置姓名 七八糟
|
12 years ago |
|
yanxd
|
60be338848
|
作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
|
12 years ago |
|
yanxd
|
5e9bb9a99f
|
删除提示框作业，作业提交的问题。附件提交之后还会存在。
|
12 years ago |
|
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
12 years ago |
 william
|
2079c87362
|
增加tag删除。
|
12 years ago |
 baiyu
|
d92755f805
|
修改需求列表
|
12 years ago |
 wanglinchun
|
9bb6f648e5
|
修改头像、logo上传进度条显示
|
12 years ago |
 huangjingquan
|
70b211e355
|
first commit
|
12 years ago |
