 lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
2015-11-17 16:48:03 +08:00 |
|
lizanle
|
0eff2bcb74
|
课程添加允许学生发布资源的配置
|
2015-11-17 16:43:50 +08:00 |
 ouyangxuhua
|
10dedcb7be
|
增加组织成员加入时间
|
2015-11-16 15:39:59 +08:00 |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
2015-11-16 15:02:57 +08:00 |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-11-13 17:27:33 +08:00 |
|
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-13 17:21:44 +08:00 |
 cxt
|
ab868d7b65
|
课程通知增加置顶
|
2015-11-12 16:52:42 +08:00 |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
2015-11-12 09:32:00 +08:00 |
|
cxt
|
2a82f33227
|
个人首页的留言动态显示不合理
|
2015-11-09 16:08:15 +08:00 |
|
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-04 11:16:25 +08:00 |
|
cxt
|
ee7b21de72
|
禁用匿评功能
|
2015-11-04 10:54:09 +08:00 |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
2015-11-03 11:19:38 +08:00 |
|
ouyangxuhua
|
636063c6ca
|
添加组织表和组织成员表
|
2015-11-02 17:22:09 +08:00 |
|
cxt
|
f5aaf7ac58
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-30 13:59:33 +08:00 |
|
cxt
|
6dcc97d5d1
|
添加作业的发布功能
|
2015-10-30 13:58:54 +08:00 |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
2015-10-28 15:54:27 +08:00 |
 huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-27 14:42:05 +08:00 |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
2015-10-24 15:34:43 +08:00 |
|
huang
|
147cdf3018
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-20 14:26:21 +08:00 |
|
cxt
|
d049a00655
|
删除课程动态中未发布问卷的动态
|
2015-10-20 10:28:16 +08:00 |
|
cxt
|
90ee4bbe60
|
删除空的课程动态
|
2015-10-20 09:55:51 +08:00 |
|
cxt
|
dbbdae1be2
|
附件迁移文件的修改
|
2015-10-20 09:24:50 +08:00 |
|
cxt
|
0b565b1be0
|
私有课程的课件迁移
|
2015-10-19 17:34:59 +08:00 |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-16 09:07:38 +08:00 |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
2015-10-15 16:22:49 +08:00 |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
2015-10-14 11:38:16 +08:00 |
|
cxt
|
b9b7f6fa9e
|
个人主页留言动态的实现
|
2015-10-13 16:51:44 +08:00 |
|
huang
|
73898953d9
|
project表添加字段，记录project对应gitlba中project id
|
2015-10-13 10:58:22 +08:00 |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
2015-10-10 16:09:05 +08:00 |
 sw
|
11736eb266
|
迁移文件有问题
|
2015-09-30 10:16:55 +08:00 |
|
cxt
|
452766bade
|
课程通知的动态排序时间调整
|
2015-09-30 09:58:29 +08:00 |
|
sw
|
774b00f2d4
|
数据迁移错误
|
2015-09-29 11:19:53 +08:00 |
|
huang
|
5f26e331c6
|
缺陷截止时间到了消息通知
|
2015-09-28 17:31:55 +08:00 |
|
cxt
|
a2d6168043
|
课程动态的数据迁移
|
2015-09-28 10:51:44 +08:00 |
|
huang
|
38ba47f8c8
|
讨论区结构修改
任务中添加：自动开启/关闭匿评消息通知
匿评开启失败消息通知
|
2015-09-24 16:16:37 +08:00 |
|
huang
|
c9bedb2362
|
Merge branch 'szzh' into dev_hjq
|
2015-09-19 11:01:48 +08:00 |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
2015-09-18 23:18:15 +08:00 |
|
sw
|
34db84e79f
|
test
|
2015-09-18 20:27:13 +08:00 |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 17:51:11 +08:00 |
|
sw
|
20b4c056a8
|
历史数据：普通作业改为匿评作业
|
2015-09-18 16:19:30 +08:00 |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
|
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 11:34:29 +08:00 |
|
sw
|
a8c5d18069
|
1、之前普通作业更改为匿评作业。。。
2、系统评分为null时默认为0
|
2015-09-18 09:32:25 +08:00 |
|
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
2015-09-17 16:23:09 +08:00 |
|
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
2015-09-17 15:50:33 +08:00 |
|
sw
|
84bb5af86f
|
增加教师优先字段
|
2015-09-17 10:24:37 +08:00 |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
2015-09-15 17:39:57 +08:00 |
|
huang
|
4a7d3c9072
|
系统消息增加长度
|
2015-09-14 15:33:11 +08:00 |
|
cxt
|
42ddc0bf3c
|
迁移文件
|
2015-09-11 17:19:40 +08:00 |