 yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
9 years ago |
|
yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
9 years ago |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
9 years ago |
 huang
|
37b93a4595
|
文章回复不能用的问题
|
9 years ago |
|
huang
|
c400b44230
|
一级目录列表引起的问题
|
9 years ago |
 Tim
|
399f757811
|
0
|
9 years ago |
|
huang
|
48002eb247
|
二级目录讨论区添加帖子回复功能
|
9 years ago |
 cxt
|
0d5bad1ddd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
35faa12d4d
|
组织编辑文章无法提交
|
9 years ago |
 ouyangxuhua
|
0f4d2e40fb
|
添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整
|
9 years ago |
|
ouyangxuhua
|
cca2527401
|
组织栏目新建文章样式调整
|
9 years ago |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
9 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
9 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
|
9 years ago |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
9 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
|
9 years ago |
 luoquan
|
1900a824e8
|
0
|
9 years ago |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
9 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
9 years ago |
|
ouyangxuhua
|
1951d50bf7
|
组织文章不显示回复框的问题
|
9 years ago |
|
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
ouyangxuhua
|
9c2d8f7ab6
|
组织二级回复中，工具栏图标乱码问题修复
|
9 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
|
9 years ago |
|
ouyangxuhua
|
72c0173256
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题
|
9 years ago |
guange
|
a421e8c6fa
|
组织文章无法编辑问题
|
9 years ago |
|
cxt
|
89599d8679
|
编辑组织帖子
|
9 years ago |
|
cxt
|
2cc24e2d4b
|
组织帖子的新建
|
9 years ago |
|
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
9 years ago |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
9 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
|
9 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
|
9 years ago |
|
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
9 years ago |
|
Tim
|
619144224e
|
文本框格式问题
|
9 years ago |
|
ouyangxuhua
|
cdd997e45e
|
kindeditor回复框修改
|
9 years ago |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
9 years ago |
|
Tim
|
674a8e0035
|
单词折行问题
|
9 years ago |
|
cxt
|
e09f795171
|
附件的显示
|
9 years ago |
|
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
10 years ago |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
10 years ago |
|
ouyangxuhua
|
2271befedd
|
修正组织部分页面的样式
|
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 |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
10 years ago |
|
ouyangxuhua
|
b3b5bc7ffd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
85bc9ce43d
|
解决组织模块的一些bug
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
ouyangxuhua
|
dc45321454
|
组织文章二级回复代码被覆盖，恢复代码
|
10 years ago |
