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
|
2016-01-15 15:42:36 +08:00 |
ouyangxuhua
|
b9359b1cee
|
显示url申请
|
2016-01-15 13:15:17 +08:00 |
cxt
|
902cfdcbe9
|
课程/项目的创建动态不需要显示更新时间
|
2016-01-15 10:29:55 +08:00 |
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
|
2016-01-15 10:24:37 +08:00 |
ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
2016-01-14 21:42:28 +08:00 |
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
2016-01-14 21:29:43 +08:00 |
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
2016-01-14 21:07:05 +08:00 |
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
|
2016-01-14 18:22:57 +08:00 |
cxt
|
cef9fd96cd
|
组织帖子的动态点赞
|
2016-01-14 18:05:58 +08:00 |
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
2016-01-14 17:52:48 +08:00 |
cxt
|
58c96a0df0
|
作业动态的点赞
|
2016-01-14 16:15:40 +08:00 |
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-01-14 15:59:50 +08:00 |
cxt
|
26631e2199
|
关联项目的提交次数
|
2016-01-14 15:39:40 +08:00 |
ouyangxuhua
|
93570249c0
|
Merge branch 'dev_hjq' into szzh
|
2016-01-14 15:02:45 +08:00 |
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
2016-01-14 15:02:30 +08:00 |
ouyangxuhua
|
a21465343c
|
组织栏目编辑状态样式更新
|
2016-01-14 15:01:51 +08:00 |
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-14 14:40:13 +08:00 |
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
2016-01-14 12:51:01 +08:00 |
ouyangxuhua
|
324513fc94
|
组织栏目子目录功能实现
|
2016-01-14 10:33:15 +08:00 |
cxt
|
e889f798d7
|
项目创建动态报500
|
2016-01-13 17:26:36 +08:00 |
cxt
|
53a45908e9
|
关联项目的提交次数
|
2016-01-13 16:54:41 +08:00 |
cxt
|
efb5d05551
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-13 16:32:33 +08:00 |
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
2016-01-13 15:17:13 +08:00 |
cxt
|
e04926f2e7
|
关联项目的提交次数
|
2016-01-13 10:04:42 +08:00 |
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-13 09:58:14 +08:00 |
ouyangxuhua
|
8ead573872
|
组织设置url
|
2016-01-13 09:56:24 +08:00 |
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
2016-01-13 09:34:33 +08:00 |
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
2016-01-12 16:43:40 +08:00 |
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
2016-01-12 15:53:15 +08:00 |
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
2016-01-11 16:44:52 +08:00 |
huang
|
8c10ce6fee
|
修改组织500问题
|
2016-01-08 21:47:42 +08:00 |
cxt
|
1264d5f6ca
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 20:35:19 +08:00 |
cxt
|
9368e3875c
|
去掉关联项目的提交次数
|
2016-01-08 20:35:05 +08:00 |
ouyangxuhua
|
ceeec3af12
|
修改一些bug
|
2016-01-08 19:33:58 +08:00 |
cxt
|
5dbad5a672
|
已关联项目的样式修改
|
2016-01-08 19:04:22 +08:00 |
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-08 18:09:21 +08:00 |
ouyangxuhua
|
09b8373e12
|
组织配置https改成http
|
2016-01-08 17:13:34 +08:00 |
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
2016-01-08 16:05:36 +08:00 |
ouyangxuhua
|
c500fc13db
|
解决组织动态中,第二页重复显示第一页动态的问题
|
2016-01-08 15:21:24 +08:00 |
cxt
|
7d663ce66f
|
动态内容统一高度
|
2016-01-08 14:53:12 +08:00 |
ouyangxuhua
|
178f9e167c
|
1.申请子域名时,对子域名进行规范,仅能输入字母、数字和下划线;
2.博客主页,添加取消主页按钮;
3.私信只能发送者和接收者能看到
|
2016-01-08 09:41:56 +08:00 |
cxt
|
5e0ee0426a
|
作业动态的附件放在扣分上面
|
2016-01-07 17:23:32 +08:00 |
ouyangxuhua
|
539d971901
|
组织页面也增加项目/课程快捷菜单
|
2016-01-07 16:37:41 +08:00 |
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态,鼠标经过显示详细信息,并且可以留言、私信等
|
2016-01-07 15:58:22 +08:00 |
cxt
|
1263e4cac0
|
关联项目的样式修改
|
2016-01-07 15:33:21 +08:00 |
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
|
2016-01-06 16:27:42 +08:00 |
cxt
|
cf125159f2
|
关联项目增加提交次数
|
2016-01-06 10:36:53 +08:00 |
cxt
|
244e133803
|
关联项目的对齐
|
2016-01-06 09:57:54 +08:00 |
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态,评分设置弹框不能关闭 ”的问题;
2.组织申请子域名功能。
|
2016-01-05 16:46:06 +08:00 |
cxt
|
0a2d2a539f
|
关联项目的组长名字加个title
|
2016-01-05 15:46:41 +08:00 |
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
2016-01-05 11:29:30 +08:00 |
ouyangxuhua
|
dae07d7e92
|
解决组织页面对齐的问题
|
2016-01-04 11:11:42 +08:00 |
ouyangxuhua
|
692f13d1de
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-31 16:12:19 +08:00 |
ouyangxuhua
|
defba80427
|
栏目配置中,“设为显示”改成“设为可见"
|
2015-12-31 16:11:48 +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 |
ouyangxuhua
|
373e40f4fd
|
未登陆情况下,不能发布帖子
|
2015-12-31 14:13:31 +08:00 |
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能;2.未登录情况,隐藏部分内容。
|
2015-12-31 13:26:28 +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 |
ouyangxuhua
|
29c720a8a4
|
1.权限管理问题
|
2015-12-30 17:45:15 +08:00 |
ouyangxuhua
|
987b0dd9d2
|
message_id为空的动态不显示
|
2015-12-30 17:02:14 +08:00 |
ouyangxuhua
|
c16f99774b
|
1.组织叶底样式错误问题修正
|
2015-12-30 16:57:40 +08:00 |
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目,同时增加增删查改功能
|
2015-12-30 15:46:01 +08:00 |
ouyangxuhua
|
d203285cc1
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/organizations/_org_left_subfield_list.html.erb
|
2015-12-29 17:18:21 +08:00 |
ouyangxuhua
|
15cff47c92
|
1.转发帖子时,当组织没有资源栏目时,给出提示;
2.组织文章的附件显示在组织动态/组织文章列表中;
|
2015-12-29 17:13:48 +08:00 |
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
2015-12-29 17:13:01 +08:00 |
ouyangxuhua
|
0cf2279cf5
|
解决一下bug:
1.组织:引用资源至某栏目,若该组织只有一个栏目,且该资源已成功引用至该组织栏目,如图就不要再显示为“选入组织其他栏目”了
2.组织:只有管理员才能关联课程/项目
|
2015-12-29 16:46:20 +08:00 |
ouyangxuhua
|
dd88742b78
|
判断org.org_act_id是否为空
|
2015-12-29 16:00:12 +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 |
cxt
|
7bc030b789
|
组织模块:关联项目弹框的项目列表的高度要限制
|
2015-12-28 11:31:23 +08:00 |
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
|
2015-12-24 11:13:20 +08:00 |
ouyangxuhua
|
59f42bb54f
|
1.将添加附加功能加入到组织列表中的新建组织文章;
2.解决编辑文章附件不能上传的问题。
|
2015-12-24 11:09:57 +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 |
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
2015-12-22 15:14:03 +08:00 |
ouyangxuhua
|
b3b5bc7ffd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 14:30:43 +08:00 |
ouyangxuhua
|
85bc9ce43d
|
解决组织模块的一些bug
|
2015-12-18 14:30:25 +08:00 |
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
2015-12-17 17:42:48 +08:00 |
ouyangxuhua
|
d9df926c2b
|
组织添加项目/组织弹窗,点击取消后,关闭弹窗。
|
2015-12-15 10:47:35 +08:00 |
ouyangxuhua
|
3efb36a28e
|
在组织非资源栏目页面中,添加资源后跳转至资源栏目页面。
|
2015-12-15 09:59:11 +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
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
2015-12-14 16:41:18 +08:00 |
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目,增加搜索功能
|
2015-12-14 10:26:34 +08:00 |
ouyangxuhua
|
c2d21b5a6b
|
隐藏组织栏目资源列表
|
2015-12-11 17:11:11 +08:00 |
ouyangxuhua
|
be590497b9
|
组织文章设为首页后,跳转至首页
|
2015-12-11 16:58:00 +08:00 |
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型,可以添加文件、删除文件、显示文件等
|
2015-12-11 16:30:50 +08:00 |
ouyangxuhua
|
aab9594ac9
|
1.解决英文版下,组织成员列表编辑成员显示错误;
2.解决在组织文章详情页面,删除文章报错的问题
|
2015-12-10 17:22:59 +08:00 |
ouyangxuhua
|
0a85fbf613
|
1.配置栏目列表,增加类型一列;
2.暂时隐藏类型为“资源”的栏目的链接
|
2015-12-10 15:53:05 +08:00 |
ouyangxuhua
|
2f7260cba2
|
1.在栏目表中增加field_type(类型)字段;
2.在组织配置-》栏目,增加栏目类型。
|
2015-12-09 17:24:59 +08:00 |
ouyangxuhua
|
78fb8b6254
|
1.编辑或者删除栏目的帖子返回对应页面
|
2015-12-09 16:19:52 +08:00 |
ouyangxuhua
|
333c0e41a0
|
1.栏目增加新建帖子功能;
2.点击某栏目,显示相应的动态;
3.编辑栏目里的文章后,返回相应的栏目动态。
|
2015-12-09 10:48:15 +08:00 |
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
2015-12-09 09:23:22 +08:00 |
ouyangxuhua
|
bb7bcf46a9
|
1.设置首页后,跳转至组织首页
|
2015-12-08 15:30:58 +08:00 |
ouyangxuhua
|
9d6b4783df
|
删除组织配置栏目的组织首页项
|
2015-12-07 17:18:46 +08:00 |
ouyangxuhua
|
9f30c7a44e
|
如果用户没有登陆,不能在组织页面中,增加项目或课程。
|
2015-12-07 14:37:35 +08:00 |
ouyangxuhua
|
c229104d78
|
修改编辑组织标题
|
2015-12-07 13:03:21 +08:00 |
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
2015-12-07 12:53:51 +08:00 |