 huang
|
41cd038758
|
讨论区帖子添加锁定
|
11 years ago |
 ouyangxuhua
|
0d98dba25c
|
解决项目新建帖子中，点击取消按钮没有反应的问题
|
11 years ago |
|
ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
11 years ago |
 cxt
|
e86778a9c7
|
删除不存在的留言动态
|
11 years ago |
 Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
11 years ago |
|
ouyangxuhua
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
11 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
11 years ago |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
11 years ago |
 houxiang
|
3e57237969
|
修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔
|
11 years ago |
|
houxiang
|
e8511a6210
|
modify the gemfile conflict by hx
|
11 years ago |
|
huang
|
dae6e68623
|
renwu
|
11 years ago |
|
huang
|
747493993b
|
上线测试
|
11 years ago |
|
cxt
|
4d82beb4c7
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
 lizanle
|
793a98ade1
|
forge_activities那个运行批量删除回复动态脚本改动
|
11 years ago |
|
cxt
|
c6e7c8860d
|
dd
|
11 years ago |
|
lizanle
|
70f93741d6
|
issue图标问题
|
11 years ago |
|
lizanle
|
bba40de36d
|
journal不应该算入ForgeActivity，历史数据应该删除
|
11 years ago |
|
lizanle
|
5d47afdc43
|
issue 删除回复的权限问题
|
11 years ago |
guange
|
d703f75c98
|
merge
|
11 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
11 years ago |
|
huang
|
b87943ff1d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
处理冲突
|
11 years ago |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
guange
|
fc63dfcb7b
|
消息通知
|
11 years ago |
|
huang
|
721a007779
|
删除 由于course、project一张表而引起的历史数据异常问题
|
11 years ago |
|
lizanle
|
71f6a637e0
|
帖子按时间倒排
|
11 years ago |
|
guange
|
c0de5d55de
|
加入了issue的at消息提醒
|
11 years ago |
|
cxt
|
5cf88a287b
|
分组作业提示语的修改
|
11 years ago |
|
huang
|
41bb37d6d4
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
解决冲突
|
11 years ago |
|
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
11 years ago |
|
cxt
|
481b7b96eb
|
正式版报500
|
11 years ago |
|
cxt
|
699d0e22dd
|
删除多余学生的测验数据
|
11 years ago |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
11 years ago |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
11 years ago |
|
huang
|
fed989753a
|
修复林处账号不能查看消息的问题
|
11 years ago |
|
huang
|
9710731a2c
|
课程配置添加登录名
|
11 years ago |
|
huang
|
fbba933a46
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
11 years ago |
|
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
11 years ago |
|
ouyangxuhua
|
1e652faec7
|
Merge branch 'develop' into dev_hjq
|
11 years ago |
|
lizanle
|
433059e1bc
|
schema
|
11 years ago |
|
ouyangxuhua
|
2f7260cba2
|
1.在栏目表中增加field_type(类型)字段；
2.在组织配置-》栏目，增加栏目类型。
|
11 years ago |
|
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
11 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
11 years ago |
|
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
处理冲突
|
11 years ago |
|
huang
|
916d99be82
|
课程删除功能
|
11 years ago |
|
houxiang
|
56cb83ffba
|
版本库首页没有统计commit_count，具体的详情页在开始统计
|
11 years ago |
|
huang
|
42f5b86d95
|
添加字段删除课程
|
11 years ago |
|
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
处理冲突
|
11 years ago |
|
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
|
11 years ago |
