 sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
11 years ago |
 z9hang
|
2c5c261b70
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
e1afdab988
|
留言样式修改
|
11 years ago |
|
sw
|
0d04eb745f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
cb1fce32fe
|
配置课程
|
11 years ago |
 lizanle
|
d1bc2b85d0
|
kindeditor。
|
11 years ago |
|
sw
|
8f90fed8be
|
新建课程界面完成
|
11 years ago |
|
z9hang
|
57dad3f3c7
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
8ef9779b46
|
修正课程讨论区样式。修正项目讨论区被影响的样式
|
11 years ago |
|
lizanle
|
72eff3a032
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
 huang
|
26ed40f7e1
|
学生作业列表样式调整
|
11 years ago |
|
sw
|
090190f3e6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
c8a08d5a56
|
1、切换分班功能
2、非老师用户不能编辑、删除分班
|
11 years ago |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
11 years ago |
|
z9hang
|
94fd3060ae
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
132287d6e1
|
课程通知界面完善
|
11 years ago |
|
huang
|
dac4ffe66e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
eac6f814a8
|
解决浏览器提示关闭按钮与邮件邀请界面冲突
|
11 years ago |
|
sw
|
ab3a3a8573
|
学生收索功能
|
11 years ago |
|
z9hang
|
30cb622abd
|
评论显示页面修改
|
11 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
|
11 years ago |
|
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充；部分国际化
|
11 years ago |
|
sw
|
e465d66689
|
上传资源样式没了。。
|
11 years ago |
|
sw
|
746a7902c5
|
更新css文件
|
11 years ago |
|
sw
|
07623a1e02
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
7b379456ed
|
课程作业描述很长时才显示更多按钮
|
11 years ago |
|
z9hang
|
09991b9cf7
|
课程资源模块弹框样式调整
|
11 years ago |
|
sw
|
6c5cf50bf0
|
去掉弹框js
|
11 years ago |
|
sw
|
27e7bc21b5
|
当课程简介内容很少时（点击显示更多没有反应），取消显示更多按钮的显示
|
11 years ago |
guange
|
4b636d8be6
|
#1801 打包上传分个数下载完成
|
11 years ago |
|
sw
|
36d168f773
|
调整提交问卷时弹出框样式
|
11 years ago |
|
guange
|
bdf419438e
|
merge
|
11 years ago |
|
sw
|
61d7d65b55
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/courses/_courses_jours.html.erb
|
11 years ago |
|
sw
|
bcf9d5919c
|
1、处理部分a标签调用js函数时会刷新页面的BUG
2、修改弹出框样式，制作弹出框demo
|
11 years ago |
|
huang
|
525a6394ca
|
1、公共贴吧邮件提醒
2、浏览器版本过低提醒（样式需要再调试）
|
11 years ago |
|
z9hang
|
8190d0cecc
|
修改留言页面样式
|
11 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
|
11 years ago |
|
z9hang
|
19eaa012b7
|
讨论区样式调整
|
11 years ago |
|
sw
|
2ef10e89ac
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
273e82f620
|
修改poll的show界面的样式
|
11 years ago |
|
sw
|
25b3772520
|
增加poll统计结果的显示
|
11 years ago |
|
sw
|
1bba235ca0
|
1、更新poll.css文件
2、修改poll的index界面
|
11 years ago |
|
sw
|
7970bd6df0
|
1、增加作业截至时间的js显示
2、截止时间到了之后的显示
|
11 years ago |
|
z9hang
|
a2ec9c661a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
64d208555e
|
样式调整
|
11 years ago |
|
sw
|
584dcabeaa
|
修改学生作业列表弹出框不正确
|
11 years ago |
|
sw
|
37bd338311
|
1、老师修改作业增加默认值显示
2、学生提交作业列表修改layout
|
11 years ago |
|
sw
|
f3fefe50f1
|
1、增加flash显示样式
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
|
11 years ago |
|
guange
|
1126d9b9a9
|
#2082 IE8浏览器--任意模块上传附件：上传附件后，“未上传文件”字样并未随着附件的上传变成“已上传X个文件”
|
11 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
|
11 years ago |
|
z9hang
|
d44bbe9de1
|
课程通知界面新建通知修改
|
11 years ago |
|
sw
|
06c5739767
|
更新css以及上传图片
|
11 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
11 years ago |
|
huang
|
0a43ab67ac
|
编辑器星号匹配问题
|
11 years ago |
|
z9hang
|
aaf14d5d1a
|
修改课程通知页面
|
11 years ago |
|
huang
|
f1b8d74a07
|
修改加入项目字体大小、宽度
|
11 years ago |
|
huang
|
27b8af61c4
|
修改关注、取消关注样式过程换行
|
11 years ago |
|
lizanle
|
297b3c42b1
|
插入的表格样式会被全局样式覆盖。
|
11 years ago |
|
z9hang
|
821cb885a9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
|
11 years ago |
|
huang
|
10518afa84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
fd9eaa93d6
|
关注添加+号；去掉css文件中多余符号引起的样式问题
|
11 years ago |
|
z9hang
|
ef01fc3c71
|
样式文件错误修正
|
11 years ago |
|
z9hang
|
bcfdac37a7
|
课程资源中的图片点击下载有弹框改为预览图片
|
11 years ago |
|
z9hang
|
27a4e462de
|
jpeg图片预览
|
11 years ago |
|
sw
|
aa240a759a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
49f11642ad
|
调整资源模块样式
|
11 years ago |
|
whimlex
|
d73d842e31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
34579e395f
|
附件上传bug修改；意见反馈收拉一致
|
11 years ago |
|
z9hang
|
aa1782a48d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
1cd2984c05
|
#2066 网站中的图片附件链接，能否点击后直接在浏览器中显示，而不是下载？
|
11 years ago |
|
huang
|
cea43cb045
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
69eb7fbd77
|
关注、加入项目样式，处理样式冲突
|
11 years ago |
|
whimlex
|
5924cd6432
|
commit
|
11 years ago |
|
sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
11 years ago |
|
whimlex
|
93838f604d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
3837e1fcf5
|
申请加入：附件上传
|
11 years ago |
|
z9hang
|
0d8786f7dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
74d1ebed4e
|
课程资源中样式显示问题
|
11 years ago |
|
sw
|
6edbb3c7ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
11 years ago |
 dingxu
