 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 |
|
ouyangxuhua
|
e9cedf0eb9
|
删除冗余的迁移文件
|
2015-12-30 17:14:48 +08:00 |
|
ouyangxuhua
|
d1ebc35e43
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
|
2015-12-30 10:37:28 +08:00 |
|
ouyangxuhua
|
d1c7aad742
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-30 10:36:00 +08:00 |
|
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
2015-12-30 10:34:37 +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 |
|
huang
|
41cd038758
|
讨论区帖子添加锁定
|
2015-12-29 15:05:07 +08:00 |
|
ouyangxuhua
|
0d98dba25c
|
解决项目新建帖子中，点击取消按钮没有反应的问题
|
2015-12-29 09:53:44 +08:00 |
|
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
|
2015-12-28 15:32:03 +08:00 |
|
cxt
|
e86778a9c7
|
删除不存在的留言动态
|
2015-12-25 10:13:29 +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
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
2015-12-23 16:49:05 +08:00 |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
2015-12-22 15:48:41 +08:00 |
 houxiang
|
3e57237969
|
修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔
|
2015-12-21 16:21:39 +08:00 |
|
houxiang
|
e8511a6210
|
modify the gemfile conflict by hx
|
2015-12-21 16:00:35 +08:00 |
|
huang
|
dae6e68623
|
renwu
|
2015-12-18 20:46:17 +08:00 |
|
huang
|
747493993b
|
上线测试
|
2015-12-18 19:57:08 +08:00 |
|
cxt
|
4d82beb4c7
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 16:27:19 +08:00 |
|
lizanle
|
793a98ade1
|
forge_activities那个运行批量删除回复动态脚本改动
|
2015-12-18 15:51:41 +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
|
bba40de36d
|
journal不应该算入ForgeActivity，历史数据应该删除
|
2015-12-18 10:48:13 +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 |
|
guange
|
fc63dfcb7b
|
消息通知
|
2015-12-17 15:14:52 +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
|
41bb37d6d4
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
解决冲突
|
2015-12-16 10:02:08 +08:00 |
|
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
2015-12-16 10:00:10 +08:00 |
|
cxt
|
481b7b96eb
|
正式版报500
|
2015-12-15 20:15:10 +08:00 |
|
cxt
|
699d0e22dd
|
删除多余学生的测验数据
|
2015-12-15 19:05:19 +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 |