 lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
11 years ago |
zhuhao
|
965703a80e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
.rspec
|
11 years ago |
 sw
|
35eab3eb27
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
89ee38481b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
 z9hang
|
3911450787
|
问卷调查简答题输入字符过多显示超边框问题
|
11 years ago |
|
z9hang
|
5a7463e28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
f74f2e3be7
|
exec按钮样式调整
|
11 years ago |
|
sw
|
2b5928602e
|
1.修改由于意见悬浮框引起的界面的padding不正确的问题
2.修改问卷调查左侧会出现滚动条的问题
|
11 years ago |
whimlex
|
3fcb2f14a5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/mailer/issue_edit.html.erb
|
11 years ago |
|
sw
|
a0e6b9c2fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
 huang
|
388ddac96b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
84bfd30fc5
|
修改问题反馈弹框！
|
11 years ago |
|
sw
|
e72ed1054e
|
修改问卷调查按钮的样式
|
11 years ago |
|
lizanle
|
4461a66c7a
|
添加刷新函数
|
11 years ago |
|
lizanle
|
c82722c220
|
日期选择js
|
11 years ago |
|
lizanle
|
f69ed3d511
|
添加Kaminari分页样式和搜索结果样式
|
11 years ago |
|
sw
|
d68486669e
|
#1830课程--标签字体压线
|
11 years ago |
|
sw
|
7ee17b6d7c
|
调整问卷界面左边边距
|
11 years ago |
|
sw
|
2f8a183168
|
1、替换图标图片
2、已答问卷后问卷增加已答标志显示
|
11 years ago |
|
sw
|
3bdaeb20c2
|
1、修改问卷列表页面样式
2、问卷列表增加发布问卷功能
3、增加js返回方式
4、去掉无用的js函数
|
11 years ago |
|
zhuhao
|
70a9a5e552
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
zhuhao
|
a145f04c27
|
在gemfile中添加rspec
|
11 years ago |
|
sw
|
77cb2b0893
|
1.修改学生已完成的问卷标题过长时显示异常
2.增加取消发布时的提示
|
11 years ago |
|
z9hang
|
493b7ca695
|
#1821 课程--作业：导出excel相关问题 调整样式
|
11 years ago |
|
lizanle
|
9dec76de26
|
搜索结果样式
|
11 years ago |
|
huang
|
98b44d4903
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
huang
|
e8cca08f40
|
多选查询去重，修改样式
|
11 years ago |
|
sw
|
233070b277
|
修改火狐浏览器中显示异常
|
11 years ago |
|
huang
|
e5da3c47ed
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
huang
|
6bba6b2b76
|
weiwan
|
11 years ago |
|
sw
|
c43c6a8c3f
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
8e017425cf
|
增加弹出框的样式
|
11 years ago |
|
sw
|
629c4aaaa1
|
1、#1814 未发布的问卷显示在学生的问卷总数中
2、修复问卷标题过长，问卷列表显示异常
3、已发布的问卷可以删除
|
11 years ago |
|
huang
|
7c100342f4
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
huang
|
6e698d45bb
|
修改了html边界超出问题
|
11 years ago |
|
sw
|
ad7014f8b6
|
#1809新建/编辑问题内容或选项长度足够长且为非汉字类型，显示超出边框
|
11 years ago |
|
z9hang
|
33fd43e7b6
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
z9hang
|
092dd61c86
|
修改修改资料处样式问题
|
11 years ago |
|
huang
|
0f5c3c5f4c
|
添加主观题统计页面及样式
|
11 years ago |
|
z9hang
|
dc2c96f59a
|
提交后的问卷禁止查看与编辑
|
11 years ago |
|
sw
|
a1f21f3ebb
|
1、修改一次添加一个题目
2、新增题目时，新建题目获取焦点
3、新增题目后页面事件改变
|
11 years ago |
|
sw
|
e4edc5d1db
|
1.增加修改页面动态加载
2.增加编辑完成后问卷头页面
3.增加问卷按钮的css样式
|
11 years ago |
|
sw
|
ac7c0081d5
|
修改选择题标题input过宽
|
11 years ago |
|
sw
|
0a9509a921
|
新增问卷界面调整
|
11 years ago |
|
sw
|
e59e9cd661
|
增加新增问卷页面
|
11 years ago |
|
sw
|
8503f0c803
|
根据最新设计页面，修改页面显示样式，调整css代码
|
11 years ago |
|
sw
|
fc72d6f9a9
|
1.增加问卷统计、问卷答卷等页面跳转，并增加对应路由
2.调整页面样式
3.动态分页
|
11 years ago |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
|
sw
|
d8e6b4a92f
|
学生取消新建问卷按钮显示
修改问卷总数显示不正确
|
11 years ago |
|
sw
|
a18fa10de5
|
1.增加老师和学生显示界面的区别
2.增加分页的动态显示，以及分页相关css修改
|
11 years ago |
|
sw
|
6f19dd6c5c
|
修改css中的错误语法
|
11 years ago |
|
sw
|
245f1a165c
|
更新css文件
|
11 years ago |
|
sw
|
f54cf53663
|
1.问卷列表页面动态显示，
2.问卷调查页面引起base_course的样式显示不正确
|
11 years ago |
|
sw
|
8080ca8064
|
增加文件界面的css
|
11 years ago |
|
zhuhao
|
2b59f2fc44
|
修改上传资源弹窗按钮样式
|
11 years ago |
 alan