|
073cb07f70
|
邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、
展开条样式修改
|
11 years ago |
|
dingxu
|
440855c0e6
|
修改项目tag样式
|
11 years ago |
|
sw
|
12be97eea5
|
修改配置、关闭、复制、加入课程、退出课程按钮样式不正确
|
11 years ago |
|
sw
|
90df8056c8
|
1、修改分页控件中省略号颜色
2、更新样式文件
3、修改课程首页用新建问卷换行
|
11 years ago |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
11 years ago |
|
sw
|
b9ed34f86e
|
1、右边内容区域、增加js：最短为左侧长度
2、修改课程首页动态显示
3、修改course.css文件
|
11 years ago |
|
huang
|
371f25b61f
|
修改邀请页面分页异常（冲突引起）
|
11 years ago |
|
huang
|
39193a0d71
|
修改邀请中按钮样式
|
11 years ago |
|
huang
|
4ae5e2af7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
6498002c71
|
修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug
原因：里面逻辑判断错误
|
11 years ago |
|
sw
|
78a7764de0
|
更新css文件并上传缺失图片
|
11 years ago |
|
sw
|
64b0646281
|
base_course基本完成
|
11 years ago |
|
sw
|
4ebd27ea40
|
修改课程默认图片
|
11 years ago |
|
sw
|
16872597b6
|
实现课程搜索
|
11 years ago |
|
z9hang
|
a74acef82a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
943258aebe
|
#2025 项目--资源库：上传资源时，分类资源为“课件”或“研究报告”，成功上传后，都是源代码
|
11 years ago |
|
huang
|
216bc57004
|
1、进入项目子讨论区之后的页面
2、修改火狐浏览器“展开信息”异常
|
11 years ago |
|
huang
|
003b088091
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
4111e2a940
|
1、讨论区新子界面
2、项目右侧优化
|
11 years ago |
|
lizanle
|
14d1fa0069
|
选择文件后就上传并插入
|
11 years ago |
|
sw
|
1e897687d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
d2c7861706
|
1、添加缺少图片
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
|
11 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
11 years ago |
|
z9hang
|
56b331219d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ffb3e81b99
|
#2048 公共贴吧--贴吧创建人等信息以下拉框显示不合适
|
11 years ago |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
lizanle
|
8ad4dba8c2
|
kindeditor资源文件
|
11 years ago |
|
sw
|
747a109638
|
1、添加CSS文件
2、调整首页HTML
3、去掉base_header中没用的erb语句
|
11 years ago |
|
sw
|
88d6b25ace
|
1、修改意见反馈图片
2、去掉个人首页权限判断
|
11 years ago |
|
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
11 years ago |
|
sw
|
fd8edc9a02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
11 years ago |
|
sw
|
7dc6f76060
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
|
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
11 years ago |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
11 years ago |
|
huang
|
29655838f0
|
项目超过的部分用“展示更多信息”拉开
|
11 years ago |
|
guange
|
38c3b40ca1
|
#1701 修复在编辑作业时，删附件会导致名称编辑内容丢失
|
11 years ago |
|
guange
|
31351bc9e8
|
#1095 在issue主题下，输1个字符可以进行搜索，500错误解决
|
11 years ago |
|
huang
|
ba09213023
|
添加新闻模块、部分样式
|
11 years ago |
|
huang
|
e22b389971
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
b043d07d61
|
修改发布新贴显示问题
|
11 years ago |
 alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
