 Tim
|
2c719feacd
|
无用的内联样式
|
2016-09-08 18:34:35 +08:00 |
 cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 16:23:07 +08:00 |
 yuanke
|
2a6321cd9e
|
发布帖子标题长度改为128
|
2016-08-26 14:03:09 +08:00 |
|
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
2016-08-25 15:59:09 +08:00 |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
2016-07-28 15:11:04 +08:00 |
 daiao
|
1dcf4918b9
|
非管理员用户在新建帖子时，置顶及锁定功能在页面不显示
|
2016-07-26 14:30:12 +08:00 |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
2016-07-21 09:55:47 +08:00 |
|
daiao
|
7808bb5ebe
|
修复非管理远用户帖子出现管理员帖子置顶的问题
|
2016-07-19 17:37:39 +08:00 |
|
Tim
|
b02c1b5995
|
提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；
|
2016-07-07 15:08:34 +08:00 |
|
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
|
cxt
|
979598f334
|
课程问答区帖子的发送防止连续提交
|
2016-05-13 11:06:47 +08:00 |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
2016-04-27 16:02:52 +08:00 |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
2016-04-26 15:10:47 +08:00 |
 huang
|
9549d695f6
|
讨论区局部优化
|
2016-03-25 14:29:58 +08:00 |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
2016-03-17 15:03:34 +08:00 |
|
cxt
|
4f3055c990
|
讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。
|
2016-03-04 17:11:52 +08:00 |
 ouyangxuhua
|
cdd997e45e
|
kindeditor回复框修改
|
2016-02-01 14:50:45 +08:00 |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
2016-01-29 16:55:07 +08:00 |
 guange
|
d935532f8d
|
课程讨论区at功能
|
2016-01-13 17:50:08 +08:00 |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-08 18:11:54 +08:00 |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
2016-01-08 14:53:12 +08:00 |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-06 09:27:00 +08:00 |
|
huang
|
738acad211
|
展开、收缩
|
2016-01-05 16:52:34 +08:00 |
|
huang
|
2efcb5b89a
|
课程讨论区添加展开、收缩
|
2016-01-05 16:05:27 +08:00 |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
2016-01-05 12:59:59 +08:00 |
|
huang
|
3394af7ad5
|
Merge branch 'develop' into hjq_new_course
|
2016-01-04 10:29:13 +08:00 |
|
cxt
|
3dac8d2944
|
课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限
|
2015-12-31 17:53:05 +08:00 |
|
huang
|
0541294c33
|
为解决完：
1、user_message_system附件显示问题
2、issue回复添加附件问题
|
2015-12-31 17:08:27 +08:00 |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
2015-12-30 15:46:01 +08:00 |
|
huang
|
5618fe067a
|
项目分页，点击加载
|
2015-12-29 16:40:07 +08:00 |
|
huang
|
b6cf709696
|
解决讨论区冲突
|
2015-12-29 11:29:43 +08:00 |
|
huang
|
c29e6f1b14
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/boards/_project_show.html.erb
app/views/boards/_project_show_detail.html.erb
解决冲突
|
2015-12-29 11:09:16 +08:00 |
|
huang
|
5060ec26bb
|
项目讨论区
|
2015-12-29 11:04:20 +08:00 |
|
ouyangxuhua
|
0d98dba25c
|
解决项目新建帖子中，点击取消按钮没有反应的问题
|
2015-12-29 09:53:44 +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 |
|
ouyangxuhua
|
7d7d9b77b5
|
编辑项目帖子样式改成方块样式
|
2015-12-24 11:58:00 +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
|
9e0b88c186
|
项目讨论区样式改成方块样式
|
2015-12-24 09:46:18 +08:00 |
|
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
2015-12-22 15:14:03 +08:00 |
|
cxt
|
108448cf4d
|
课程讨论区的加载更多
|
2015-12-18 17:28:47 +08:00 |
|
cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
2015-12-18 15:08:38 +08:00 |
|
cxt
|
a7c006c59f
|
课程讨论区的展开更多不可用
|
2015-12-18 15:02:36 +08:00 |
|
guange
|
fc63dfcb7b
|
消息通知
|
2015-12-17 15:14:52 +08:00 |
|
guange
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
|
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
2015-12-06 15:03:36 +08:00 |
|
cxt
|
cc59b4c877
|
课程讨论区编辑帖子报错
|
2015-10-20 15:15:18 +08:00 |
|
cxt
|
7dd6618345
|
非课程成员不能将帖子置顶和锁定
|
2015-10-16 17:32:17 +08:00 |
|
cxt
|
770f2f14bd
|
个人动态、课程动态、讨论区、单个帖子页面的图片可点击
|
2015-10-16 10:18:51 +08:00 |
|
cxt
|
a16dc09afa
|
讨论区帖子图片可点击
|
2015-10-16 09:26:13 +08:00 |
|
cxt
|
c5b881cb43
|
发布帖子按钮的样式调整
|
2015-10-15 16:59:17 +08:00 |