 ouyangxuhua
|
a8b7d1b81f
|
回复项目里的message,不增加项目动态及组织动态
|
2015-12-07 17:11:30 +08:00 |
 huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
2015-11-30 14:35:37 +08:00 |
 lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
|
huang
|
ae9f1c704a
|
500问题
|
2015-11-27 18:36:38 +08:00 |
|
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
2015-11-26 18:22:03 +08:00 |
|
lizanle
|
dcd441a9db
|
全站搜索
|
2015-11-26 16:43:10 +08:00 |
 cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-25 16:32:25 +08:00 |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
2015-09-25 16:29:47 +08:00 |
|
huang
|
fcf34b5918
|
修复项目配置中“私有” “公开”问题
|
2015-09-24 16:38:36 +08:00 |
|
huang
|
2d282f73cb
|
项目讨论区
|
2015-08-19 11:21:48 +08:00 |
|
huang
|
4bc0e0eb69
|
项目模块消息添加
讨论区结构优化
|
2015-08-18 10:31:40 +08:00 |
|
huang
|
2cb5292dc1
|
完成课程讨论区消息回复方法
|
2015-08-15 00:08:05 +08:00 |
|
huang
|
4013ff486a
|
消息界面调整
|
2015-08-14 17:35:10 +08:00 |
 sw
|
465af5e2d3
|
增加课程动态，以及课程内相关活动时动态的添加
|
2015-08-11 15:54:05 +08:00 |
 yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
2015-06-04 15:55:41 +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 |
 guange
|
113e11f6cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/models/comment.rb
app/models/message.rb
app/models/news.rb
|
2015-04-03 11:34:39 +08:00 |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
2015-04-03 11:19:15 +08:00 |
|
guange
|
89e0602983
|
邮件发送去除 observer, 一句代码的功能隐藏在别的文件里，很难注意到
|
2015-04-01 11:12:55 +08:00 |
|
lizanle
|
140cb81748
|
测试版发布课程通知和讨论区发布新帖报500
|
2015-03-06 11:38:32 +08:00 |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
2015-03-04 15:32:00 +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 |
 alan
|
fecf9513b9
|
修改bug《课程讨论区老师不能给帖子置顶》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-01 23:30:10 +08:00 |
 chenmin
|
80bd535b4f
|
课程讨论区回复帖子的内容增加删除附件功能；
增加可以编辑自己回复内容的功能；
|
2014-08-20 09:30:26 +08:00 |
 z9hang
|
ed3e9e3a03
|
项目成员列表积分计算的初步优化（降低访问速度）
|
2014-08-18 17:14:31 +08:00 |
|
z9hang
|
caed78327a
|
积分计算修改
|
2014-08-13 11:17:22 +08:00 |
|
z9hang
|
c60188038e
|
得分机制修改
|
2014-07-29 18:04:35 +08:00 |
|
z9hang
|
225e3c396a
|
个人得相关分方法添加
|
2014-07-29 10:06:48 +08:00 |
|
z9hang
|
4542b9e21a
|
积分修改
|
2014-07-24 18:05:37 +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
|
59a261d96d
|
1.优化课程通知动态和权限判断
2.优化课程通知讨论区动态和权限判断
|
2014-06-16 10:38:38 +08:00 |
|
nwb
|
8a274981ce
|
修改课程动态
|
2014-06-13 11:49:28 +08:00 |
|
nwb
|
863dec03d2
|
添加课程讨论区show视图
|
2014-06-12 10:03:01 +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 |
|
z9hang
|
ee030e6fb5
|
讨论区发帖协同得分+2
|
2014-06-09 17:37:48 +08:00 |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
2014-06-06 13:56:48 +08:00 |
yanxd
|
fea1cdff53
|
首页时间排序，可能会引起其他调用event_datetime的问题。待观察
|
2013-12-27 13:54:57 +08:00 |
|
yanxd
|
c272783f1c
|
工具栏边距调整，讨论区的修改删除功能，项目竞赛边框顶出页面的问题。
|
2013-12-07 10:15:55 +08:00 |
|
yanxd
|
d29154cc24
|
hot memo merged board/topic.
|
2013-12-06 11:19:15 +08:00 |
 fanqiang
|
bb5e066d50
|
解决冲突
|
2013-08-12 17:30:31 +08:00 |
|
fanqiang
|
69e3dcee6c
|
修改用户活动，用户主页的其他部分添加分页
|
2013-08-12 15:37:42 +08:00 |
 huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |