 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 |
|
huang
|
d827b3e519
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-09 13:44:46 +08:00 |
|
huang
|
5f1458483c
|
修改attachment字段类型，解决字段长不能上传的问题
|
2016-10-09 13:44:32 +08:00 |
|
yuanke
|
28d6bca3df
|
搜索课程
|
2016-10-09 13:29:13 +08:00 |
|
yuanke
|
9dd6a65316
|
搜索课程
|
2016-10-09 13:16:03 +08:00 |
|
yuanke
|
1fe2f8946b
|
搜索课程.
|
2016-10-09 12:10:34 +08:00 |
|
yuanke
|
f380c64653
|
搜索课程
|
2016-10-09 11:27:35 +08:00 |
|
yuanke
|
eb3a463166
|
Merge branch 'develop' into weixin_guange
|
2016-10-09 10:36:18 +08:00 |
|
yuanke
|
d407b5ab10
|
搜索中加入课程
|
2016-10-09 10:35:43 +08:00 |
|
huang
|
45d8e64840
|
修改gitlab tree返回类型（lastrev）
|
2016-10-09 09:30:20 +08:00 |
|
cxt
|
f0e334d33d
|
分组作业的迟交扣分和缺评扣分
|
2016-10-09 09:16:05 +08:00 |
|
cxt
|
7f3bb0be63
|
教师团队中上移、下移功能的完善
|
2016-10-08 13:54:35 +08:00 |
|
huang
|
db54d6e0d9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-09-26 22:21:45 +08:00 |
|
huang
|
528aeaff89
|
Merge branch 'rep_quality' into develop
|
2016-09-26 22:20:08 +08:00 |
|
cxt
|
398a6f1da7
|
Merge branch 'cxt_course' into develop
|
2016-09-23 16:50:45 +08:00 |
|
cxt
|
70042fe91f
|
帖子详情页面的优化
|
2016-09-23 16:44:49 +08:00 |
|
huang
|
a8acb4a6cb
|
项目base功能添加
|
2016-09-23 10:36:47 +08:00 |
|
cxt
|
caf5602389
|
课程大纲教师团队的管理
|
2016-09-23 09:22:47 +08:00 |
|
yuanke
|
0a9d288880
|
Merge branch 'weixin_guange' into develop
|
2016-09-22 13:41:52 +08:00 |