 alan
|
eb1c6ccf85
|
Merge branch 'alan_develop' into develop
Conflicts:
app/views/users/_resource_share_for_orgs.html.erb
app/views/users/_resource_share_for_project_popup.html.erb
app/views/users/_resource_share_popup.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-03-29 11:36:49 +08:00 |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
2016-03-29 10:15:18 +08:00 |
 ouyangxuhua
|
1a1d5b4c49
|
解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题
|
2016-03-28 19:20:09 +08:00 |
 huang
|
6f9d4eccbe
|
解决合并引起的问题
|
2016-02-20 17:17:12 +08:00 |
|
huang
|
3fda270a66
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-02-20 16:58:20 +08:00 |
|
huang
|
aa22a253ba
|
“发送至”弹框飘动问题
|
2016-02-20 09:45:37 +08:00 |
|
huang
|
1c4e3545c7
|
资源弹框剧中
|
2016-02-19 14:16:26 +08:00 |
 guange
|
10eeeaa95c
|
弹出框居中
|
2016-02-03 23:30:07 +08:00 |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
2016-01-25 14:19:39 +08:00 |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
2016-01-20 16:24:14 +08:00 |
|
huang
|
dc90976497
|
项目资源库添加 “发送”功能
|
2016-01-08 17:09:32 +08:00 |
 lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
2015-12-29 17:13:01 +08:00 |
|
lizanle
|
ee661bb6d4
|
input光光标到最后的折中解决方案
|
2015-12-07 16:21:00 +08:00 |
|
lizanle
|
bc186776d8
|
资源移动弹出框减少留白
|
2015-08-29 09:56:34 +08:00 |
|
lizanle
|
f9651d853c
|
资源每页显示的个数
|
2015-08-28 10:47:50 +08:00 |
|
lizanle
|
d3f441d4da
|
可拖动的资源弹出框
|
2015-08-28 09:34:02 +08:00 |
|
lizanle
|
0e8c1d1b66
|
资源库 分页
|
2015-08-20 17:00:54 +08:00 |
|
lizanle
|
7ddf6d1e7d
|
资源库 多选发送
|
2015-08-20 16:05:58 +08:00 |
|
lizanle
|
25460cd255
|
资源库
|
2015-08-18 09:31:03 +08:00 |