 huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
 cxt
|
a96d8ce5a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
9 years ago |
 ouyangxuhua
|
0a9ecac3db
|
帖子栏目讨论区链接问题修复
|
9 years ago |
|
cxt
|
e09f795171
|
附件的显示
|
9 years ago |
|
ouyangxuhua
|
b5bfa6d824
|
1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。
|
9 years ago |
|
ouyangxuhua
|
b6219c149a
|
解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除；
|
9 years ago |
|
cxt
|
f7be78efc7
|
关联项目的更新时间包含项目的提交时间
|
9 years ago |
|
cxt
|
6789693fc7
|
已评分作品超过5个时，作业优秀作品排行显示“更多”
|
9 years ago |
|
cxt
|
fea4f79dc8
|
组织帖子栏目的通知增加点赞tip
|
9 years ago |
|
ouyangxuhua
|
594ce8a304
|
修改几个bug
|
9 years ago |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
9 years ago |
|
cxt
|
65563e6503
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
9 years ago |
|
cxt
|
247924af26
|
动态内容显示不全
|
9 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
9 years ago |
|
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
9 years ago |
|
cxt
|
b64fc1771d
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
ouyangxuhua
|
18e79ba9b3
|
未登陆情况下，可以看到组织文章列表及首页全部内容
|
9 years ago |
|
ouyangxuhua
|
e70e1beb5d
|
Merge branch 'szzh' into dev_hjq
|
9 years ago |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
9 years ago |
|
cxt
|
8e9c4bab6b
|
赞增加tip
|
9 years ago |
|
cxt
|
7f7d0ac6f7
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
9 years ago |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
9 years ago |
|
ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
9 years ago |
|
huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
ouyangxuhua
|
b9359b1cee
|
显示url申请
|
10 years ago |
|
cxt
|
902cfdcbe9
|
课程/项目的创建动态不需要显示更新时间
|
10 years ago |
|
cxt
|
c49a290d56
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
10 years ago |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
10 years ago |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
10 years ago |
|
cxt
|
25cc959576
|
Merge branch 'szzh' into develop
Conflicts:
app/views/layouts/_user_courses.html.erb
app/views/org_subfields/show.html.erb
app/views/organizations/_subfield_list.html.erb
app/views/users/_resource_share_for_orgs.html.erb
|
10 years ago |
|
cxt
|
cef9fd96cd
|
组织帖子的动态点赞
|
10 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 years ago |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
10 years ago |
 Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
26631e2199
|
关联项目的提交次数
|
10 years ago |
|
ouyangxuhua
|
93570249c0
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
ouyangxuhua
|
a21465343c
|
组织栏目编辑状态样式更新
|
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 |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
10 years ago |
|
cxt
|
53a45908e9
|
关联项目的提交次数
|
10 years ago |
|
cxt
|
efb5d05551
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
10 years ago |
|
cxt
|
e04926f2e7
|
关联项目的提交次数
|
10 years ago |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
ouyangxuhua
|
8ead573872
|
组织设置url
|
10 years ago |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
10 years ago |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
10 years ago |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
10 years ago |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
10 years ago |
|
huang
|
8c10ce6fee
|
修改组织500问题
|
10 years ago |
|
cxt
|
1264d5f6ca
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
9368e3875c
|
去掉关联项目的提交次数
|
10 years ago |
|
ouyangxuhua
|
ceeec3af12
|
修改一些bug
|
10 years ago |
|
cxt
|
5dbad5a672
|
已关联项目的样式修改
|
10 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
09b8373e12
|
组织配置https改成http
|
10 years ago |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
10 years ago |
|
ouyangxuhua
|
c500fc13db
|
解决组织动态中，第二页重复显示第一页动态的问题
|
10 years ago |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
10 years ago |
|
ouyangxuhua
|
178f9e167c
|
1.申请子域名时，对子域名进行规范，仅能输入字母、数字和下划线；
2.博客主页，添加取消主页按钮；
3.私信只能发送者和接收者能看到
|
10 years ago |
|
cxt
|
5e0ee0426a
|
作业动态的附件放在扣分上面
|
10 years ago |
|
ouyangxuhua
|
539d971901
|
组织页面也增加项目/课程快捷菜单
|
10 years ago |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
10 years ago |
|
cxt
|
1263e4cac0
|
关联项目的样式修改
|
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 |
|
cxt
|
cf125159f2
|
关联项目增加提交次数
|
10 years ago |
|
cxt
|
244e133803
|
关联项目的对齐
|
10 years ago |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
10 years ago |
|
cxt
|
0a2d2a539f
|
关联项目的组长名字加个title
|
10 years ago |
|
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
10 years ago |
|
ouyangxuhua
|
dae07d7e92
|
解决组织页面对齐的问题
|
10 years ago |
|
ouyangxuhua
|
692f13d1de
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
defba80427
|
栏目配置中，“设为显示”改成“设为可见"
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
373e40f4fd
|
未登陆情况下，不能发布帖子
|
10 years ago |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
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 |
|
ouyangxuhua
|
29c720a8a4
|
1.权限管理问题
|
10 years ago |
|
ouyangxuhua
|
987b0dd9d2
|
message_id为空的动态不显示
|
10 years ago |
|
ouyangxuhua
|
c16f99774b
|
1.组织叶底样式错误问题修正
|
10 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
10 years ago |
|
ouyangxuhua
|
d203285cc1
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/organizations/_org_left_subfield_list.html.erb
|
10 years ago |
|
ouyangxuhua
|
15cff47c92
|
1.转发帖子时，当组织没有资源栏目时，给出提示；
2.组织文章的附件显示在组织动态/组织文章列表中；
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
ouyangxuhua
|
0cf2279cf5
|
解决一下bug:
1.组织：引用资源至某栏目，若该组织只有一个栏目，且该资源已成功引用至该组织栏目，如图就不要再显示为“选入组织其他栏目”了
2.组织:只有管理员才能关联课程/项目
|
10 years ago |
|
ouyangxuhua
|
dd88742b78
|
判断org.org_act_id是否为空
|
10 years ago |
|
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
|
10 years ago |
|
cxt
|
7bc030b789
|
组织模块：关联项目弹框的项目列表的高度要限制
|
10 years ago |
|
ouyangxuhua
|
c81f2f738a
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
app/controllers/org_document_comments_controller.rb
app/views/org_document_comments/_attachment.html.erb
|
10 years ago |
|
ouyangxuhua
|
59f42bb54f
|
1.将添加附加功能加入到组织列表中的新建组织文章；
2.解决编辑文章附件不能上传的问题。
|
10 years ago |
|
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
10 years ago |
