 sw
|
3cac4336cd
|
修改课程、项目、竞赛首页搜索懒为英文
|
10 years ago |
 alan
|
838c39da69
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/projects/_invite_members_by_mail.html.erb
|
10 years ago |
|
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
 z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
782071ab64
|
显示接口不能用问题，app版本管理部分代码
|
10 years ago |
 huang
|
ba09213023
|
添加新闻模块、部分样式
|
10 years ago |
 lizanle
|
77f81ac171
|
kaminari分页配置
|
10 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
10 years ago |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
10 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
|
10 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
10 years ago |
|
sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
10 years ago |
|
sw
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
10 years ago |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
10 years ago |
|
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
10 years ago |
|
sw
|
5f8595d874
|
admin页面增加组织列表
|
10 years ago |
|
sw
|
3b4bf8b99d
|
增加组织的index界面，以及index界面到组织首页的跳转
|
10 years ago |
|
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
10 years ago |
|
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
10 years ago |
|
alan
|
0ba6c6d3ba
|
还原memcached修改的文件[memcache实验还没弄好]
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
11 years ago |
|
sw
|
73d2e2e5e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
11 years ago |
|
sw
|
f380d781e7
|
增加根据已有课程复制成新课程的路由以及方法实现
|
11 years ago |
|
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
11 years ago |
|
alan
|
6e72e07028
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile
Gemfile.lock
|
11 years ago |
|
alan
|
6f9e2bad63
|
mail weekly
|
11 years ago |
|
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
11 years ago |
|
huang
|
59e7f2f28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
8bef9420cf
|
修改企业版中自己能看到自己的私有项目
|
11 years ago |
|
sw
|
6226974f0b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
96f538c76b
|
#1917邮件通知设置中将“收取选中项目的所有通知...”后的省略号去掉
|
11 years ago |
|
alan
|
858b5ea97c
|
修改《讨论吧发帖发送邮件错误问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7391f3b5cf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
bb79aac700
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ab18dfcaa8
|
School => 中国高校
|
11 years ago |
|
whimlex
|
8f19467115
|
英文国际化
|
11 years ago |
|
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
11 years ago |
|
alan
|
9681e08600
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile.lock
|
11 years ago |
|
alan
|
1010003737
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
alan
|
134f0d5557
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
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 |
|
alan
|
9e36f9264c
|
修改《竞赛作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
11 years ago |
|
alan
|
48cb0e0450
|
email verify
|
11 years ago |
|
whimlex
|
c413ce1405
|
项目企业模块国际化修改
|
11 years ago |
|
whimlex
|
6a22e47b0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
57237c76d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
3e1d90630e
|
找回密码，邮件激活国际化
|
11 years ago |
|
alan
|
3484fd34bb
|
merge dev_zanle branch
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7710af316d
|
Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh
|
11 years ago |
|
huang
|
768e06ea8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
11 years ago |
|
alan
|
2f168dd4d7
|
修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
ff80bea0c2
|
添加Kaminari配置文件，并给出了比较详细的注释
|
11 years ago |
|
lizanle
|
c543a28cc8
|
重写url_helper link_to_unless方法，给Kaminari当前页添加样式
|
11 years ago |
|
alan
|
f2a3ce0ece
|
修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
864ed349e4
|
国际化
|
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
|
0d5384c6d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
617107f0cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
f05e046751
|
首页国际化
|
11 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
11 years ago |
|
lizanle
|
87b230623b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
950d831108
|
Merge branch 'api' into szzh
|
11 years ago |
|
lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
lizanle
|
fd42af1ac4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
b6db353b57
|
newrelic配置文件
|
11 years ago |
|
sw
|
56700f4d62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
97c7ccac16
|
增加关闭问卷功能
|
11 years ago |
|
whimlex
|
64cbeddd13
|
项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正
|
11 years ago |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
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
|
08e646c752
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
900cff8f8e
|
1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
|
11 years ago |
|
whimlex
|
2be757a3d5
|
翻译缺失完善
|
11 years ago |
|
whimlex
|
9886a3212c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
15a8bddfe6
|
缺失翻译
|
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
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
69ced4b14b
|
添加国际化内容
|
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 |
|
lizanle
|
7bf89c1fc1
|
开发环境不缓存
|
11 years ago |
|
lizanle
|
f394c3878e
|
生产环境日志名字规定为production.log
|
11 years ago |
|
lizanle
|
d2d1a9659b
|
开发环境下去掉缓存
|
11 years ago |
|
lizanle
|
ae74dff89b
|
添加注释
|
11 years ago |
|
lizanle
|
79fd7ebd7a
|
生产环境下日志分天
|
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
|
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 |
|
lizanle
|
43c5feb1f7
|
补丁：修改日志还没有关闭就被重命名的bug：
https://bugs.ruby-lang.org/issues/7303
|
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
|
4d20c8080f
|
修改国际化文件名字
|
11 years ago |
|
lizanle
|
458749b921
|
添加了国际化代码
|
11 years ago |
|
lizanle
|
6c0f47d96d
|
日志路由
|
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 |
|
sw
|
4caf6ab5f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
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 |
|
z9hang
|
493b7ca695
|
#1821 课程--作业：导出excel相关问题 调整样式
|
11 years ago |
|
lizanle
|
027f6592ef
|
日志查看路由
|
11 years ago |
|
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
|
huang
|
6bba6b2b76
|
weiwan
|
11 years ago |
|
huang
|
0f5c3c5f4c
|
添加主观题统计页面及样式
|
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 |
|
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 |
|
huang
|
7177303eeb
|
问卷统计最终效果
|
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
|
3fab26214f
|
删除单选题后页面数据的删除，增加删除题目的路由及相关方法
|
11 years ago |
|
sw
|
a99d7c5145
|
1、分离出新建问卷问题页面
2、增加修改问题相关路由及action
|
11 years ago |
|
sw
|
20c160f03f
|
1、修改标题头、取消修改标题头数据的保存和页面的变更
|
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
|
aca74bf937
|
Merge remote-tracking branch 'origin/dev_zanle' into szzh
Conflicts:
Gemfile
app/views/welcome/index.html.erb
|
11 years ago |
|
sw
|
0433f7c87f
|
增加新建单选题功能
|
11 years ago |
|
sw
|
eb2498c62c
|
1.增加新增单选题、新增选项、删除选项等js
2.修改问卷layout增加
3.增加新增单选题确定按钮的路由以及相关action
|
11 years ago |
|
sw
|
311d90d565
|
1.增加点击单选、多选、单行文本、多行文本的js
2.分割问卷标题头
3.增加新增问题的路由及action
|
11 years ago |
|
sw
|
fc72d6f9a9
|
1.增加问卷统计、问卷答卷等页面跳转，并增加对应路由
2.调整页面样式
3.动态分页
|
11 years ago |
|
alan
|
24e2666e4c
|
Signed-off-by: alan <547533434@qq.com>
|
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
|
d0dc01b992
|
增加问卷修改功能，以及相关js
|
11 years ago |
|
sw
|
450c4b203d
|
增加新建问卷按钮功能
|
11 years ago |
|
sw
|
d2dfff33d0
|
课程页面增加问卷调查的链接
|
11 years ago |
|
sw
|
475b046898
|
修改访问poll#index报ArgumentError
|
11 years ago |
|
sw
|
d0a6fa64e5
|
修改路由
|
11 years ago |
|
sw
|
c964194d85
|
增加问卷调查相关的路由、action、以及部分对应的页面
|
11 years ago |
|
sw
|
bf7eaa7a80
|
修复同一个学生提交相同的文件后，打包下载异常的BUG
|
11 years ago |
|
sw
|
57eb9f555f
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
sw
|
41679a8d5c
|
修改文件缺少时的提示
|
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
|
92cf3d86cc
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
a30cc9bea8
|
修改文件缺少时的提示
|
11 years ago |
|
sw
|
9ef3849fe3
|
如果缺少某一附件。在下载后的文件增加相关说明文档
|
11 years ago |
|
lizanle
|
21568fab07
|
change cache files sites
|
11 years ago |
|
sw
|
035d45ea5c
|
增加数据库访问配置文件
|
11 years ago |
|
lizanle
|
7d351e9794
|
change cache files sites
|
11 years ago |
|
lizanle
|
10cde37582
|
cache using version
|
11 years ago |
|
sw
|
805de7fc28
|
修改课程首页课程列表显示策略
|
11 years ago |
|
z9hang
|
4b923ed483
|
修改导出作品列表的名称
|
11 years ago |
|
z9hang
|
d3f9f23465
|
修改课程列表导出的文件名
|
11 years ago |
|
z9hang
|
35dce16924
|
课程成员列表excel导出
|
11 years ago |
|
z9hang
|
899ac6f654
|
添加作品列表导出excel功能
|
11 years ago |
|
sw
|
734216bbcd
|
"截止了，可补交”改为“已截止，但可补交”
|
11 years ago |
|
alan
|
6c09228139
|
根据凌彬设计修改学生列表样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f9a86356ad
|
添加《重新发送激活邮件》功能to注册模块
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
1965b75d92
|
添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
=
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
11 years ago |
|
sw
|
77d72039fe
|
取消启用assets，原因：启用后界面样式不对
|
11 years ago |
|
sw
|
49341714ca
|
启动assets
|
11 years ago |
|
sw
|
cf5b03a379
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/courses/_member_list.html.erb
|
11 years ago |
|
sw
|
66d8609c56
|
作业截止时间已到，此后提交的作品将记为迟交 -> 截止了，可补交
|
11 years ago |
|
sw
|
9b5cbb0b4e
|
#1696作业提交时间已过->作业截止时间已到，此后提交的作品将记为迟交。
|
11 years ago |
guange
|
41d9af1ab9
|
auto reload api folder in development mode.
|
11 years ago |
|
alan
|
90a01c8d84
|
对新增功能《添加学生列表班内搜索和课内搜索》样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c33c578bb
|
增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
a6fc79a474
|
将分组改成分班
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
c44eeb4ff8
|
修改项目成员显示为 Member
|
11 years ago |
|
alan
|
fbe6ce16d7
|
修改《分组界面》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
9d0e39e708
|
修改孙涛提出的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
020242a8c9
|
增减《查询显示人数以及显示全部人数》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c9b84d0a35
|
增加《学生加入，退出分组》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
66f93150f6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
11 years ago |
|
alan
|
9765f11f7e
|
增加<修改，添加分组>功能
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
|
19b61118ac
|
修改加入按钮失败后变为加入课程按钮
|
11 years ago |
|
zhuhao
|
a7d7b790d2
|
公共页个性签名的提交按钮显示调整
|
11 years ago |
www
|
53ecf8718f
|
[api]用户认证完成
|
11 years ago |
|
zhuhao
|
05a5b18710
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
f267a3daf8
|
引用课程中已有的资源时提示资源已存在
|
11 years ago |
|
zhuhao
|
da82a4e842
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
5bcc76d399
|
修改作业提交项目第一项为请选择
|
11 years ago |
|
zhuhao
|
535ec333c3
|
显示字样的改动：项目改为课程
|
11 years ago |
|
sw
|
62b6572d92
|
111
|
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
|
8d3a2ad7a2
|
是否开启匿评改为是否使用匿评
|
11 years ago |
|
alan
|
5ba33b6d6d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
3317ca4a97
|
修改bug:
<资料修改--登录名不能编辑>
<注册时登录名被标识为只能是英文，但是可以为数字的>
<后台配置密码最短10个字符，注册时输入密码少于10个字符也给出提示信息“密码设置成功”>
<邮箱激活”页面修改若干建议>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
68505239f9
|
课程资源搜索功能，暂时屏蔽排序功能
|
11 years ago |
|
z9hang
|
f2da5704ef
|
课程应用的功能实现
|
11 years ago |
|
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
z9hang
|
eeda25add1
|
设置资源公开与私有功能
|
11 years ago |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
11 years ago |
|
z9hang
|
0821320dfe
|
tag删除功能完成，翻页样式修改
|
11 years ago |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
11 years ago |
moon
|
e359b987e5
|
增加“课程作业”权限提示
|
11 years ago |
|
moon
|
c086009313
|
国际化
|
11 years ago |
|
moon
|
34d7208deb
|
课程联系界面
|
11 years ago |
|
alan
|
857578dc92
|
修改bug<contest网站的作品提交界面需要改进>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
e86ef8e6f0
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
z9hang
|
43931e921a
|
合作单位修改时错误提示信息为英文问题
|
11 years ago |
|
alan
|
ad6b32ff50
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
2cea3178d6
|
添加邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
dbf08bc486
|
Merge branch 'Homework' into szzh
|
11 years ago |
|
sw
|
5d9f54c93b
|
#1490个人主页导航栏中显示课程作业
|
11 years ago |
|
sw
|
e3d735ecfc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
421d47a687
|
注册的优化
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
1468f4a8df
|
修改《修改资料》页面
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 |
|
sw
|
63d233ee42
|
课程实践-->课程作业
|
11 years ago |
|
sw
|
35cb7273a8
|
课程实践->课程作业
|
11 years ago |
|
sw
|
be500eb0d2
|
增加开启匿评关闭匿评弹出框动态显示
|
11 years ago |
|
sw
|
e2c034dcef
|
修改关闭匿评之后，学生匿评列表显示为已评列表，学生评分显示为我的评分
分数显示为我对该作业的评分
|
11 years ago |
|
alan
|
591fc409b3
|
修改bug<forge网站的项目缺陷的关联问题机制有问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
bc36e16e57
|
1.修改创建作业后跳转到作业列表
2.修改作业创建成功提示
|
11 years ago |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
11 years ago |
|
sw
|
4d1730f92e
|
修改
|
11 years ago |
|
alan
|
1d76d559dd
|
添加功能<用户搜索的问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
13c362b08d
|
1.作业排序按钮显示顺序
2.配置课程->配置 关闭课程 -> 关闭 加入课程->加入
|
11 years ago |
|
z9hang
|
990c37061b
|
调整按钮样式
|
11 years ago |
|
alan
|
495c4db43e
|
增加功能<增加学生列表是否公开功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8cec84dca7
|
添加<公共贴吧 无帖子置顶功能 建议增加>，<管理员可以根据贴吧的热度选择将贴吧置顶>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
c2fe1b7c72
|
修正评分不能点问题，作品留言
|
11 years ago |
