 ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
 cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
10 years ago |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
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 |
 luoquan
|
1900a824e8
|
0
|
10 years ago |
 yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
10 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
10 years ago |
|
ouyangxuhua
|
1951d50bf7
|
组织文章不显示回复框的问题
|
11 years ago |
|
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
11 years ago |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
ouyangxuhua
|
9c2d8f7ab6
|
组织二级回复中，工具栏图标乱码问题修复
|
11 years ago |
|
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
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
|
11 years ago |
|
ouyangxuhua
|
72c0173256
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
11 years ago |
|
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题
|
11 years ago |
guange
|
a421e8c6fa
|
组织文章无法编辑问题
|
11 years ago |
|
cxt
|
89599d8679
|
编辑组织帖子
|
11 years ago |
|
cxt
|
2cc24e2d4b
|
组织帖子的新建
|
11 years ago |
|
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
11 years ago |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
11 years ago |
|
cxt
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
11 years ago |
|
ouyangxuhua
|
d820977d5d
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/blog_comments/show.html.erb
app/views/courses/syllabus.html.erb
app/views/messages/_org_subfield_show.html.erb
|
11 years ago |
|
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
11 years ago |
 Tim
|
619144224e
|
文本框格式问题
|
11 years ago |
|
ouyangxuhua
|
cdd997e45e
|
kindeditor回复框修改
|
11 years ago |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
11 years ago |
|
Tim
|
674a8e0035
|
单词折行问题
|
11 years ago |
|
cxt
|
e09f795171
|
附件的显示
|
11 years ago |
|
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
11 years ago |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
11 years ago |
|
ouyangxuhua
|
2271befedd
|
修正组织部分页面的样式
|
11 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
|
11 years ago |
|
ouyangxuhua
|
59f42bb54f
|
1.将添加附加功能加入到组织列表中的新建组织文章；
2.解决编辑文章附件不能上传的问题。
|
11 years ago |
|
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
11 years ago |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
11 years ago |
|
ouyangxuhua
|
b3b5bc7ffd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
ouyangxuhua
|
85bc9ce43d
|
解决组织模块的一些bug
|
11 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
11 years ago |
|
ouyangxuhua
|
dc45321454
|
组织文章二级回复代码被覆盖，恢复代码
|
11 years ago |
|
guange
|
4f57e48b92
|
merge
|
11 years ago |
|
guange
|
d1315e35b5
|
merge
|
11 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
11 years ago |
|
ouyangxuhua
|
aab9594ac9
|
1.解决英文版下，组织成员列表编辑成员显示错误；
2.解决在组织文章详情页面，删除文章报错的问题
|
11 years ago |
|
ouyangxuhua
|
78fb8b6254
|
1.编辑或者删除栏目的帖子返回对应页面
|
11 years ago |
|
ouyangxuhua
|
333c0e41a0
|
1.栏目增加新建帖子功能；
2.点击某栏目，显示相应的动态；
3.编辑栏目里的文章后，返回相应的栏目动态。
|
11 years ago |
|
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
11 years ago |
|
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
11 years ago |
|
ouyangxuhua
|
95b071a8f7
|
修复组织模块的bug
|
11 years ago |
|
ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能；
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
|
11 years ago |
|
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
11 years ago |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
11 years ago |
