 huang
|
93f8ac31f1
|
项目资源库新分页及ajax刷新
|
2016-08-13 14:17:50 +08:00 |
|
huang
|
ce9c2d3d06
|
搜索的时候分页刷新
|
2016-08-12 17:25:20 +08:00 |
|
huang
|
75971120f7
|
Merge branch 'develop' into rep_quality
|
2016-08-12 17:14:18 +08:00 |
|
huang
|
047eea125d
|
课程资源分页及局部刷新
|
2016-08-12 17:05:46 +08:00 |
 Tim
|
59a76c3b9a
|
调整组织上传资源弹窗位置
|
2016-08-11 10:47:22 +08:00 |
|
Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
2016-07-18 14:32:17 +08:00 |
|
huang
|
97b1ea22e7
|
解决：Firefox浏览器中：资源库，先点击资源描述编辑图标按钮（笔），再点击页面空白处，如图两个资源之间有一段空白
|
2016-07-15 10:51:44 +08:00 |
|
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-11 13:57:04 +08:00 |
|
Tim
|
65cbf14d72
|
提交与取消按钮间添加间距；图标不显示等
|
2016-07-07 17:06:31 +08:00 |
 cxt
|
3b418bc44c
|
如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。
|
2016-07-07 16:46:41 +08:00 |
|
Tim
|
b02c1b5995
|
提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；
|
2016-07-07 15:08:34 +08:00 |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-05 16:49:50 +08:00 |
|
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
2016-07-05 15:38:56 +08:00 |
|
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
 daiao
|
cb11cac506
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/admin/excellent_all_courses.html.erb
|
2016-06-28 18:39:32 +08:00 |
|
Tim
|
8a6bbf50a9
|
css文件替换
|
2016-06-24 09:30:46 +08:00 |
|
daiao
|
97d07134a5
|
修改上传资源名过长造成溢出框架
|
2016-06-21 16:20:07 +08:00 |
|
daiao
|
8037bccb17
|
将延迟发布统一修改为延期发布
|
2016-06-21 16:08:45 +08:00 |
|
daiao
|
8e7095c82d
|
修改了课件名称显示不全的缺陷
|
2016-06-21 10:46:32 +08:00 |
 yuanke
|
fde06a2327
|
更新资源描述样式修改
|
2016-06-20 16:35:16 +08:00 |
|
daiao
|
dbc8f420ed
|
按照要求：将延期发布在资源上传界面叫延迟发布，在资源配置按钮中叫延期发布，见附件，同一功能的按钮名称应该统一。统一修改为延迟发布。
|
2016-06-20 10:17:08 +08:00 |
|
yuanke
|
4b7fa3a040
|
修改有的组织不能修改资源描述的问题
|
2016-06-20 09:19:50 +08:00 |
|
yuanke
|
70a762220a
|
组织、项目的资源文件增加描述修改及上传文件时候添加描述，并且所有操作对超级管理员开放
|
2016-06-16 16:55:25 +08:00 |
|
yuanke
|
f9f66bac7b
|
修改课程资源描述为空时提示
|
2016-06-16 14:15:46 +08:00 |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
2016-06-16 14:04:12 +08:00 |
|
huang
|
c15ef27fc0
|
管理员能看到组织资源
|
2016-06-15 14:36:38 +08:00 |
|
txz
|
9b55d8b527
|
微信版标题显示不完整
|
2016-05-10 14:06:34 +08:00 |
|
huang
|
43f5f821d5
|
组织未登录用户不显示设置按钮
|
2016-04-19 11:10:58 +08:00 |
|
huang
|
bed583b051
|
提示语
|
2016-04-08 10:01:54 +08:00 |
|
huang
|
a6f6f63d6d
|
图片上传添加提示
|
2016-04-06 11:05:13 +08:00 |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
2016-04-06 10:40:38 +08:00 |
|
huang
|
86aecd21b9
|
上传图片
|
2016-04-01 23:56:05 +08:00 |
|
huang
|
ac1b3338c5
|
logo图标替换
|
2016-04-01 20:10:28 +08:00 |
|
huang
|
10371e8bdd
|
添加附件图片功能
|
2016-04-01 00:27:34 +08:00 |
 ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序，带过滤条件，如tag类型、搜索条件等
|
2016-03-25 12:30:33 +08:00 |
|
huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:18:31 +08:00 |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
2016-03-18 15:17:49 +08:00 |
|
huang
|
888c024e9e
|
资源库ajax局部刷新
|
2016-03-18 12:23:59 +08:00 |
|
huang
|
4876e6669a
|
课程附件局部刷新
|
2016-03-18 11:04:43 +08:00 |
|
ouyangxuhua
|
282a720916
|
私有组织下的资源栏目，没有发送文件功能
|
2016-03-17 17:08:42 +08:00 |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
2016-03-17 16:06:05 +08:00 |
|
huang
|
c8eb2d9c95
|
项目、组织添加资源历史版本下载
|
2016-03-17 12:49:00 +08:00 |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
2016-03-17 12:37:05 +08:00 |
|
ouyangxuhua
|
70f4bb1c14
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-15 14:22:38 +08:00 |
|
ouyangxuhua
|
fe0d31d9c4
|
1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示
|
2016-03-15 14:17:06 +08:00 |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-15 13:40:33 +08:00 |
|
huang
|
08cb7b642c
|
附件上传样式
|
2016-03-10 16:43:25 +08:00 |
|
huang
|
1644442d2e
|
修改附件描述样式
|
2016-03-10 16:41:56 +08:00 |
|
ouyangxuhua
|
6cf518e2e4
|
1.组织的非成员用户，隐藏上传资源/导入资源；2.申请的子域名，一律改成小写
|
2016-03-10 14:38:33 +08:00 |