 cxt
|
623dadaea1
|
回复的删除按钮当鼠标放上去才显示
|
2016-08-30 14:12:50 +08:00 |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
2016-07-21 10:30:48 +08:00 |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
2016-07-14 17:23:48 +08:00 |
 yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
2016-06-17 14:31:14 +08:00 |
 huang
|
2f9dcc8a31
|
文章点击500问题
|
2016-06-08 11:23:16 +08:00 |
|
huang
|
a138ee31ab
|
详情页面取消首页问题
|
2016-06-08 11:00:19 +08:00 |
|
huang
|
09ff5954bd
|
字体过长演示问题（模式二子页面）
|
2016-06-07 16:56:20 +08:00 |
|
huang
|
acf4a64e6a
|
二级帖子子页面
|
2016-06-07 15:40:28 +08:00 |
|
huang
|
0b869aaaed
|
去掉定制功能
|
2016-06-03 15:40:11 +08:00 |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 14:58:37 +08:00 |
|
huang
|
e05e6ba53d
|
样式对齐问题
|
2016-06-02 18:04:00 +08:00 |
|
huang
|
5d880db18e
|
详情页面没登陆可以回复
|
2016-06-02 17:54:12 +08:00 |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
2016-05-27 15:30:35 +08:00 |
|
huang
|
74384d10a5
|
组织 论坛编辑
|
2016-05-27 10:06:25 +08:00 |
|
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
2016-05-25 16:19:41 +08:00 |
|
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
2016-05-24 09:40:16 +08:00 |
|
yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
2016-05-20 22:07:33 +08:00 |
|
yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
2016-05-20 20:08:46 +08:00 |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
|
huang
|
37b93a4595
|
文章回复不能用的问题
|
2016-05-13 20:01:45 +08:00 |
|
huang
|
c400b44230
|
一级目录列表引起的问题
|
2016-05-05 20:19:39 +08:00 |
 Tim
|
399f757811
|
0
|
2016-05-04 09:01:51 +08:00 |
|
huang
|
48002eb247
|
二级目录讨论区添加帖子回复功能
|
2016-05-03 19:03:28 +08:00 |
|
cxt
|
0d5bad1ddd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 20:11:00 +08:00 |
|
cxt
|
35faa12d4d
|
组织编辑文章无法提交
|
2016-03-25 20:10:53 +08:00 |
 ouyangxuhua
|
0f4d2e40fb
|
添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整
|
2016-03-25 19:09:25 +08:00 |
|
ouyangxuhua
|
cca2527401
|
组织栏目新建文章样式调整
|
2016-03-25 17:16:36 +08:00 |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
2016-03-24 17:03:51 +08:00 |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
|
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
|
2016-03-17 15:27:52 +08:00 |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
2016-03-17 15:03:34 +08:00 |
|
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
|
2016-03-15 13:40:33 +08:00 |
 luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
2016-03-10 15:12:16 +08:00 |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
2016-03-10 12:47:10 +08:00 |
|
ouyangxuhua
|
1951d50bf7
|
组织文章不显示回复框的问题
|
2016-02-26 16:37:13 +08:00 |
|
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
2016-02-24 09:50:53 +08:00 |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
2016-02-23 13:36:05 +08:00 |
|
ouyangxuhua
|
9c2d8f7ab6
|
组织二级回复中，工具栏图标乱码问题修复
|
2016-02-23 13:33:01 +08:00 |
|
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
|
2016-02-20 16:49:19 +08:00 |
|
ouyangxuhua
|
72c0173256
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-20 11:06:37 +08:00 |
|
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题
|
2016-02-20 11:06:21 +08:00 |
 guange
|
a421e8c6fa
|
组织文章无法编辑问题
|
2016-02-18 14:29:46 +08:00 |
|
cxt
|
89599d8679
|
编辑组织帖子
|
2016-02-03 13:04:48 +08:00 |
|
cxt
|
2cc24e2d4b
|
组织帖子的新建
|
2016-02-03 12:57:30 +08:00 |
|
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
2016-02-02 17:16:50 +08:00 |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-02 15:57:23 +08:00 |
|
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
|
2016-02-02 15:55:07 +08:00 |
|
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
|
2016-02-02 15:51:18 +08:00 |