 huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
10 years ago |
|
huang
|
888c024e9e
|
资源库ajax局部刷新
|
10 years ago |
|
huang
|
4876e6669a
|
课程附件局部刷新
|
10 years ago |
 ouyangxuhua
|
282a720916
|
私有组织下的资源栏目，没有发送文件功能
|
10 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
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
|
10 years ago |
|
huang
|
c8eb2d9c95
|
项目、组织添加资源历史版本下载
|
10 years ago |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
10 years ago |
|
ouyangxuhua
|
70f4bb1c14
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
ouyangxuhua
|
fe0d31d9c4
|
1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示
|
10 years ago |
|
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
|
10 years ago |
|
huang
|
08cb7b642c
|
附件上传样式
|
10 years ago |
|
huang
|
1644442d2e
|
修改附件描述样式
|
10 years ago |
|
ouyangxuhua
|
6cf518e2e4
|
1.组织的非成员用户，隐藏上传资源/导入资源；2.申请的子域名，一律改成小写
|
10 years ago |
|
ouyangxuhua
|
c3eb8e05cd
|
组织的私有资源，数量一致
|
10 years ago |
|
ouyangxuhua
|
d70df6a89d
|
公开组织的资源，非成员不能看到私有资源
|
10 years ago |
|
ouyangxuhua
|
319f286a65
|
解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适
|
10 years ago |
|
huang
|
bafa151c0d
|
0
|
10 years ago |
|
huang
|
91b8a81b9d
|
去掉全站搜索
|
10 years ago |
|
huang
|
50011985a9
|
课程资源库添加资源描述
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 years ago |
|
huang
|
5fd36c0e78
|
课程、项目、组织资源导入
|
10 years ago |
|
huang
|
3368680e49
|
课程、项目、组织添加导入资源功能
|
10 years ago |
|
huang
|
21244a5657
|
资源库导入功能
|
10 years ago |
 Tim
|
486d791c72
|
资源名称颜色调整
|
10 years ago |
|
ouyangxuhua
|
c83562bfd7
|
组织资源过滤：如图资源数统计应该是不同过滤条件下各资源数的统计
|
10 years ago |
 cxt
|
b6bf78a5df
|
当天发布的资源显示未发布、日期选择器用中文
|
10 years ago |
|
cxt
|
a2e60944be
|
已发布资源的延期发布
|
10 years ago |
|
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
10 years ago |
|
ouyangxuhua
|
5893d7fc15
|
解决问题：组织资源栏目页面，点击展开更多报500
|
10 years ago |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
10 years ago |
|
ouyangxuhua
|
afad062b80
|
设置资源栏目、项目资源、课程资源的title,不显示Files
|
10 years ago |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
10 years ago |
|
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
10 years ago |
|
ouyangxuhua
|
7acfc22ee1
|
未登陆情况下，访问组织栏目增加margin-top:10px,已使样式正常
|
10 years ago |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
10 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
10 years ago |
|
ouyangxuhua
|
324513fc94
|
组织栏目子目录功能实现
|
10 years ago |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
10 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
10 years ago |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
10 years ago |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
10 years ago |
|
huang
|
3df542ff6a
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
64889fd14a
|
项目资源提供新分页
|
10 years ago |
|
ouyangxuhua
|
5d819625c0
|
快捷菜单上传文件使用最新的上传方式
|
10 years ago |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
huang
|
762ebb150b
|
解决课程资源重复分页问题
|
10 years ago |
|
huang
|
0ab500986a
|
发送搜索功能
|
10 years ago |
|
huang
|
57af22e3af
|
项目资源库tag增、删、改ajax
|
10 years ago |
|
huang
|
6a9ebb572b
|
资源库添加上传按钮
|
10 years ago |
|
huang
|
e56382a899
|
tag云ajax更新后自动刷新
|
10 years ago |
|
huang
|
8f7d5c8a35
|
项目资源库，上传资源类型，创建资源
|
10 years ago |
|
huang
|
972f2bfea8
|
完成项目资源库tag云的查询统计
|
10 years ago |
|
huang
|
d0a8b4bc18
|
项目资源云搜索
|
10 years ago |
|
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
b4617e431f
|
代码格式
|
10 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
10 years ago |
|
huang
|
9464495c19
|
资源搜索
资源公开私有ajax
|
10 years ago |
|
huang
|
c4718f992c
|
项目资源搜索
|
10 years ago |
|
huang
|
680e861620
|
项目资源搜索功能
|
10 years ago |
|
huang
|
81bb35ac49
|
项目资源库 资源列表
|
10 years ago |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
10 years ago |
|
ouyangxuhua
|
abf6b5ff70
|
解决base_org上传资源按钮不能正常上传的问题
|
10 years ago |
 lizanle