11 years ago |
|
huang
|
f898e2aa91
|
16:22
|
11 years ago |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
11 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
11 years ago |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
45fe622f26
|
1、修改进入系统首页报错
2、增加组织的默认图片
|
11 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
11 years ago |
|
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
11 years ago |
|
sw
|
23e5ab60ca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
1dd8724656
|
修改样式
|
11 years ago |
|
huang
|
3350bb98b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
sw
|
5cd1ca8dcb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
11 years ago |
|
sw
|
280092366b
|
去除重复代码
|
11 years ago |
|
sw
|
4f82fe2a7b
|
修改匿评弹出框显示异常
|
11 years ago |
|
alan
|
7710af316d
|
Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh
|
11 years ago |
|
lizanle
|
55e049edbb
|
去掉Kaminari分页样式
|
11 years ago |
|
lizanle
|
3e2deaf0e3
|
添加Kaminari分页样式
|
11 years ago |
|
sw
|
3648856011
|
1、修改作业显示界面show不正确
2、修改作业显示界面部分浏览器星星显示异常
|
11 years ago |
|
huang
|
29df528af1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
config/routes.rb
|
11 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
11 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
sw
|
bf75f32903
|
修改个人留言界面，左侧个人信息样式显示不正确
|
11 years ago |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
11 years ago |
|
sw
|
950d831108
|
Merge branch 'api' into szzh
|
11 years ago |
|
lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
sw
|
97c7ccac16
|
增加关闭问卷功能
|
11 years ago |
|
sw
|
9f6ff04e65
|
#1866 新建帖子时当鼠标移至“提交”按钮时，光标应变成手型的图标
|
11 years ago |
 zhuhao
|
167abcd6b4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
|
sw
|
a093537ba4
|
去掉编辑问卷时框框
|
11 years ago |
|
sw
|
6dad5bb416
|
修改问卷统计界面margin
|
11 years ago |
|
sw
|
2450bb777d
|
修改问卷统计界面样式
|
11 years ago |
|
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 |
