 sw
|
87f19f7a8b
|
#1873 加入”==》“申请加入”
|
11 years ago |
|
sw
|
2f8d57797c
|
增加弹出框的宽度
|
11 years ago |
 alan
|
472ccc45bf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
02f01c1aba
|
修改首页加入项目
|
11 years ago |
 z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
|
z9hang
|
b2396df68c
|
优化下代码
|
11 years ago |
|
alan
|
7ef6f8adfb
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
a3cf79db96
|
修改编码问题
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
5e4279e158
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
2450bb777d
|
修改问卷统计界面样式
|
11 years ago |
whimlex
|
14685f2656
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
11 years ago |
|
alan
|
38da932f4c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/application.rb
|
11 years ago |
|
alan
|
61634585f5
|
修改《news，forum模块发送邮件的模板》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
900cff8f8e
|
1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
|
11 years ago |
|
sw
|
dbdae2ac7e
|
问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示
|
11 years ago |
|
sw
|
016f4f9a0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
6645648027
|
学生是否看到问卷结果老师可配置增加数据库
|
11 years ago |
 lizanle
|
b26f2029ef
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
|
11 years ago |
|
lizanle
|
e96302d219
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
alan
|
b20204fedd
|
修改《邮件重发一样引发的bug》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
4a672416e3
|
匿评作品详情接口添加评论的回复输出
|
11 years ago |
|
lizanle
|
df88cb6eba
|
管理员才能查看
|
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 |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
sw
|
bb64dc9452
|
修改问卷调查按钮的样式
|
11 years ago |
|
alan
|
942035f698
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
24a8f4fe7d
|
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
lizanle
|
27fde6c641
|
添加注释
|
11 years ago |
 huang