|
2c7ef034cb
|
资源库更改
|
10 years ago |
|
lizanle
|
20a03b2386
|
点击展开更多
|
10 years ago |
|
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
|
10 years ago |
|
lizanle
|
c34127f21f
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
10 years ago |
|
lizanle
|
b7eda83def
|
历史资源功能
|
10 years ago |
|
lizanle
|
fd4d2910d0
|
课程发送资源 以及 项目发送资源
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
ouyangxuhua
|
0cf2279cf5
|
解决一下bug:
1.组织：引用资源至某栏目，若该组织只有一个栏目，且该资源已成功引用至该组织栏目，如图就不要再显示为“选入组织其他栏目”了
2.组织:只有管理员才能关联课程/项目
|
10 years ago |
|
lizanle
|
6440434428
|
私有课程的资源不允许设置为公开
|
10 years ago |
|
lizanle
|
e35d2daa0a
|
课程资源库
|
10 years ago |
|
lizanle
|
3b08adfc68
|
课程资源页面修改。
|
10 years ago |
|
ouyangxuhua
|
85bc9ce43d
|
解决组织模块的一些bug
|
10 years ago |
|
ouyangxuhua
|
de229c0f1c
|
组织资源栏目的文件可以被引用至当前组织下的资源栏目
|
10 years ago |
|
ouyangxuhua
|
977100e92e
|
双击资源栏目标签可编辑，编辑标签后更新标签
|
10 years ago |
|
ouyangxuhua
|
704954583b
|
资源栏目新增Tag后，更新相应的tag数量
|
10 years ago |
|
ouyangxuhua
|
af157a9c63
|
组织资源栏目增加标签功能
|
10 years ago |
|
ouyangxuhua
|
d9df926c2b
|
组织添加项目/组织弹窗，点击取消后，关闭弹窗。
|
10 years ago |
|
ouyangxuhua
|
3efb36a28e
|
在组织非资源栏目页面中，添加资源后跳转至资源栏目页面。
|
10 years ago |
|
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
10 years ago |
|
ouyangxuhua
|
b72cc82e4d
|
组织资源栏目添加文件标签功能
|
10 years ago |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
10 years ago |
|
ouyangxuhua
|
be590497b9
|
组织文章设为首页后，跳转至首页
|
10 years ago |
|
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型，可以添加文件、删除文件、显示文件等
|
10 years ago |
|
lizanle
|
193471adf1
|
学生自己上传的资源应允许自己删除
|
10 years ago |
|
lizanle
|
6a59e39ef1
|
允许学生上传资源
|
10 years ago |
|
lizanle
|
e7d53f5e16
|
课程资源上传允许多选tag
|
10 years ago |
|
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
10 years ago |
|
lizanle
|
d13205bd3d
|
文件正在上传提示
|
10 years ago |
|
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
10 years ago |
|
lizanle
|
82c377a60a
|
在导航处上传文件不可用
|
10 years ago |
|
lizanle
|
f229d18776
|
在课程 项目 上传资源后跳转到对应的资源库界面
|
10 years ago |
