 cxt
|
cb5ca96bb5
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_homework.html.erb
db/schema.rb
|
2016-11-11 16:53:20 +08:00 |
|
cxt
|
16c51e1eaa
|
基于项目的分组作业没有显示项目详情
|
2016-11-11 16:50:25 +08:00 |
 huang
|
50a14ad5fe
|
修改判断整数的方法
|
2016-11-11 14:26:58 +08:00 |
|
cxt
|
07b97c8eb9
|
学生列表增加删除功能、删除学生时删除其对应的作品
|
2016-11-11 13:58:07 +08:00 |
|
huang
|
b633200ab6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 10:38:10 +08:00 |
|
huang
|
aab24ea34a
|
解决顶部fork路由错误，已经fork过该项目的添加提示
|
2016-11-11 10:37:20 +08:00 |
 yuanke
|
c59081c824
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-11 10:24:22 +08:00 |
|
yuanke
|
eb56a134d3
|
作业微信通知消息改为异步发送并且只发送给学生
|
2016-11-11 09:28:10 +08:00 |
|
yuanke
|
88d489b485
|
作业列表设留言at消息为已读改为delay_job执行
|
2016-11-10 10:41:35 +08:00 |
|
huang
|
0f328c9c58
|
解决用户ID转换成用户名后引发的问题
|
2016-11-10 10:27:57 +08:00 |
|
cxt
|
78ca68b5e3
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/css/moduel.css
public/stylesheets/css/public.css
|
2016-11-04 16:15:56 +08:00 |
|
yuanke
|
fc19a468b7
|
优化留言速度
|
2016-11-04 11:30:11 +08:00 |
|
cxt
|
20f112d5ad
|
作业评分设置的调整
|
2016-11-04 09:23:23 +08:00 |
|
yuanke
|
7064e5b413
|
注册优化
|
2016-11-03 11:19:00 +08:00 |
|
yuanke
|
08e9b8d563
|
.
|
2016-11-03 11:11:52 +08:00 |
|
yuanke
|
4451ac80a0
|
.
|
2016-11-03 10:53:55 +08:00 |
|
yuanke
|
a075b6d237
|
.调试
|
2016-11-03 10:41:51 +08:00 |
|
huang
|
3af78a4b74
|
用户注册回调优化
|
2016-10-28 16:06:41 +08:00 |
|
huang
|
b0b5e203b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-28 14:20:12 +08:00 |
|
huang
|
d2138dd872
|
里程碑中增加创建者、项目私有公开显示特性
|
2016-10-28 14:20:00 +08:00 |
|
yuanke
|
abbf39848b
|
Merge branch 'yuanke_youhua' into develop
|
2016-10-28 13:23:59 +08:00 |
|
huang
|
3ef90a3c62
|
Merge branch 'dev_newproject' into develop
Conflicts:
db/schema.rb
|
2016-10-27 17:33:28 +08:00 |
|
yuanke
|
ca5e47b705
|
修改delay_job时间上限
|
2016-10-26 16:09:31 +08:00 |
|
yuanke
|
a882a919e5
|
调试
|
2016-10-26 15:07:32 +08:00 |
|
yuanke
|
3529bb6cf1
|
.
|
2016-10-26 14:58:23 +08:00 |
|
yuanke
|
513be115cd
|
调试
|
2016-10-26 14:44:44 +08:00 |
|
yuanke
|
e7bd24b552
|
.
|
2016-10-26 14:31:39 +08:00 |
|
yuanke
|
16fd8ff658
|
.
|
2016-10-26 14:00:28 +08:00 |
|
yuanke
|
653f485064
|
异步发送微信消息加点日志
|
2016-10-26 13:46:23 +08:00 |
|
yuanke
|
de5fb72ff3
|
调试
|
2016-10-26 13:41:58 +08:00 |
|
yuanke
|
c5ac0ed6b7
|
调试
|
2016-10-26 13:37:49 +08:00 |
|
yuanke
|
afa72a8acc
|
.
|
2016-10-26 11:30:44 +08:00 |
|
yuanke
|
a9136bd8d0
|
班级微信通知改为异步发送
|
2016-10-26 11:18:05 +08:00 |
|
huang
|
16b6c55637
|
注释掉id转换成登录名
|
2016-10-20 13:34:02 +08:00 |
|
huang
|
1b8bf05be5
|
用户ID装换成用户名
|
2016-10-20 13:26:11 +08:00 |
|
cxt
|
6109a1602b
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-19 18:11:02 +08:00 |
|
cxt
|
26121d895f
|
袁可 编程测试
|
2016-10-19 18:09:29 +08:00 |
|
cxt
|
e102815f60
|
个人主页
|
2016-10-19 18:03:59 +08:00 |
|
huang
|
207273839b
|
Merge branch 'dev_newrep' into dev_newproject
Conflicts:
app/controllers/projects_controller.rb
app/views/projects/settings/_new_repositories.html.erb
|
2016-10-19 08:53:38 +08:00 |
|
cxt
|
a1b70a7e91
|
Merge branch 'cxt_course' into develop
|
2016-10-14 16:18:12 +08:00 |
|
huang
|
b9d87b1b29
|
Merge branch 'develop' into rep_quality
Conflicts:
public/stylesheets/css/project.css
|
2016-10-14 15:43:45 +08:00 |
|
huang
|
333c9c6db0
|
项目历史版本一键删除功能
|
2016-10-14 15:01:22 +08:00 |
|
cxt
|
12ad7c1612
|
班级讨论区增加二级子栏目
|
2016-10-14 14:28:19 +08:00 |
|
yuanke
|
5ac30fe09c
|
Merge branch 'cxt_replies' into weixin_guange
|
2016-10-13 08:49:20 +08:00 |
|
cxt
|
a581f989c9
|
给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复
|
2016-10-11 14:08:44 +08:00 |
|
yuanke
|
163abb70de
|
课程搜索只能搜索title
|
2016-10-10 14:00:10 +08:00 |
|
yuanke
|
b94553edcd
|
搜索修改及代码优化
|
2016-10-10 09:38:21 +08:00 |
|
cxt
|
9f72539845
|
本地版新建班级报500
|
2016-10-09 16:11:34 +08:00 |
|
huang
|
acb6fcfc81
|
Merge branch 'develop' into dev_newrep
|
2016-10-09 15:36:49 +08:00 |
|
yuanke
|
5d5306dede
|
搜索课程
|
2016-10-09 15:05:50 +08:00 |