 guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
 lizanle
|
c1d82d6348
|
输入框 和 ke对齐
|
2015-12-09 09:39:07 +08:00 |
|
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
2015-12-06 15:03:36 +08:00 |
 cxt
|
ab868d7b65
|
课程通知增加置顶
|
2015-11-12 16:52:42 +08:00 |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
2015-09-22 15:54:50 +08:00 |
 huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
 ouyangxuhua
|
d21dce566f
|
修改新闻显示的word-break 和 word-wrap
|
2015-09-17 11:42:18 +08:00 |
|
cxt
|
069c1ddf3c
|
课程通知页面的评论提示
|
2015-09-15 15:45:16 +08:00 |
|
cxt
|
e10e5e8412
|
调整课程通知页面的回复头像样式
|
2015-09-15 09:50:57 +08:00 |
|
ouyangxuhua
|
d01a529040
|
项目消息标题判断
|
2015-09-08 15:27:58 +08:00 |
 sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
2015-08-29 17:50:15 +08:00 |
 suntao
|
efe5c1e3f4
|
课程宽度调整
|
2015-08-29 16:52:10 +08:00 |
|
sw
|
0e56a79622
|
课程通知查询不使用ajax局部刷新
|
2015-07-24 11:50:50 +08:00 |
|
lizanle
|
b148f75dc9
|
课程主题可以搜索
|
2015-07-22 10:22:50 +08:00 |
|
huang
|
e986ee4e4e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/_edit.html.erb
|
2015-07-03 10:51:54 +08:00 |
|
huang
|
b16e19096f
|
添加新闻回复
|
2015-07-03 10:25:21 +08:00 |
|
sw
|
af97f3bea8
|
课程作业、通知展开按钮居右
|
2015-06-30 10:18:46 +08:00 |
 yutao
|
ffd254b7bb
|
bug#2920:课程通知：对课程通知进行评论时，不输入字符，点击ENTER键也可以保存评论
|
2015-06-26 09:16:37 +08:00 |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
2015-06-17 17:01:03 +08:00 |
|
huang
|
b2f7b0f670
|
编辑器（未改动）
|
2015-06-15 10:34:23 +08:00 |
|
sw
|
06009934d8
|
编辑新闻无法编辑成功
|
2015-06-13 15:17:59 +08:00 |
|
sw
|
b7c04207e1
|
课程通知评论显示
|
2015-06-12 16:36:08 +08:00 |
|
sw
|
6d8f0e728d
|
课程 作业、通知模块，新版编辑器相关BUG
|
2015-06-12 16:26:24 +08:00 |
|
sw
|
a5d7c50fe3
|
课程通知展开按钮
|
2015-06-10 16:39:28 +08:00 |
|
sw
|
94e8bd13ab
|
资源作者
|
2015-06-10 16:24:11 +08:00 |
|
sw
|
c33af3d4bf
|
课程通知更多按钮
|
2015-06-02 17:50:57 +08:00 |
|
huang
|
04c54d4f6e
|
项目新闻显示页面时间和附件换位
|
2015-05-27 14:50:09 +08:00 |
|
huang
|
95f3d89afa
|
项目新闻添加编辑器：显示页面、列表页面新样式显示
|
2015-05-27 14:45:36 +08:00 |
|
guange
|
689ec5cdfc
|
课程通知列表更多功能bug
|
2015-05-21 15:57:58 +08:00 |
|
sw
|
8d44ed2189
|
课程--课程通知：取消编辑通知，应该返回通知详情页面，而非一个空白页
|
2015-05-14 15:17:30 +08:00 |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
2015-05-13 16:22:44 +08:00 |
|
guange
|
f31fe81c5d
|
将课程通知中的附件提到列表和动态中
|
2015-05-13 15:33:35 +08:00 |
|
sw
|
c51794d754
|
提交通知连接
|
2015-05-11 16:06:40 +08:00 |
|
sw
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
2015-05-06 14:53:25 +08:00 |
|
sw
|
b3fb7914e2
|
课程通知评论编辑框不可用，解决方案：编辑跳转到新的页面
|
2015-04-28 10:31:55 +08:00 |
|
sw
|
f67bdae22a
|
课程讨论去引用、回帖不换行
|
2015-04-24 09:10:15 +08:00 |
|
huang
|
fec0a7472d
|
新闻换行处理
|
2015-04-17 08:43:58 +08:00 |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-16 10:26:03 +08:00 |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
2015-04-14 23:58:27 +08:00 |
|
huang
|
f3ba393bd4
|
去掉代码审查
修改配置-“版本库”样式
|
2015-04-13 23:39:56 +08:00 |
|
huang
|
78868b34f0
|
修改缺陷中四中颜色按钮会折断换行的bug
区别新闻和通知
|
2015-04-11 15:12:06 +08:00 |
|
huang
|
4adfec5640
|
解决样式冲突
添加新闻展示页面
|
2015-04-11 14:49:26 +08:00 |
|
sw
|
837fe88545
|
还原冲突，增加项目配置切换js
|
2015-04-11 14:19:52 +08:00 |
whimlex
|
f79132e9be
|
项目新闻评论不显示无评论的查看
|
2015-04-11 14:01:51 +08:00 |
|
sw
|
b2b3aeb20b
|
课程讨论区评论图片问题
|
2015-04-10 17:18:52 +08:00 |
|
whimlex
|
e148917865
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-10 17:00:10 +08:00 |
|
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
2015-04-10 16:59:45 +08:00 |
|
sw
|
f0ba408a10
|
课程通知、个人动态 大图片超出页面
|
2015-04-10 16:14:19 +08:00 |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
2015-04-10 15:43:37 +08:00 |
|
sw
|
596bc213ca
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
2015-04-10 15:15:49 +08:00 |