 huang
|
f52058aaf3
|
课程首页新界面（未完成）
|
11 years ago |
 sw
|
e3379cf205
|
每页显示20份作业
|
11 years ago |
|
huang
|
fc8b5c60c6
|
切换分支处理
|
11 years ago |
guange
|
437d4e1009
|
zip下载必须得登录
|
11 years ago |
|
guange
|
c9b46e4e3a
|
头像上传bug修复
|
11 years ago |
|
sw
|
26ae4b7d74
|
用户头像不能上传
|
11 years ago |
|
huang
|
ceafa459fd
|
issues编辑时跳转问题
|
11 years ago |
|
sw
|
c289af2e7c
|
评分
|
11 years ago |
|
huang
|
379de18cd6
|
修改资源库全站搜索：
1、搜索条件为空的时候，不允许显示全部资源
2、全站搜索，非自己上传的资源不允许查看
3、全站搜索，项目管理员能设置公开权限的资源在全局搜索中也可以
|
11 years ago |
|
huang
|
2ac2884bf1
|
修改issue注入异常报错（比如项目名带点号）
|
11 years ago |
|
sw
|
ec1c9c2ac1
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
95a48b7da0
|
1、作品show界面详细内容填充
2、更新public.css
3、增加作品附件显示
|
11 years ago |
 alan
|
c18d1d9585
|
修改《匿名发布新帖》《编辑时出现跳转错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
a3fd541119
|
优化邮件邀请新用户、已注册用户
|
11 years ago |
|
sw
|
289fb393bf
|
编辑作品：当前用户为作品的作者 && （未开启匿评 || 未启用匿评）
|
11 years ago |
|
sw
|
bf63ca7854
|
已经创建过作品的用户不允许重复创建
|
11 years ago |
|
sw
|
8c72df74d6
|
1、增加返回顶部功能
2、点击作品名称，弹出详细信息
3、作品列表信息生成
|
11 years ago |
|
alan
|
a0ca31780e
|
修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
faeb06aae8
|
1、更新css文件
2、新建作品功能天津
3、老师新建作业时增加文件的保存
|
11 years ago |
|
sw
|
56723d106f
|
新建作品功能，以及相关js验证
|
11 years ago |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
sw
|
86b9daf821
|
1、增加学生新建、修改作品静态页面
2、homework_common_control增加权限判断
3、学生进入作业界面显示作业当前状态不正确
|
11 years ago |
|
alan
|
799f561d77
|
Merge branch 'szzh' into memcached_alan
Conflicts:
Gemfile
app/views/issues/index.html.erb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
25672aa229
|
编辑作业功能完成
|
11 years ago |
|
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
|
11 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
11 years ago |
 yutao
