 huang
|
a74e5f9d30
|
添加项目动态数迁移
|
2016-01-12 15:18:40 +08:00 |
|
huang
|
f3b732460c
|
添加项目统计字段
|
2016-01-11 14:57:52 +08:00 |
|
huang
|
fd2197a73d
|
项目资源库历史数据迁移
搜索功能添加Version类型判断
|
2016-01-08 11:01:29 +08:00 |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-06 09:27:00 +08:00 |
|
huang
|
be218baa52
|
添加迁移：项目讨论区数据重复问题
|
2016-01-05 15:59:13 +08:00 |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
2016-01-04 17:05:32 +08:00 |
|
huang
|
11444f43f0
|
解决issue多附件，删除一个附件后，提交弹出白色框框的问题
|
2015-12-31 17:55:48 +08:00 |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
2015-12-31 15:44:57 +08:00 |
 cxt
|
9b974b6170
|
Merge branch 'cxt_course' into szzh
Conflicts:
db/schema.rb
|
2015-12-31 15:39:07 +08:00 |
 ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
2015-12-31 13:26:28 +08:00 |
|
lizanle
|
b059ab2428
|
schema.rb
|
2015-12-31 11:13:44 +08:00 |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
2015-12-31 11:12:09 +08:00 |
|
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-12-31 11:11:38 +08:00 |
|
lizanle
|
90c63192e6
|
历史资源模型修改
|
2015-12-30 10:32:32 +08:00 |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
2015-12-29 17:13:01 +08:00 |
|
ouyangxuhua
|
77e0f0cd08
|
转发帖子新建帖子，并更新相关表
|
2015-12-29 15:49:24 +08:00 |
 Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
2015-12-24 10:40:00 +08:00 |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
2015-12-22 15:48:41 +08:00 |
|
huang
|
dae6e68623
|
renwu
|
2015-12-18 20:46:17 +08:00 |
|
cxt
|
c6e7c8860d
|
dd
|
2015-12-18 15:45:23 +08:00 |
|
lizanle
|
70f93741d6
|
issue图标问题
|
2015-12-18 14:38:04 +08:00 |
|
lizanle
|
5d47afdc43
|
issue 删除回复的权限问题
|
2015-12-18 09:46:28 +08:00 |
 guange
|
d703f75c98
|
merge
|
2015-12-18 09:23:52 +08:00 |
|
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
|
huang
|
b87943ff1d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
处理冲突
|
2015-12-18 09:17:18 +08:00 |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
2015-12-17 18:17:38 +08:00 |
|
huang
|
721a007779
|
删除 由于course、project一张表而引起的历史数据异常问题
|
2015-12-17 13:22:41 +08:00 |
|
lizanle
|
71f6a637e0
|
帖子按时间倒排
|
2015-12-16 17:26:19 +08:00 |
|
guange
|
c0de5d55de
|
加入了issue的at消息提醒
|
2015-12-16 16:37:00 +08:00 |
|
cxt
|
5cf88a287b
|
分组作业提示语的修改
|
2015-12-16 11:37:59 +08:00 |
|
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
2015-12-16 10:00:10 +08:00 |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
2015-12-14 10:26:34 +08:00 |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
2015-12-11 14:59:52 +08:00 |
|
huang
|
fed989753a
|
修复林处账号不能查看消息的问题
|
2015-12-11 13:46:23 +08:00 |
|
huang
|
9710731a2c
|
课程配置添加登录名
|
2015-12-10 20:03:59 +08:00 |
|
huang
|
fbba933a46
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2015-12-10 16:09:42 +08:00 |
|
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
2015-12-10 16:09:36 +08:00 |
|
lizanle
|
433059e1bc
|
schema
|
2015-12-10 10:12:54 +08:00 |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
|
huang
|
ac9f13c842
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
Conflicts:
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 17:13:50 +08:00 |
 houxiang
|
56cb83ffba
|
版本库首页没有统计commit_count，具体的详情页在开始统计
|
2015-12-08 15:56:31 +08:00 |
|
huang
|
42f5b86d95
|
添加字段删除课程
|
2015-12-08 10:32:10 +08:00 |
|
huang
|
068c305c06
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
Conflicts:
app/views/courses/member.html.erb
app/views/courses/settings.html.erb
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 09:10:21 +08:00 |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
2015-12-07 09:47:18 +08:00 |
|
huang
|
bd3d0547f5
|
组织样式修改
|
2015-12-05 14:34:16 +08:00 |
|
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
2015-12-04 16:42:02 +08:00 |
|
lizanle
|
0a5a33c2de
|
schema
|
2015-12-04 16:36:03 +08:00 |