|
c65bab8c38
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
03ae5fdeac
|
添加注释
|
11 years ago |
|
huang
|
c6deffe245
|
修改首页样式显示异常
|
11 years ago |
|
sw
|
ae31d0b861
|
#1851课程作业增加状态显示
|
11 years ago |
|
sw
|
249b08392d
|
#1856 修改问卷列表页面，发布问卷、取消发布后弹出界面显示不正确
|
11 years ago |
|
sw
|
81f5a5e624
|
#1854学生点击查看已提交过的问卷时，多行主观题中显示有html元素
|
11 years ago |
|
sw
|
2b5928602e
|
1.修改由于意见悬浮框引起的界面的padding不正确的问题
2.修改问卷调查左侧会出现滚动条的问题
|
11 years ago |
|
whimlex
|
e950208e38
|
sina邮箱IE样式
|
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 |
|
whimlex
|
1e36ca504a
|
多种邮箱邮件样式调整，回复内容样式更改
|
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 |
|
lizanle
|
4fe8b23069
|
去掉不必要的代码，修改注释，格式
|
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 |
|
alan
|
8f1249390a
|
修改《发送多封相同邮件》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
f1693e237b
|
修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言）
|
11 years ago |
|
lizanle
|
8b6750c1ed
|
删除日志修改为只能修改当天的日志：这样子保护原来的日志，又能进行当天的调试
|
11 years ago |
|
sw
|
90a81ee1f1
|
增加网站项目首页加入项目的功能
|
11 years ago |
|
alan
|
24dfeb1614
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
432e3a05f2
|
增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
683625066e
|
修改进入未批列表修改排序后，老师进行评分之后排序会回到默认排序额问题
|
11 years ago |
|
sw
|
e72ed1054e
|
修改问卷调查按钮的样式
|
11 years ago |
|
z9hang
|
a4d7e5f932
|
匿评作品详情显示接口
|
11 years ago |
|
whimlex
|
0c0160ac2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
3279928bef
|
邮件样式调整，国际化；用户资料页面调整
|
11 years ago |
|
sw
|
54c8ee9d4d
|
增加学生答完问卷之后。能看到自己答题结果的功能
|
11 years ago |
|
lizanle
|
c0b12ac60c
|
去掉冗余代码
|
11 years ago |
|
lizanle
|
7fc2ea0484
|
修改国际化文件名字
|
11 years ago |
|
lizanle
|
566f59c49e
|
修改只有管理员才能查看
|
11 years ago |
|
lizanle
|
0502eb16a6
|
添加了访问统计页面和耗时分析页面
|
11 years ago |
|
lizanle
|
59a47002ae
|
重构，修正了许多的空指针异常
|
11 years ago |
|
lizanle
|
061e4599c3
|
重构，修正了许多的空指针异常
|
11 years ago |
|
lizanle
|
c668b72dac
|
重构
|
11 years ago |
|
sw
|
d68486669e
|
#1830课程--标签字体压线
|
11 years ago |
|
z9hang
|
b6207c0a47
|
关闭匿评
|
11 years ago |
|
z9hang
|
89e0f98034
|
启动匿评接口
|
11 years ago |
|
sw
|
520e9c73aa
|
#1836 未登录或者没有权限访问私有项目时，跳转到403页面
|
11 years ago |
|
alan
|
f01d164295
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
0b2fa35a42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
77b8bf18c8
|
#1842 修改部分页面描述问题
|
11 years ago |
|
sw
|
a53831a6b5
|
修改当问卷标题过长时，学生查看问卷列表省略号过早出现
|
11 years ago |
|
alan
|
64c0fc7413
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
6ccb154cc3
|
课程留言，发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
b13f2b2dc8
|
添加我的作品列表接口
|
11 years ago |
|
sw
|
95dcdd7125
|
修改进入问卷编辑界面报错
|
11 years ago |
|
sw
|
3bdaeb20c2
|
1、修改问卷列表页面样式
2、问卷列表增加发布问卷功能
3、增加js返回方式
4、去掉无用的js函数
|
11 years ago |
|
sw
|
402dfc788f
|
修改新建问卷时问卷名称默认为空
|
11 years ago |
|
sw
|
4caf6ab5f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
f3062da237
|
修改空数据时，课程首页无法加载(居然是死循环。。。)
|
11 years ago |
|
z9hang
|
b949f70c64
|
修改数据格式转换方法
|
11 years ago |
|
sw
|
77cb2b0893
|
1.修改学生已完成的问卷标题过长时显示异常
2.增加取消发布时的提示
|
11 years ago |
|
alan
|
9f36469d39
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
40d6c3b19c
|
添加《邮箱地址验证是否存在及国际化的编写》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
0a33a716de
|
添加课程作业列表API接口
修改作业详情列表API接口
添加课程通知列表API接口
|
11 years ago |
|
sw
|
7b9d88ecfe
|
问卷调查增加重新发布功能
|
11 years ago |
|
sw
|
e493ae22cf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
14a1f31a12
|
1、项目动态 -> 近期动态
2、修复新建修改课程时，描述会有一行空白行
|
11 years ago |
|
lizanle
|
4796524a97
|
去掉项目动态查询中过大的时间跨度
|
11 years ago |
|
z9hang
|
abcf06ccc7
|
课程资源不能引用问题。原因：15年1-3月能属于2014年秋季学期，代码却将其判断为15年秋季学期了
|
11 years ago |
|
alan
|
3315116832
|
修改《课程--留言：给课程留言却返回404》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
49ff5659d9
|
系统日志查看相关代码，资源
|
11 years ago |
|
lizanle
|
2431fea63e
|
日志查看Helper
|
11 years ago |
|
alan
|
d5100e4808
|
修改《若用户没有填写姓名或者学号，在列表处姓名学号显示不合理》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
0b0b6c9b6e
|
修改《托管平台中点击某项目进入该项目主页，右上角的搜索处不输入内容点击搜索按钮，给出的提示信息显示不合理》
增加《课程平台进入某一课程搜索风格保持与项目及竞赛的一致》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
0ed39fbcc7
|
修改《缺陷 Trustie-Forge#1793 (已解决): 登录平台后点击修修改资料，当身份为老师或者学生时：点击选择学校弹出框靠左压线显示，建议剧中现》
《 360项目，课程首页搜索框乱了》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
092265d53c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
00633c8331
|
1
|
11 years ago |
|
sw
|
750c8d77aa
|
11111
|
11 years ago |
|
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
|
sw
|
2a8a8ab3f2
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
2f9e658697
|
增加问卷调查按钮的样式
|
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
|
989ff4fcbe
|
修改弹出框高度
|
11 years ago |
|
sw
|
ebbe2f97d8
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
2c6e53b935
|
修改弹出框宽度
|
11 years ago |
|
sw
|
155d48b7cb
|
问卷列表每页显示20个
|
11 years ago |
|
alan
|
ebf63b9ba2
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
26b3aab6a2
|
增加题型显示
|
11 years ago |
|
sw
|
8a05e032af
|
修改题型显示的样式
|
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 |
|
z9hang
|
d9772ff2d0
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
z9hang
|
05b1b9741b
|
问卷调查页面修改为每页显示5题
|
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
|
abd5996719
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
b3f37f5154
|
111
|
11 years ago |
|
sw
|
bba213dec9
|
1.#1802 修复页面下方有很大一片空白
2.修复系统文本框的padding、margin都为0
|
11 years ago |
|
z9hang
|
33fd43e7b6
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
4e19690887
|
1.修改取消编辑多行主观后多行主观从页面消失
2.修改编辑后取消，第二次进入编辑却显示前一次编辑的结果 #1810 #1806
|
11 years ago |
|
z9hang
|
092dd61c86
|
修改修改资料处样式问题
|
11 years ago |
|
huang
|
e75193e35a
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
alan
|
1602d2e439
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
0f5c3c5f4c
|
添加主观题统计页面及样式
|
11 years ago |
|
alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
e8f3bd4dbb
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
e14deeb4dd
|
增加限制：问卷标题最多100字，问卷描述最多300字，问卷问题最多250字，问卷选项最多200字
|
11 years ago |
|
z9hang
|
9487ce1245
|
#1807课程--问卷调查：答题多行主观后，再点击打开答题页面，如图，显示html元素<br>
|
11 years ago |
|
huang
|
3acec4b7c1
|
修改了总统计数
|
11 years ago |
|
sw
|
f99d159ca1
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
d16d5fd362
|
单行文字/多行文字 --> 单行主观/多行主观
|
11 years ago |
|
alan
|
9c45e372b4
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
11 years ago |
|
alan
|
479a1249ae
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
ae9856c01a
|
发布时弹出框js、css调整
|
11 years ago |
|
huang
|
b43e6558e1
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
huang
|
59c21d81e9
|
修改了分母不能为0的bug
统计结果精确到两位
|
11 years ago |
|
z9hang
|
bbf4c4629b
|
问卷show页面国际化
|
11 years ago |
|
sw
|
17b96bdb14
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
79ad33a90f
|
增加发布问卷的路由
|
11 years ago |
|
z9hang
|
e49dfefefb
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
z9hang
|
dd42c89ee6
|
百分比除数为0问题
|
11 years ago |
|
huang
|
2cbe801528
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
huang
|
7177303eeb
|
问卷统计最终效果
|
11 years ago |
|
sw
|
d448599664
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
fe3a84c8db
|
实现添加多行文字
|
11 years ago |
|
z9hang
|
b8047bec28
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
z9hang
|
0a367249ae
|
问卷完成度显示
|
11 years ago |
|
sw
|
65a3ddce41
|
1、增加新增单行文字功能
2、修改题目后总是显示为单选题
|
11 years ago |
|
sw
|
f46c8e8adc
|
新建单选、多选取消之后无法继续新建的BUG
|
11 years ago |
|
sw
|
164c89d7b8
|
1.实现添加多选题
2.单选题、多选题后面增加括号提示
|
11 years ago |
|
sw
|
dedb70c56b
|
显示问题增加多选、单行文字、多行文字的显示
|
11 years ago |
|
sw
|
2954bba411
|
j进入新建、修改页面时，问卷头显示为可编辑
|
11 years ago |
|
sw
|
a5cf1576f1
|
将新增问题栏放到问题列表下面
|
11 years ago |
|
huang
|
b53686dfd7
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
huang
|
eacc1079b0
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
app/controllers/poll_controller.rb
|
11 years ago |
|
sw
|
a683acf85c
|
修复新建问卷时刷新页面，会新建一个问卷的BUG
|
11 years ago |
|
z9hang
|
d0117e5d03
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
z9hang
|
0dc0ba3a4a
|
问卷显示权限管理
|
11 years ago |
|
huang
|
34b8ffeb5b
|
tongji
|
11 years ago |
|
sw
|
40d6ebfd88
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
9fb0275563
|
1.增加修改单选题时页面js的刷新
2.修改单选题时删除某些选项有误
|
11 years ago |
|
z9hang
|
dc2c96f59a
|
提交后的问卷禁止查看与编辑
|
11 years ago |
|
sw
|
f41cd0a8ab
|
1.修改单选题业务逻辑处理
2.删除选项时，单选题至少有一个选项
|
11 years ago |
|
alan
|
5191411508
|
<邮件加密自动登录功能，邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
933ad22cd2
|
修改提交问卷后提示框样式
|
11 years ago |
|
z9hang
|
30a058133d
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
z9hang
|
e44cc07f86
|
提交问卷功能
|
11 years ago |
|
sw
|
c4bedfb369
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
app/controllers/poll_controller.rb
|
11 years ago |
|
sw
|
d55492b07a
|
增加修改单选题的路由、action、以及js
|
11 years ago |
|
z9hang
|
77dc9607df
|
简答题答题
|
11 years ago |
|
sw
|
5ec2789881
|
删除某一题目后，后面的题目序号自动-1，以及页面js的刷新
|
11 years ago |
|
sw
|
3fab26214f
|
删除单选题后页面数据的删除，增加删除题目的路由及相关方法
|
11 years ago |
|
sw
|
870f9bba98
|
必答按钮的数据存入
|
11 years ago |
|
sw
|
f78de71814
|
编辑单选题时页面js添加
|
11 years ago |
|
sw
|
4edd9fee64
|
新增单选题取消后无法重新添加单选题
|
11 years ago |
|
sw
|
5792bd77e5
|
实现新增单选题题时页面的刷新
|
11 years ago |
|
sw
|
a1f21f3ebb
|
1、修改一次添加一个题目
2、新增题目时，新建题目获取焦点
3、新增题目后页面事件改变
|
11 years ago |
|
sw
|
a99d7c5145
|
1、分离出新建问卷问题页面
2、增加修改问题相关路由及action
|
11 years ago |
|
sw
|
4996b9a546
|
修复重复编辑问卷头会使问卷头信息显示不正确的BUG
|
11 years ago |
|
sw
|
517c3d1ca5
|
修复部分情况下删除单选题题选项后，后面再添加的单选题与前面单选题name有重复的BUG
|
11 years ago |
|
z9hang
|
d684acf527
|
多选题答题功能
|
11 years ago |
|
sw
|
496ef94b97
|
增加编辑头页面js
|
11 years ago |
|
sw
|
20c160f03f
|
1、修改标题头、取消修改标题头数据的保存和页面的变更
|
11 years ago |
|
z9hang
|
d2fadfda08
|
单选题选择答案
|
11 years ago |
|
z9hang
|
8dab2057a9
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
config/routes.rb
|
11 years ago |
|
z9hang
|
6d82e79e7f
|
答题相关方法添加
|
11 years ago |
|
lizanle
|
75ba61ed74
|
issue 1798 ,用户名出现不显示的情况
|
11 years ago |
|
huang
|
2b0775da26
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
db/schema.rb
|
11 years ago |
|
huang
|
b63b4974eb
|
统计
|
11 years ago |
|
sw
|
99ffc8a643
|
初始单选题有3个选项
|
11 years ago |
|
sw
|
2a23eb8e17
|
1.增加单选题的显示
2.去掉无用页面
|
11 years ago |
|
lizanle
|
aca74bf937
|
Merge remote-tracking branch 'origin/dev_zanle' into szzh
Conflicts:
Gemfile
app/views/welcome/index.html.erb
|
11 years ago |
|
alan
|
2bba0ddd70
|
添加《邮件加入附件下载功能及私有项目自动登录》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
0433f7c87f
|
增加新建单选题功能
|
11 years ago |
|
sw
|
2af6121f82
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
|
sw
|
eb2498c62c
|
1.增加新增单选题、新增选项、删除选项等js
2.修改问卷layout增加
3.增加新增单选题确定按钮的路由以及相关action
|
11 years ago |
|
z9hang
|
b6826a74d3
|
问卷显示
|
11 years ago |
|
sw
|
e4edc5d1db
|
1.增加修改页面动态加载
2.增加编辑完成后问卷头页面
3.增加问卷按钮的css样式
|
11 years ago |
|
z9hang
|
60b0743292
|
问卷调查页面在火狐中的显示问题
|
11 years ago |
|
sw
|
feb6dc139d
|
增加添加标题时js验证
|
11 years ago |
|
sw
|
85542095a6
|
增加input为空时的提示，修改部分html错误
|
11 years ago |
|
sw
|
311d90d565
|
1.增加点击单选、多选、单行文本、多行文本的js
2.分割问卷标题头
3.增加新增问题的路由及action
|
11 years ago |
|
alan
|
cd504f8978
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into develop
|
11 years ago |
|
alan
|
2f147dcddd
|
增加《邮件地址自动登录功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
c84b8f75cc
|
编辑问卷的页面的分割
|
11 years ago |
|
sw
|
0a9509a921
|
新增问卷界面调整
|
11 years ago |
|
sw
|
e59e9cd661
|
增加新增问卷页面
|
11 years ago |
|
sw
|
8503f0c803
|
根据最新设计页面，修改页面显示样式，调整css代码
|
11 years ago |
|
sw
|
c856005803
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
86b18f1cb3
|
修改课程--匿评提示窗口有两个关闭窗口的图标按钮
|
11 years ago |
|
z9hang
|
f0cac221e9
|
修正作业详情接口
|
11 years ago |
|
sw
|
fc72d6f9a9
|
1.增加问卷统计、问卷答卷等页面跳转，并增加对应路由
2.调整页面样式
3.动态分页
|
11 years ago |
|
z9hang
|
8f8919c9fd
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
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
|
32219bd850
|
增加访问权限控制
|
11 years ago |
 zhuhao
