 sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
10 years ago |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
10 years ago |
 z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
10 years ago |
 huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
10 years ago |
|
lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
10 years ago |
|
sw
|
05c74960a8
|
1、增加当前选择的TAG云的样式
2、当选择TAG云过滤之后，对TAG进行添加、删除操作时继续选中该TAG
|
10 years ago |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
10 years ago |
|
sw
|
5649f4c5a1
|
过滤之后现在所有的TAG云
|
10 years ago |
|
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
10 years ago |
|
sw
|
e334dd69f8
|
上传课件后TAG云消失
|
10 years ago |
|
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
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 |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
10 years ago |
|
sw
|
94580ba040
|
11
|
10 years ago |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
10 years ago |
|
sw
|
73ed8b9558
|
全站搜索是不输入条件搜索结果为空
|
10 years ago |
|
sw
|
0f6d2676e5
|
tag云显示搜索结果的TAG云
|
10 years ago |
|
sw
|
2e3294a341
|
1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
10 years ago |
|
sw
|
676cf8f180
|
课程上传资源是根据上传的类型，对资源添加默认的TAG
|
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
|
7dbd20e5eb
|
修复刷新页面时只评论未评分表的作品在已评列表中
|
10 years ago |
|
sw
|
d1f42a3954
|
教师只评论不评分的作品在未批和已批列表中都有
|
10 years ago |
|
sw
|
78dff36d7a
|
老师只评论不评分的学生作业却在已评列表
|
10 years ago |
|
sw
|
ee68828132
|
创建课程后跳转URL报错
|
10 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
10 years ago |
|
sw
|
c60515ac50
|
学生作业增加按学生真实姓名、昵称、学号搜索功能
|
10 years ago |
|
sw
|
e4b2092c7f
|
实现项目成员列表增加成员，以及用户/角色留空时的提示信息
|
10 years ago |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
10 years ago |
|
sw
|
fb935f124c
|
完成修改项目界面
|
10 years ago |
|
sw
|
858a54267f
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
guange
|
f94184bc81
|
个人动态权限部分性能优化
|
10 years ago |
|
sw
|
6b758375f8
|
1、搜索课程报500
2、课程讨论区描述换行显示
|
10 years ago |
|
sw
|
9ebed65fde
|
课程动态：作业动态url不对
|
10 years ago |
|
guange
|
c489d2400b
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
5a876d9df1
|
邮件发送时，单个收件人会报错
|
10 years ago |
|
sw
|
7303253c07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
whimlex
|
3b84b0417a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
e030c12be8
|
课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序
|
10 years ago |
|
sw
|
988f8b7918
|
增加隐藏非项目信息按钮以及路由
实现点击按钮事数据的存储与修改
修改配置文件
|
10 years ago |
|
sw
|
c399ab2e4f
|
项目新闻 评论内容获取不正确
|
10 years ago |
|
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
10 years ago |
|
sw
|
dae907d0b8
|
1、课程通知无法添加评论
2、课程通知界面显示
3、课程通知评论取消按钮
|
10 years ago |
|
huang
|
d832514a55
|
新增项目成员列表
|
10 years ago |
|
sw
|
3bedddd190
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
lizanle
|
84c2e39e6c
|
新闻评论出现错误。误将safe_attributes换为直接属性comments
|
10 years ago |
|
sw
|
8e38103bfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
1009f7ac07
|
资源id判空
|
10 years ago |
|
sw
|
4044cc6674
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
42124e8ec5
|
开启、关闭匿评是有时候报500
|
10 years ago |
|
sw
|
500b54a466
|
讨论区回复引用是html代码
|
10 years ago |
|
lizanle
|
717463076c
|
删除democontroller
|
10 years ago |
|
sw
|
ec8e609ddc
|
打爆下载增加权限、增加打包下载功能
|
10 years ago |
|
sw
|
a1a761266b
|
Merge branch 'szzh' into guange_dev
|
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 |
|
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
10 years ago |
|
guange
|
893f6af856
|
用回rubyzip, zipruby有bug.
|
10 years ago |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 years ago |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
10 years ago |
|
guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
10 years ago |
|
z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
10 years ago |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
10 years ago |
|
z9hang
|
c4e9321e14
|
将attachment_candown方法提取到application_help里面
|
10 years ago |
|
z9hang
|
e2eaae63f4
|
资源模块，默认按时间降序排列
|
10 years ago |
|
z9hang
|
5bbc562abd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
eabcd4e92b
|
项目资源模块新界面（列表显示，排序等功能，样式尚未调）
|
10 years ago |
|
sw
|
94ecc3e59e
|
1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
|
10 years ago |
|
guange
|
51dbc43ecf
|
修改apache中git认证文件路径，user.passwd ==> htdocs/user.passwd
|
10 years ago |
|
sw
|
5640eae39b
|
删除课程成员
|
10 years ago |
|
sw
|
ed02959e00
|
修改成员角色
|
10 years ago |
|
sw
|
2af071a92e
|
课程添加成员后js提示
|
10 years ago |
|
sw
|
98bf8dd494
|
课程成员列表显示
|
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 |
|
z9hang
|
ef7949584c
|
课程资源tag点击报错问题，回退后删除无效问题
|
10 years ago |
|
sw
|
9af60424c2
|
去除错误代码
|
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 |
|
z9hang
|
61b220c913
|
课程资源库删除资源tag失效问题
|
10 years ago |
|
sw
|
fcbcdffa44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
z9hang
|
ddecd61926
|
课程资源添加标签时无样式问题
|
10 years ago |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
10 years ago |
|
sw
|
ed92faaedd
|
关闭课程与重开课程js
|
10 years ago |
|
sw
|
0d04eb745f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
z9hang
|
35eb7e80af
|
讨论区留言分页
|
10 years ago |
|
lizanle
|
5f203ec8c0
|
新建论坛或者回复,如果传图了，要更新资源的owner
|
10 years ago |
|
z9hang
|
57dad3f3c7
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
z9hang
|
8ef9779b46
|
修正课程讨论区样式。修正项目讨论区被影响的样式
|
10 years ago |
|
sw
|
53eef164c9
|
新建课程时layout修改
|
10 years ago |
|
sw
|
2bb7153131
|
去掉作业打包下载功能
|
10 years ago |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
10 years ago |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
10 years ago |
|
sw
|
cfe487e217
|
搜素学生后内容清空
|
10 years ago |
|
sw
|
ab3a3a8573
|
学生收索功能
|
10 years ago |
|
sw
|
92808fe8ea
|
完成学生列表界面
|
10 years ago |
|
sw
|
5f41c92cb3
|
学生列表界面静态显示
|
10 years ago |
|
guange
|
4b636d8be6
|
#1801 打包上传分个数下载完成
|
10 years ago |
|
guange
|
15accd7d9f
|
下载功能优化, 功能已实现
|
10 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
|
10 years ago |
|
z9hang
|
19eaa012b7
|
讨论区样式调整
|
10 years ago |
|
sw
|
2ef10e89ac
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
f5059147d2
|
修改学生提交作业界面的layout
|
10 years ago |
|
sw
|
c4cd61c71b
|
修改学生提交作业界面的layout
|
10 years ago |
|
sw
|
0496c33378
|
添加部分方法的注释
|
10 years ago |
|
z9hang
|
a2ec9c661a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
584dcabeaa
|
修改学生作业列表弹出框不正确
|
10 years ago |
|
sw
|
221276ba1f
|
增加老师布置作业学生访问的列表
|
10 years ago |
|
sw
|
0408cc5150
|
去除无用代码
|
10 years ago |
|
sw
|
37bd338311
|
1、老师修改作业增加默认值显示
2、学生提交作业列表修改layout
|
10 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
|
10 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
10 years ago |
|
z9hang
|
aaf14d5d1a
|
修改课程通知页面
|
10 years ago |
|
huang
|
dc0c9417e3
|
修改新提交的作业显示在前面
|
10 years ago |
|
z9hang
|
5278d4dd2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
4ca5687b3b
|
#2072测试版--项目--问题跟踪：成功新建问题后建议提示信息为“问题已创建”就好
|
10 years ago |
|
lizanle
|
cdad43fdfc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a4567396e4
|
如果没有上传图片就会报空指针
|
10 years ago |
|
sw
|
0c4f88ca29
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
10 years ago |
|
sw
|
6edbb3c7ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
10 years ago |
 dingxu
