 ouyangxuhua
|
527897bff0
|
新建组织后，增加默认栏目
|
2015-12-31 16:23:10 +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 |
|
lizanle
|
c3b7662cac
|
issue按更新时间排序
|
2015-12-31 15:17:48 +08:00 |
|
ouyangxuhua
|
f0111ad79d
|
Merge branch 'develop' into dev_hjq
|
2015-12-31 13:30:07 +08:00 |
 Tim
|
63b7330cd8
|
邮件提交标题中统计数
|
2015-12-31 11:39:00 +08:00 |
|
Tim
|
b380b515c6
|
修改邮件标题统计
|
2015-12-31 11:18:06 +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
|
b132e8483c
|
个人资源库搜索不到组织资源
|
2015-12-31 09:08:07 +08:00 |
|
ouyangxuhua
|
68a6f3f7f2
|
1.组织管理员有删除帖子的权限；2.删除帖子后更新org_activities表
|
2015-12-30 18:44:54 +08:00 |
|
lizanle
|
a85a3339bb
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
2015-12-30 18:24:07 +08:00 |
|
lizanle
|
c34127f21f
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
2015-12-30 18:04:04 +08:00 |
|
lizanle
|
b7eda83def
|
历史资源功能
|
2015-12-30 17:27:44 +08:00 |
|
ouyangxuhua
|
3deb5aff43
|
资源栏目权限问题
|
2015-12-30 17:25:06 +08:00 |
|
ouyangxuhua
|
e9cedf0eb9
|
删除冗余的迁移文件
|
2015-12-30 17:14:48 +08:00 |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
2015-12-30 15:46:01 +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
|
d77625e4e9
|
Merge branch 'develop' into dev_hjq
|
2015-12-28 17:04:12 +08:00 |
 huang
|
900d7d62cb
|
邮件按天发送添加提示
|
2015-12-28 16:14:32 +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 |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:48:41 +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 |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
2015-12-23 16:12:23 +08:00 |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
2015-12-23 10:40:50 +08:00 |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
2015-12-22 15:48:41 +08:00 |
 guange
|
1724ae430e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-21 15:15:48 +08:00 |
|
guange
|
bb94a41435
|
红点中包含at的消息
|
2015-12-21 15:11:41 +08:00 |
|
huang
|
1a549eda46
|
版本库显示问题
|
2015-12-21 14:33:28 +08:00 |
|
huang
|
c381ce177f
|
解决通知太长不能发的问题
|
2015-12-21 14:00:09 +08:00 |
|
huang
|
ab1397d982
|
恢复版本
|
2015-12-21 13:53:22 +08:00 |
|
huang
|
3de4c7129a
|
版本库读取错误问题
|
2015-12-21 13:48:25 +08:00 |
|
guange
|
8c967e6559
|
格式改进
|
2015-12-18 11:13:27 +08:00 |
|
guange
|
e8cf5d1042
|
at消息html代码问题
|
2015-12-18 10:53:35 +08:00 |
|
lizanle
|
47b20d3639
|
journal不应该算入ForgeActivity
|
2015-12-18 10:19:18 +08:00 |
|
guange
|
d703f75c98
|
merge
|
2015-12-18 09:23:52 +08:00 |
|
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
|
guange
|
923cb3c84f
|
中文报错
|
2015-12-17 15:44:17 +08:00 |
|
guange
|
fc63dfcb7b
|
消息通知
|
2015-12-17 15:14:52 +08:00 |
|
guange
|
c0de5d55de
|
加入了issue的at消息提醒
|
2015-12-16 16:37:00 +08:00 |
|
huang
|
85d277da0d
|
Merge branch 'develop' into hjq_new_course
|
2015-12-16 10:54:11 +08:00 |
|
huang
|
ac8aa9e0a6
|
解决作业留言和课程留言导致的bug
|
2015-12-16 10:03:51 +08:00 |
|
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
2015-12-16 10:00:10 +08:00 |
|
guange
|
4ce9eb428e
|
at样式问题
|
2015-12-15 16:28:11 +08:00 |
|
huang
|
ea1849e51f
|
去掉邮件token值
|
2015-12-15 09:09:26 +08:00 |
|
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
|
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
|
guange
|
91b245ad2c
|
lastname为空时也可以加,可以省掉查询extensions的语句
|
2015-12-12 18:06:59 +08:00 |