|
a31088cc1b
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
293b3a3b42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
f7c1b76b3d
|
用户反馈弹框模块！
|
11 years ago |
|
alan
|
fb6c297a37
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
575b641e25
|
merge dev_chuangbin
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
zhuhao
|
9f1f7d8187
|
调整上传资源的按钮样式
|
11 years ago |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
11 years ago |
|
alan
|
53b57d4c53
|
修改《个人主页积分弹框显示错误》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2262997c31
|
修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题，例如个人主页左侧的信息，具体如图所示》
《本地版中关于学生列表的分组出现的问题：当前已存在A组，再次添加A组应给出提示“A组已存在”，该功能目前只有在学生列表首次加载时才正常》
《托管，课程，竞赛主页中任意点击某一项目，进入该项目主页，右上角的搜索按钮风格和大小不统一。》
《进入某竞赛主页，点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alanlong9278
|
7443cadf61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alanlong9278
|
9e2bff7778
|
托管平台中创建某项目后进入该项目主页，点击tab的配置---信息，form表单没对齐
|
11 years ago |
|
zhuhao
|
8b6902f860
|
修改“添加标签”按钮压线，样式调整
|
11 years ago |
|
lizanle
|
10cde37582
|
cache using version
|
11 years ago |
hhuai
|
d1846e6303
|
for update
|
11 years ago |
|
z9hang
|
35dce16924
|
课程成员列表excel导出
|
11 years ago |
|
=
|
098b8094b1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
=
|
305cbae008
|
维护浮动框
|
11 years ago |
|
z9hang
|
899ac6f654
|
添加作品列表导出excel功能
|
11 years ago |
|
sw
|
f35bafa8cd
|
#1414 forge主页左右未对齐，普通用户登录时，有两行的空行
|
11 years ago |
|
zhuhao
|
8bd42054d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
61a859f91a
|
托管平台项目主业搜索按钮样式调整
|
11 years ago |
|
alan
|
629641d065
|
《调整学生列表页面》和《优化个人主页查询》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2084a17191
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
6c09228139
|
根据凌彬设计修改学生列表样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9han
|
b143093e49
|
1、#1707 课程--资源库：全站搜索得到当前作业模块的资源，应显示为“选入我的课程”.2、公开私有字样未居中问题
|
11 years ago |
|
z9han
|
36c65d2fe3
|
#1694课程：点击“课程动态”或“课程作业”，左侧的课程名靠左显示，点击“资源库”，课程名居中显示。 原因：受资源模块新样式影响，解决：将课程资源模块的样式限定在资源模块div中
|
11 years ago |
|
sw
|
c4b5ce5004
|
#1717 修复QQ浏览器中资源搜索页被拉长，纵向布局显示
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c33c578bb
|
增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
b5d007ccf7
|
增加《点击分组名，该分组名底色发生改变》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fbe6ce16d7
|
修改《分组界面》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
cfb8edbfe2
|
分组功能样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
11 years ago |
|
alan
|
615bc7d444
|
增加课程分组的功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
277e5ecad3
|
1.老师评价、学生匿评、学生留言不同情况下页面刷新
2.修改老师评价、学生匿评、学生留言是载入中在弹出窗后面显示
3.修改老师未批列表
4.取消关闭作业详细信息列表时界面刷新，改为评论时刷新页面
5.修改作业显示界面缺失参数报错
|
11 years ago |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
38a912672a
|
手写评分相关js
|
11 years ago |
|
sw
|
743bfd551a
|
学生提交作业列表增加提交时间的显示
|
11 years ago |
|
sw
|
d073cca712
|
修改作业列表相关界面样式
|
11 years ago |
|
sw
|
c2ac26ed61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
1fee210924
|
1.修改新建、修改作业提交、取消按钮样式
2.修改作业时关联项目会自动清空
|
11 years ago |
|
alan
|
3eddca8c6e
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
1fb4b81051
|
修改bug<IE老版本tag显示异常>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
be31444b43
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/tags/_tag.html.erb
|
11 years ago |
|
sw
|
918cf6c134
|
修改竞赛标签添加时按钮样式
|
11 years ago |
|
alan
|
760083ad20
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
ace5b514c6
|
修改bug<测试版--注册登录：成功激活注册的用户后，登录返回资料修改的页面，姓氏、名字还是标识为必填项>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
3e3d103828
|
1.增加开启匿评之后学生能提交作业
2.修改学生作业编辑和删除样式
|
11 years ago |
|
sw
|
198e2f24ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
f5306c503a
|
修改留言界面留言、清除留言按钮显示样式不正确
|
11 years ago |
|
alan
|
c4e64f29da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
6363208781
|
修改base_user
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
zhuhao
|
da9773e139
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
6b98c2995a
|
添加标签按钮样式调整
|
11 years ago |
|
alan
|
526e9bc923
|
修改《IE登录不了》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
zhuhao
|
4a2b5f5e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
b222b7a8ed
|
资源库讨论区发帖按钮样式调整
|
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 |
|
sw
|
13bf91f954
|
1.修改课程作业列表中、启动、关闭匿评、提交作业、编辑等按钮不见的问题
2.修改匿评、提交评论的样式
|
11 years ago |
|
sw
|
d788e46546
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
436cf1175f
|
修改课程资源模块相关问题
|
11 years ago |
|
sw
|
9908a7f41f
|
修改作业左侧启动匿评按钮样式
|
11 years ago |
|
sw
|
dacad26010
|
作品名称改为作品描述
对齐作品名称和作品描述
增加作品描述不能为空的判断
|
11 years ago |
|
z9hang
|
c5a9defb3f
|
调整课程资源样式
|
11 years ago |
|
sw
|
db87f8f5db
|
修复点击项目工具集栏时项目tab栏下的横线没了的BUG
|
11 years ago |
|
sw
|
06f1ff026a
|
修改项目--项目工具集logo显示问题
|
11 years ago |
|
sw
|
2c28ed0fa1
|
调整作业详细信息留言的样式
|
11 years ago |
|
sw
|
a1b4b2ddae
|
修改作业列表显示样式
|
11 years ago |
|
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
11 years ago |
|
alan
|
f90927313d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
cb7cd581f6
|
修改bug<admin删除用户出错>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
zhuhao
|
de5aa252e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
4ae74b5608
|
按钮样式调整
|
11 years ago |
|
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
cc32bee0f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
0b5ee5dc4b
|
按钮样式修改（发布课程通知页，新建缺陷页）
|
11 years ago |
|
sw
|
eb15db64ee
|
美化项目工具栏样式显示
修复当缺陷列表为空时缺陷列表样式显示异常
|
11 years ago |
|
z9hang
|
63b91e2cfb
|
资源上传
|
11 years ago |
|
alan
|
972b788687
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
public/stylesheets/application.css
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
b2ce8c78bd
|
<修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
82233a4b54
|
修复老师开启匿评、学生匿评提示以及进入学生作业详细信息界面时界面会自动拉下去的BUG
|
11 years ago |
|
z9hang
|
0821320dfe
|
tag删除功能完成，翻页样式修改
|
11 years ago |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
11 years ago |
|
zhuhao
|
c1361e37b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
126c7f558d
|
修改用户信息处控件对齐，新建课程通知提交取消按钮样式统一
|
11 years ago |
|
sw
|
3aaf2247dc
|
修改作业右侧悬浮框css、js
|
11 years ago |
moon
|
34d7208deb
|
课程联系界面
|
11 years ago |
|
sw
|
63a141a75a
|
1.修改右上侧课程作业快捷栏显示js、css
|
11 years ago |
|
sw
|
512f16a036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
61c8feac8f
|
课程后增加课程作业的快捷栏
|
11 years ago |
|
zhuhao
|
532e2676a3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
29343b8ba7
|
修改了显示样式
|
11 years ago |
|
alan
|
8d3f7bd0bf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
879433a9b8
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
