 alanlong9278
|
336b59f606
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
 sw
|
5ea295f8b5
|
1、第一次进入作品列表界面 返回顶部按钮不显示
2、第一次点击返回顶部按钮无用
|
10 years ago |
|
sw
|
5f6f937fcb
|
返回顶部浏览器不兼容
|
10 years ago |
|
sw
|
31f224fd82
|
返回顶部动态显示
|
10 years ago |
|
sw
|
4c268b13dd
|
#2460匿评分配数量限制长度
|
10 years ago |
|
sw
|
33da5b4a44
|
1、作业评论回复删除不即使刷新
2、匿评弹框样式
|
10 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
10 years ago |
|
sw
|
261ebb916c
|
1、当login过长，用户匿评界面的星星换行
2、去掉无用的创建作业的代码，与弹出框创建作业代码冲突
|
10 years ago |
|
sw
|
7b3edb59b0
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
public/javascripts/course.js
|
10 years ago |
|
alanlong9278
|
0668af4f89
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/bids/_bid_homework_show.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
whimlex
|
05712c4c06
|
学生作业改为作品
|
10 years ago |
 huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
10 years ago |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
whimlex
|
d79de0a354
|
课程日期控件样式冲突
|
10 years ago |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
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 |
|
sw
|
c60515ac50
|
学生作业增加按学生真实姓名、昵称、学号搜索功能
|
10 years ago |
|
sw
|
5ad1028c49
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
4b83296a97
|
课程作业列表开启、关闭匿评
|
10 years ago |
|
sw
|
503d1fc2ee
|
开启匿评、关闭匿评js
|
10 years ago |
guange
|
0325554d24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
sw
|
15567e7d7b
|
1、新的编辑起未对其
2、老师新建作业增加marting-bottom
|
10 years ago |
|
guange
|
89af4b451b
|
#2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了
|
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 |
|
guange
|
113e11f6cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/models/comment.rb
app/models/message.rb
app/models/news.rb
|
10 years ago |
 lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 years ago |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
10 years ago |
|
sw
|
72d683bdb7
|
加入课程与退出课程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
|
21db854adb
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
472ff76c72
|
启动匿评时弹框位置问题
|
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
|
519c119543
|
修改上传文件样式
|
10 years ago |
|
sw
|
9a2f572cf4
|
是否启用匿评功能异常
|
10 years ago |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
10 years ago |
|
sw
|
2bb7153131
|
去掉作业打包下载功能
|
10 years ago |
|
guange
|
4b636d8be6
|
#1801 打包上传分个数下载完成
|
10 years ago |
|
sw
|
bcf9d5919c
|
1、处理部分a标签调用js函数时会刷新页面的BUG
2、修改弹出框样式，制作弹出框demo
|
10 years ago |
|
sw
|
37bd338311
|
1、老师修改作业增加默认值显示
2、学生提交作业列表修改layout
|
10 years ago |
|
sw
|
20d97848e7
|
作业界面增加默认值显示
|
10 years ago |
|
sw
|
f3fefe50f1
|
1、增加flash显示样式
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
|
10 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
10 years ago |
|
huang
|
0a43ab67ac
|
编辑器星号匹配问题
|
10 years ago |
 z9hang
|
12d88d85fc
|
*号不能识别问题
|
10 years ago |
|
sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
10 years ago |
|
sw
|
971c278de5
|
#2026 作业创建时间->截至时间
|
10 years ago |
|
sw
|
ae31d0b861
|
#1851课程作业增加状态显示
|
10 years ago |
|
sw
|
2b5928602e
|
1.修改由于意见悬浮框引起的界面的padding不正确的问题
2.修改问卷调查左侧会出现滚动条的问题
|
10 years ago |