|
073cb07f70
|
邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、
展开条样式修改
|
10 years ago |
|
dingxu
|
7b3af413cd
|
邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
|
10 years ago |
|
sw
|
46410c8e8d
|
1、修改删除TAG后js刷新页面
2、删除课程TAG时增加提示
|
10 years ago |
|
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
10 years ago |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
10 years ago |
|
huang
|
4ae5e2af7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
6498002c71
|
修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug
原因：里面逻辑判断错误
|
10 years ago |
|
guange
|
c45850eb8a
|
git hook改为异步
|
10 years ago |
|
guange
|
dc29ccf3b7
|
1. git仓库新建时加入hook代码
2. 对现有的旧hook代码进行更新的rake任务
|
10 years ago |
|
lizanle
|
b4f99c75da
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e49bb18b62
|
cotroller修改：删除记录的同时删除对应的文件
|
10 years ago |
|
z9hang
|
86c4a7f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
930486d21e
|
#2024 course主页：点击进入非当前用户的所在学校，如图，不显示“我的课程”了
|
10 years ago |
|
lizanle
|
41f302c467
|
cotroller修改
|
10 years ago |
|
guange
|
6c87cd40c1
|
加入git回调接口
|
10 years ago |
|
sw
|
1e897687d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
36554aa90a
|
#2041 项目--问题跟踪：成功新建缺陷给出的提示信息错误
|
10 years ago |
|
lizanle
|
86020804c9
|
ok
|
10 years ago |
|
lizanle
|
33669017bf
|
controller
|
10 years ago |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
10 years ago |
|
sw
|
88d6b25ace
|
1、修改意见反馈图片
2、去掉个人首页权限判断
|
10 years ago |
|
guange
|
e798b7242b
|
Merge remote branch 'remotes/origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
f3d6d7c384
|
#2037 issue列表默认显示顺序改为最后更新的倒序
|
10 years ago |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
10 years ago |
