 sw
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
2015-05-06 14:53:25 +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 |
|
sw
|
ba743c120b
|
1、课程留言回复框大小
2、课程留言有html代码
|
2015-04-08 17:58:53 +08:00 |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
2015-04-07 13:47:39 +08:00 |
 lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
2015-04-03 11:19:15 +08:00 |
 z9hang
|
1c53731966
|
留言框样式调整
|
2015-03-27 16:02:06 +08:00 |
|
z9hang
|
e1afdab988
|
留言样式修改
|
2015-03-26 17:41:25 +08:00 |
|
z9hang
|
8190d0cecc
|
修改留言页面样式
|
2015-03-24 19:51:03 +08:00 |
|
sw
|
e6aab5baf2
|
#1650 老师应该可以删除自己课程的留言，或帖子
|
2014-12-24 09:30:45 +08:00 |
 zhuhao
|
21c1b63c6d
|
新建作业和留言两处的提交按钮样式统一
|
2014-11-27 17:34:27 +08:00 |
|
z9hang
|
e6aa9d3592
|
修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制
|
2014-11-12 15:09:39 +08:00 |
|
z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
2014-11-05 09:51:30 +08:00 |
|
z9hang
|
07c21e97d6
|
修复竞赛、课程、项目留言模块样式
|
2014-11-04 18:30:45 +08:00 |