|
a35abf1f1f
|
修复bug#2180:课程资源库：成功引入资源后，“选人我的课程”未自动刷新为“选入我的其他课程”
|
11 years ago |
|
sw
|
09b3ba8a6a
|
更新css文件，新建作业静态页面
|
11 years ago |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
11 years ago |
|
huang
|
6e38895c3b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
196c3b48b1
|
资源库区分“引入我的项目”和“引入我的其它项目”
修复新建项目冲突
|
11 years ago |
|
yutao
|
085b86bbbe
|
修复bug#2585:IE11.0中--课程--学生列表：导出列表文件名乱码
|
11 years ago |
|
huang
|
b645a1aa1e
|
私有项目成员列表非项目成员不能通过URL访问
|
11 years ago |
|
huang
|
0123ea32bf
|
私有项目讨论区非项目成员、未登录情况不能访问
|
11 years ago |
|
huang
|
b19f61edcb
|
私有项目非项目成员不能通过url访问关注列表
|
11 years ago |
|
yutao
|
ff6173c5f5
|
修复bug#2623:留言—删除留言：当留言成功删除后，留言的数量需要手动刷新才会改变。
|
11 years ago |
|
yutao
|
4b58699ee9
|
修复bug#2270 :forge/course主页--搜索用户无任何作用
|
11 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
11 years ago |
|
guange
|
907d89e1cc
|
merge
|
11 years ago |
|
guange
|
a1240e8743
|
将过期改为1个月
|
11 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
11 years ago |
|
alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
af107d861b
|
将下载信息放到课程动态
|
11 years ago |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
11 years ago |
|
guange
|
f31fe81c5d
|
将课程通知中的附件提到列表和动态中
|
11 years ago |
|
alan
|
a8d19a119a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
fe2f6a0d9d
|
修改样式以及添加回复取消功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
406d608edc
|
版本库私有权限设置
--项目成员可以查看
--左侧入口隐藏
--禁止通过url访问
|
11 years ago |
|
guange
|
50575c1c20
|
issue的排序经一线人员使用，还是按创建时间排序好
|
11 years ago |
|
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
11 years ago |
|
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8773842801
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8e61136d7f
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
ee18ba7051
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/boards/_course_show.html.erb
app/views/boards/_project_show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
25bcc676b9
|
增加附件功能以及修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
f12a20f85e
|
用户修改资料保存报错
|
11 years ago |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
huang
|
f7ad600dde
|
发布帖子不能删除
|
11 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
11 years ago |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
11 years ago |
|
alan
|
23ef975c23
|
讨论区修改bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
78f30344b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
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>
|
11 years ago |
|
sw
|
3cb8962f01
|
登录后域名改为user.truestie.net
|
11 years ago |
|
alan
|
4bf08e49da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
0ec08f9361
|
打零分作品仍在未批作品列表显示
|
11 years ago |
|
alan
|
4546095ed4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
eee0df8d22
|
修改课程，项目的讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 lizanle
|
c9d66c7f5f
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
lizanle
|
f214a26329
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
700d2985f6
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
huang
|
aabdd1a4d7
|
剔除新建问题状态时不必要的代码
|
11 years ago |
|
sw
|
b456bc0e62
|
评分支持打0分
|
11 years ago |
|
guange
|
9ba55296f5
|
修改密码完成后跳到个人资料
|
11 years ago |
|
guange
|
bd54edd770
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
05428213a2
|
让session保持，防止长时间编辑时session丢失
|
11 years ago |
|
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
11 years ago |
|
alan
|
d73ed9e467
|
项目讨论区改版
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
31c78d295e
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
86af233042
|
修正autologin多终端登录问题
|
11 years ago |
|
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c67cfc6b6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into memcached_alan
|
11 years ago |
|
alan
|
c80263a66e
|
Merge branch 'guange_dev' into memcached_alan
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
config/environments/production.rb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
76b4ae24da
|
修改邮件邀请--邮件名
修改成用户点击同意按钮后才能加入项目
|
11 years ago |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
11 years ago |
|
huang
|
73798a0da4
|
修改邮件两次点击500错误
增加功能：在点击提交时代码后自动创建用户
用户自动登录功能
|
11 years ago |
|
guange
|
6c6ef757e1
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
|
guange
|
2afdd57fb6
|
修复服务器打包乱码问题
|
11 years ago |
|
sw
|
387ab567d2
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
11 years ago |
|
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
11 years ago |
|
sw
|
b3fb7914e2
|
课程通知评论编辑框不可用，解决方案：编辑跳转到新的页面
|
11 years ago |
|
sw
|
827d99fce4
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
0970182cd5
|
当教师只评分不评论时，学生可以进行回复
修改作业评论回复框样式不正确，修改项目用户反馈框显示不正确
|
11 years ago |
|
sw
|
f9aaaf38f9
|
打爆下载增加字符集
|
11 years ago |
|
guange
|
56f6fa0d86
|
设置zip支持unicode
|
11 years ago |
|
guange
|
24ce5191c3
|
zip打包可能有乱码
|
11 years ago |
|
sw
|
54ef7e3325
|
修改课程讨论区报错
|
11 years ago |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
11 years ago |
|
sw
|
75504139c9
|
删除课程留言时留言数自动刷新
|
11 years ago |
|
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
6d058940ec
|
当课程没有讨论区时自动创建其讨论区
|
11 years ago |
|
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀（未完成，需切换分支）
|
11 years ago |
|
sw
|
de192761b8
|
Merge branch 'szzh' into guange_dev
Conflicts:
Gemfile
config/application.rb
|
11 years ago |
|
guange
|
d2dd77612b
|
将登录默认值改为自动登录
|
11 years ago |
|
sw
|
09c51d1a87
|
修改创建作业未启用匿评时，所有作业列表看不到
|
11 years ago |
|
sw
|
d279881daf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/courses/settings.html.erb
|
11 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
|
11 years ago |
|
huang
|
ca26b0d819
|
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
app/views/users/show.html.erb
public/javascripts/course.js
|
11 years ago |
|
sw
|
57193b077e
|
作品列表取消分页显示
|
11 years ago |
|
lizanle
|
d6527f1f7e
|
去掉学生列表分页
|
11 years ago |
|
lizanle
|
da7528c780
|
重定向到项目配置里的新建版本页面
|
11 years ago |
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
11 years ago |
|
lizanle
|
2987253303
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
3b70ab964d
|
issue过滤
|
11 years ago |
|
huang
|
4cddb214fd
|
修改资源库站内搜索不能搜索的bug
|
11 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>
|
11 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
|
11 years ago |
|
lizanle
|
17838acddb
|
提示信息数组 flatten
|
11 years ago |
|
lizanle
|
15e54dd765
|
版本 输入名字不能为空
|
11 years ago |
|
lizanle
|
3620cd99b6
|
去掉错误的符号
|
11 years ago |
|
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
11 years ago |
|
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
11 years ago |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
11 years ago |
 z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
11 years ago |
|
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
11 years ago |
|
lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
sw
|
05c74960a8
|
1、增加当前选择的TAG云的样式
2、当选择TAG云过滤之后，对TAG进行添加、删除操作时继续选中该TAG
|
11 years ago |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
sw
|
5649f4c5a1
|
过滤之后现在所有的TAG云
|
11 years ago |
|
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
11 years ago |
|
sw
|
e334dd69f8
|
上传课件后TAG云消失
|
11 years ago |
|
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
11 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
|
11 years ago |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
11 years ago |
|
sw
|
94580ba040
|
11
|
11 years ago |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
11 years ago |
|
sw
|
73ed8b9558
|
全站搜索是不输入条件搜索结果为空
|
11 years ago |
|
sw
|
0f6d2676e5
|
tag云显示搜索结果的TAG云
|
11 years ago |
|
sw
|
2e3294a341
|
1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
11 years ago |
|
sw
|
676cf8f180
|
课程上传资源是根据上传的类型，对资源添加默认的TAG
|
11 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>
|
11 years ago |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
sw
|
7dbd20e5eb
|
修复刷新页面时只评论未评分表的作品在已评列表中
|
11 years ago |
|
sw
|
d1f42a3954
|
教师只评论不评分的作品在未批和已批列表中都有
|
11 years ago |
