 cxt
|
d2b6d81373
|
Merge branch 'cxt_replies' into develop
Conflicts:
app/views/blog_comments/show.html.erb
app/views/blogs/_article.html.erb
app/views/org_document_comments/show.html.erb
|
2016-10-13 14:22:05 +08:00 |
|
cxt
|
a581f989c9
|
给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复
|
2016-10-11 14:08:44 +08:00 |
|
cxt
|
3b44f05b2b
|
博客的详情页回复分页、博客列表的回复数未统计二级回复
|
2016-10-09 11:12:44 +08:00 |
 huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
2016-05-19 16:10:18 +08:00 |
 yuanke
|
0e016eed2a
|
KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布
|
2016-05-18 14:15:39 +08:00 |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
2016-05-16 16:57:18 +08:00 |
|
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-05-06 11:35:27 +08:00 |
|
yuanke
|
9dc92fe817
|
列表优化
|
2016-05-04 16:28:40 +08:00 |
|
cxt
|
14a539bd0a
|
样式冲突
|
2016-05-03 11:40:24 +08:00 |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
2016-04-29 13:42:58 +08:00 |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
2016-04-28 10:19:59 +08:00 |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
2016-04-26 15:10:47 +08:00 |
|
yuanke
|
c8eaf293e7
|
课程列表
|
2016-04-24 10:49:33 +08:00 |
|
yuanke
|
a4d250e168
|
博客列表
|
2016-04-23 13:20:49 +08:00 |
|
yuanke
|
5c5d212193
|
博客列表
|
2016-04-22 13:52:33 +08:00 |
|
yuanke
|
85055f2a84
|
博客列表修改
|
2016-04-21 09:39:21 +08:00 |
|
yuanke
|
29115bca3a
|
博客列表修改
|
2016-04-20 16:12:20 +08:00 |
 ouyangxuhua
|
9bac560906
|
超级管理员有编辑和删除博客的权限
|
2016-03-16 10:00:21 +08:00 |
 luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
2016-03-10 15:12:16 +08:00 |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
2016-01-29 16:55:07 +08:00 |
|
cxt
|
247924af26
|
动态内容显示不全
|
2016-01-21 11:24:26 +08:00 |
|
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
|
2016-01-20 09:27:29 +08:00 |
|
ouyangxuhua
|
e70e1beb5d
|
Merge branch 'szzh' into dev_hjq
|
2016-01-19 16:59:04 +08:00 |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
2016-01-19 16:53:34 +08:00 |
|
cxt
|
8e9c4bab6b
|
赞增加tip
|
2016-01-19 10:08:28 +08:00 |
|
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
|
2016-01-18 17:12:56 +08:00 |
|
cxt
|
c5935a6a46
|
博客动态添加点赞
|
2016-01-18 15:52:38 +08:00 |
|
ouyangxuhua
|
5e102d24dd
|
解决个人博客报500的问题
|
2016-01-18 11:01:04 +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 |
|
cxt
|
96a28fe5b5
|
博客动态添加更新时间
|
2016-01-12 16:13:49 +08:00 |
|
ouyangxuhua
|
2f5ada2d7b
|
博客设为首页后，显示在个人主页处
|
2016-01-11 16:56:57 +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 |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
2016-01-08 16:05:36 +08:00 |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
2016-01-08 14:53:12 +08:00 |
|
ouyangxuhua
|
5eceb3d841
|
解决一些bug; 增加已设为首页标签
|
2016-01-08 14:42:21 +08:00 |
|
ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
2016-01-07 15:09:09 +08:00 |
|
huang
|
fc55be78c6
|
博客列表展开/
|
2016-01-05 17:01:41 +08:00 |
|
huang
|
738acad211
|
展开、收缩
|
2016-01-05 16:52:34 +08:00 |
|
huang
|
428eb018a3
|
隐藏注册中“组织一列”
|
2016-01-05 15:02:39 +08:00 |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
2016-01-05 12:59:59 +08:00 |
 lizanle
|
788e900d4a
|
个人博客发博文也要显示动态
个人博客 编辑设置菜单要出现在博客列表的右上方
|
2015-10-28 10:58:37 +08:00 |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
2015-10-24 15:34:43 +08:00 |