 sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
2015-04-28 12:21:35 +08:00 |
|
sw
|
0970182cd5
|
当教师只评分不评论时，学生可以进行回复
修改作业评论回复框样式不正确，修改项目用户反馈框显示不正确
|
2015-04-27 17:25:42 +08:00 |
 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
|
2015-04-16 10:26:03 +08:00 |
whimlex
|
e030c12be8
|
课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序
|
2015-04-09 15:18:13 +08:00 |
|
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
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
2015-04-07 13:47:39 +08:00 |
 lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
2015-04-03 11:19:15 +08:00 |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
2015-03-06 08:59:29 +08:00 |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
2015-03-04 15:32:00 +08:00 |
 alan
|
6f9e2bad63
|
mail weekly
|
2015-02-06 18:15:08 +08:00 |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
2015-01-09 15:28:43 +08:00 |
|
lizanle
|
10cde37582
|
cache using version
|
2015-01-07 09:27:44 +08:00 |
 z9hang
|
cb87d6337c
|
留言修改
|
2014-11-02 14:41:41 +08:00 |
|
z9hang
|
ed3e9e3a03
|
项目成员列表积分计算的初步优化（降低访问速度）
|
2014-08-18 17:14:31 +08:00 |
|
z9hang
|
caed78327a
|
积分计算修改
|
2014-08-13 11:17:22 +08:00 |
 nwb
|
dfdc58719a
|
课程主留言添加删除功能
|
2014-07-28 10:46:05 +08:00 |
|
z9hang
|
4542b9e21a
|
积分修改
|
2014-07-24 18:05:37 +08:00 |
|
z9hang
|
0bcc0beaf1
|
修复留言计分
|
2014-07-01 10:31:44 +08:00 |
|
z9hang
|
4906bad7d2
|
修正进项目报错异常
|
2014-07-01 09:15:53 +08:00 |
|
z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
2014-06-30 16:19:28 +08:00 |
|
nwb
|
beeab518e8
|
课程动态中留言链接BUG修复
|
2014-06-27 11:24:48 +08:00 |
|
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
2014-06-26 08:53:16 +08:00 |
|
z9hang
|
50dbe3d04a
|
添加记录得分变化功能
|
2014-06-17 15:57:31 +08:00 |
|
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
2014-06-17 10:12:44 +08:00 |
|
nwb
|
8a274981ce
|
修改课程动态
|
2014-06-13 11:49:28 +08:00 |
|
z9hang
|
e606fd89d2
|
被关注+2分、取消关注-2分
讨论区帖子加顶踩功能
顶踩帖子加减分接口
|
2014-06-11 17:41:47 +08:00 |
|
z9hang
|
7eb3c9f874
|
缺陷留言+1分、
更改缺陷状态+1分、
对留言回复+1分、
对帖子的回复+1分、
添加分数修正方法，分数为负时修正为0
|
2014-06-10 17:47:10 +08:00 |
|
nwb
|
8768193e72
|
添加课程资源文件全部列表视图
|
2014-06-09 17:33:43 +08:00 |
|
nwb
|
54505340eb
|
1.修正新建课程错误
2.优化课程角色权限判断
|
2014-06-09 10:26:45 +08:00 |
|
nwb
|
388d14f075
|
迁移课程原讨论区数据
|
2014-06-06 08:50:46 +08:00 |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
2014-05-17 15:39:18 +08:00 |
|
sw
|
029eb1a195
|
作业回复
|
2014-05-16 11:04:08 +08:00 |
yanxd
|
404568be89
|
留言url显示，以及留言分页的url处理
|
2014-03-22 09:27:29 +08:00 |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
2014-03-19 17:32:32 +08:00 |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
2014-03-13 22:06:49 +08:00 |
|
yanxd
|
ce1e6c49f1
|
改留言
|
2014-03-07 16:49:45 +08:00 |
|
yanxd
|
eafbb20807
|
匿名用户禁止回复
|
2014-01-06 21:11:20 +08:00 |
|
yanxd
|
8618ad3ede
|
add access methods for delete
|
2013-12-30 20:16:56 +08:00 |
|
yanxd
|
8a1316cf8f
|
删除留言操作
|
2013-12-26 19:28:18 +08:00 |
|
yanxd
|
a01123c5bf
|
d
|
2013-12-26 08:43:16 +08:00 |
|
yanxd
|
605d7ec565
|
ajax message fix
|
2013-12-26 08:39:43 +08:00 |
|
yanxd
|
f05d2131bd
|
组织留言数据方法
|
2013-12-25 15:40:34 +08:00 |
|
yanxd
|
ff317e48e9
|
words jourformessage design ing...
|
2013-12-25 09:17:15 +08:00 |
 nieguanghui
|
f3ce918699
|
留言修改
|
2013-12-24 16:42:56 +08:00 |
|
yanxd
|
99686ec269
|
留言不能是空字符
|
2013-12-21 10:15:41 +08:00 |
|
huangjingquan
|
0c5c07a5a3
|
对留言在动态里面的显示进行了修改！
|
2013-12-09 17:10:10 +08:00 |
|
huangjingquan
|
f99e5dcc64
|
修改了之前留言回复双重显示的问
|
2013-12-09 16:01:50 +08:00 |
|
huangjingquan
|
096f0eed03
|
添加了留言结果在用户动态里面显示
|
2013-12-04 21:24:52 +08:00 |
 fanqiang
|
238b9a416f
|
修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈
|
2013-08-11 10:36:55 +08:00 |
|
fanqiang
|
4835cab6e4
|
添加了用户查找反馈的功能，可以查看对用户评论的引用和对用户需求的评论。解决了留言问题
|
2013-08-06 22:26:52 +08:00 |
|
fanqiang
|
7949e1166c
|
添加备注
|
2013-08-04 10:59:25 +08:00 |