 guange
|
11d1cac40d
|
可以通过gitlab创建项目
|
2015-10-21 17:13:07 +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 |
|
huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-15 15:47:59 +08:00 |
 lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
|
huang
|
554927d517
|
删除项目的时候，项目动态级联删除
|
2015-10-15 10:07:46 +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 |
|
huang
|
2768317d08
|
Merge branch 'szzh' into dev_hjq
|
2015-10-09 10:34:53 +08:00 |
|
huang
|
654ebfca46
|
项目邀请添加：姓、名、性别
|
2015-10-09 10:33:10 +08:00 |
|
huang
|
0064aa4278
|
系统消息不消失
系统消息和普通消息一致，按照时间排序
待优化点：数组排序
|
2015-10-08 16:10:33 +08:00 |
|
huang
|
88b8854ed7
|
修改吧主和发帖人消息重复的问题
|
2015-09-30 11:31:29 +08:00 |
|
huang
|
1eac300fb7
|
去掉打印结果
|
2015-09-29 16:21:36 +08:00 |
|
huang
|
3f6d64877a
|
1、老师发布作业自己能收到
2、关闭给所有人发
3、修改参数member问题
|
2015-09-29 15:59:48 +08:00 |
|
huang
|
5b0738a4cb
|
匿评启动失败邮件通知:实现程序及界面
|
2015-09-29 09:45:41 +08:00 |
|
huang
|
5f26e331c6
|
缺陷截止时间到了消息通知
|
2015-09-28 17:31:55 +08:00 |
|
huang
|
0a1798eb0b
|
Merge branch 'szzh' into dev_hjq
|
2015-09-28 15:44:32 +08:00 |
|
huang
|
c3422460ce
|
匿评失败邮件发送框架
|
2015-09-28 15:38:19 +08:00 |
|
huang
|
ba569403c3
|
1、匿评关闭/开启发送对象为所有成员
2、匿评方法封装
3、匿评开启/关闭邮件通知发送对象为课程所有成员
|
2015-09-28 15:35:08 +08:00 |
|
huang
|
2873412d1a
|
修改邮件--每天发送-》内容为空的问题
|
2015-09-28 15:06:23 +08:00 |
|
cxt
|
9190f0515d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 08:46:20 +08:00 |
|
huang
|
8c84179650
|
修改issue更新消息重复提示的问题
|
2015-09-25 17:52:34 +08:00 |
|
lizanle
|
f54149a5b7
|
发送动态 消息会重复
|
2015-09-25 16:53:23 +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
|
e15ea06e2a
|
修改邮件标题
|
2015-09-25 15:08:31 +08:00 |
|
guange
|
08eecbd5ec
|
merge
|
2015-09-25 09:30:32 +08:00 |
|
huang
|
20465764a7
|
Merge branch 'szzh' into dev_hjq
|
2015-09-24 17:20:36 +08:00 |
|
huang
|
fcf34b5918
|
修复项目配置中“私有” “公开”问题
|
2015-09-24 16:38:36 +08:00 |
|
guange
|
0b4c8b05f1
|
JAVA语言支持
|
2015-09-24 15:09:15 +08:00 |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
2015-09-24 13:44:37 +08:00 |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
2015-09-24 11:46:33 +08:00 |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
2015-09-24 10:15:23 +08:00 |
|
lizanle
|
d6c763edb0
|
取消 和 新建 贴吧的按钮都会清空贴吧表单
论坛标题字符长度限定160。是汉字的话只能输入80个
|
2015-09-23 09:11:29 +08:00 |
 sw
|
50817c3d64
|
编译错误时 计算系统评分不正确
|
2015-09-22 16:52:21 +08:00 |
|
huang
|
200861cfef
|
完成issue点对点消息通知
|
2015-09-22 16:08:30 +08:00 |
|
huang
|
48b93f2113
|
项目缺陷消息点对点发送
回复逻辑优化（未完成）
|
2015-09-21 17:51:00 +08:00 |
|
huang
|
b49d19cdb2
|
添加注释
|
2015-09-21 15:32:28 +08:00 |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
2015-09-19 11:21:45 +08:00 |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
2015-09-19 10:54:50 +08:00 |
|
guange
|
c99222820e
|
加入了python语言支持
|
2015-09-19 10:39:10 +08:00 |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
2015-09-19 00:03:45 +08:00 |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
2015-09-18 23:18:15 +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
|
ec4c7f531d
|
匿评作业成绩计算错误
|
2015-09-18 17:16:31 +08:00 |
|
sw
|
1d39df5469
|
C改为大写、编程属性设置的修改
|
2015-09-18 16:15:05 +08:00 |
|
huang
|
cfea5e9c89
|
邀请已注册用户 消息邀请信息
|
2015-09-18 15:25:45 +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 |