|
a70e0ccadd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
7ac6d0467f
|
修改资料form表单对齐
|
11 years ago |
|
alan
|
8217e37516
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
90925edce2
|
修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d0dc01b992
|
增加问卷修改功能，以及相关js
|
11 years ago |
|
z9hang
|
525cf10376
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6efe9ff5c6
|
注释掉无用的方法调用
|
11 years ago |
|
sw
|
450c4b203d
|
增加新建问卷按钮功能
|
11 years ago |
|
sw
|
f54cf53663
|
1.问卷列表页面动态显示，
2.问卷调查页面引起base_course的样式显示不正确
|
11 years ago |
hhuai
|
8ecdaf2fe8
|
merge
|
11 years ago |
|
hhuai
|
5c9f1a1e1b
|
merge
|
11 years ago |
|
sw
|
d2dfff33d0
|
课程页面增加问卷调查的链接
|
11 years ago |
|
sw
|
475b046898
|
修改访问poll#index报ArgumentError
|
11 years ago |
|
sw
|
1c24a306fe
|
去掉无用的control
|
11 years ago |
|
sw
|
c964194d85
|
增加问卷调查相关的路由、action、以及部分对应的页面
|
11 years ago |
|
sw
|
9604117e93
|
Merge branch 'develop' into szzh
|
11 years ago |
|
alan
|
9f807438d6
|
教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
828f57249c
|
merger
|
11 years ago |
|
guange
|
da880dae00
|
作业展示
|
11 years ago |
|
sw
|
90349eed5d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
sw
|
6fc496c8ee
|
Merge branch 'szzh' into develop
|
11 years ago |
|
huang
|
2cd805ef4c
|
去掉课程单独的弹框
|
11 years ago |
|
alan
|
296d88c14d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
74af44a826
|
修改《修改个人资料页面》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
bf7eaa7a80
|
修复同一个学生提交相同的文件后，打包下载异常的BUG
|
11 years ago |
|
alan
|
a31088cc1b
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
3db80fc3fc
|
修改《contest链接bug》
|
11 years ago |
|
sw
|
f101037b26
|
Merge branch 'szzh' into develop
|
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 |
|
z9hang
|
666facd483
|
Merge branch 'szzh' into develop
|
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 |
|
sw
|
f4e30f77cc
|
1.打包下载异常捕获去除
2.打包下载寻找课程、项目方法隐藏
|
11 years ago |
|
alan
|
6c9f5136c0
|
修改《竞赛主页显示错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d96843a1d5
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
576f799105
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
725866a23d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
c9e23ec52f
|
修改《创建作业页面》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
zhuhao
|
92cf3d86cc
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
9ef3849fe3
|
如果缺少某一附件。在下载后的文件增加相关说明文档
|
11 years ago |
|
sw
|
82c2a659df
|
修复当作业打包下载时，某一文件不存在时，跳过该文件继续下载其他的文件
|
11 years ago |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
11 years ago |
|
alan
|
3f354a019f
|
修改（个人主页个人签名格式乱了）
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
53b57d4c53
|
修改《个人主页积分弹框显示错误》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4b9bad0dc5
|
修改《若有某公开课程courseA，在课程主页中搜索courseA跳转到搜索结果界面，相关链接没有对齐》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d095aed7a3
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
2dc626b595
|
修改《学生列表中重名的班名提示报错》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
7ae9556404
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ee9d82bfc7
|
1.实现文件调查的model、control、view的架构
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
|
11 years ago |
|
zhuhao
|
a2c2266590
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
aae69417cd
|
标签按钮样式修改
|
11 years ago |
|
alan
|
9bbc8d64eb
|
课程母版页加载缓慢
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 |
|
sw
|
4c6ade4c08
|
定义各model之间的关系
|
11 years ago |
|
sw
|
c9de30bd83
|
增加问卷调查相关表，以及对应的model、control、view的文件夹
|
11 years ago |
|
alanlong9278
|
da85c3efb8
|
进入某竞赛主页，点击创新竞赛链接没反应
|
11 years ago |
|
alanlong9278
|
d212a20bbf
|
IE浏览器中：课程，竞赛，托管平台的主页不能正常显示
|
11 years ago |
|
z9hang
|
fd1dc80bf0
|
修改作业详情接口
|
11 years ago |
|
z9hang
|
fdb38c1b87
|
修复课程教师，课程学生接口
|
11 years ago |
|
z9hang
|
303752fc7e
|
修复退出课程接口
|
11 years ago |
|
z9hang
|
b711793d7c
|
修正加入课程接口问题
|
11 years ago |
|
sw
|
2277d388c0
|
修改了两处语法错误
|
11 years ago |
|
lizanle
|
10cde37582
|
cache using version
|
11 years ago |
|
z9hang
|
d407f8656d
|
1、修复课程img_url为空问题。2、补上用户课程接口
|
11 years ago |
|
z9hang
|
1686ed4fbd
|
补上显示用户接口
|
11 years ago |
|
z9hang
|
ed776fa9b9
|
1、修正用户编辑接口报错问题。2、修正用户注册，编辑用户接口返回数据不正确问题
|
11 years ago |
|
z9hang
|
2c49dad4dc
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
guange
|
59f687bb6a
|
added homework
|
11 years ago |
|
z9hang
|
58c31b1d7f
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
z9hang
|
f252438f85
|
修改编辑课程接口
|
11 years ago |
|
guange
|
b1125e7d7e
|
编辑课程改为put
|
11 years ago |
|
guange
|
a3ed599d49
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
z9hang
|
f55d8fe303
|
1、修正新建课程接口无效问题。2、修正新建课程接口返回的数据中课程名称错误问题
|
11 years ago |
|
z9hang
|
b5da95d5ce
|
修改错误
|
11 years ago |
|
sw
|
a09a3dc378
|
课程首页： 1-3月份显示上一年度的秋季学期的课程， 3-9月份显示本年度的春季学期课程， 9-12月份显示本年度的秋季学期的课程
|
11 years ago |
|
guange
|
d97b26f131
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
