 yutao
|
080b7972a6
|
...
|
2015-05-26 17:43:23 +08:00 |
|
yutao
|
49c5f3879b
|
...
|
2015-05-26 17:01:25 +08:00 |
|
yutao
|
8d82ecc89c
|
...
|
2015-05-26 15:01:11 +08:00 |
|
yutao
|
4244c69b46
|
...
|
2015-05-26 14:18:42 +08:00 |
|
yutao
|
69affa8a2e
|
...
|
2015-05-25 15:19:42 +08:00 |
|
yutao
|
fe404f8cb1
|
...
|
2015-05-23 16:35:57 +08:00 |
|
yutao
|
72b93fa8f0
|
...
|
2015-05-23 16:02:41 +08:00 |
 alan
|
1c9b9dff79
|
修改《编辑器还原》《提示信息的添加》
Signed-off-by: alan <547533434@qq.com>
|
2015-05-22 13:57:07 +08:00 |
|
alan
|
c18d1d9585
|
修改《匿名发布新帖》《编辑时出现跳转错误》
Signed-off-by: alan <547533434@qq.com>
|
2015-05-22 11:09:43 +08:00 |
|
alan
|
a0ca31780e
|
修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
|
2015-05-21 16:35:53 +08:00 |
|
alan
|
4a588506a4
|
增加编辑器
Signed-off-by: alan <547533434@qq.com>
|
2015-05-20 17:38:40 +08:00 |
|
alan
|
34893db465
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-18 14:53:01 +08:00 |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:11:20 +08:00 |
|
alan
|
bd77ad9ac1
|
展开。收起
Signed-off-by: alan <547533434@qq.com>
|
2015-05-13 17:25:31 +08:00 |
|
alan
|
fe2f6a0d9d
|
修改样式以及添加回复取消功能
Signed-off-by: alan <547533434@qq.com>
|
2015-05-13 14:31:54 +08:00 |
|
alan
|
79c0c6f551
|
修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:45:03 +08:00 |
|
alan
|
25bcc676b9
|
增加附件功能以及修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:23:15 +08:00 |
|
alan
|
c21f2c3927
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 14:02:46 +08:00 |
|
alan
|
2d93cd4bdc
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 13:33:18 +08:00 |
|
alan
|
23ef975c23
|
讨论区修改bug
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 13:04:25 +08:00 |
 huang
|
30c6a71cbc
|
修正新建课程讨论区跳转
|
2015-05-08 11:25:25 +08:00 |
|
alan
|
07ca42b24d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-08 10:59:30 +08:00 |
|
alan
|
63351fc049
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 10:59:11 +08:00 |
|
huang
|
e6fe010bd7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 10:56:33 +08:00 |
|
huang
|
5167cf374c
|
项目讨论区左侧新建按钮跳转页面修改
通过传参跳入（JS实现）
|
2015-05-08 10:56:02 +08:00 |
|
alanlong9278
|
087f46bf64
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 10:24:26 +08:00 |
|
huang
|
39fe748da7
|
处理项目讨论区主题、描述内容过长
|
2015-05-08 10:10:35 +08:00 |
|
alanlong9278
|
358c9aa019
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-08 10:09:17 +08:00 |
|
alanlong9278
|
65c2c43dcb
|
展开收起回复
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 10:09:01 +08:00 |
|
alanlong9278
|
3d74734607
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 09:48:43 +08:00 |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 17:38:08 +08:00 |
|
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 16:10:07 +08:00 |
|
alan
|
eee0df8d22
|
修改课程，项目的讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 09:53:34 +08:00 |
|
alan
|
d73ed9e467
|
项目讨论区改版
Signed-off-by: alan <547533434@qq.com>
|
2015-05-05 14:32:40 +08:00 |
|
alan
|
a5760afa68
|
项目讨论区界面更改
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 17:44:03 +08:00 |
|
huang
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
2015-04-29 14:29:03 +08:00 |
|
huang
|
9cfcbc5584
|
项目讨论区--未登录情况下提示界面
|
2015-04-22 13:56:36 +08:00 |
|
huang
|
861469e39f
|
1、修改回复帖子和新建帖子标题冲突
2、对齐新建框
3、版本库新建按钮样式
|
2015-04-21 16:11:25 +08:00 |
|
huang
|
ce5b2d9996
|
项目讨论区回复按钮
|
2015-04-16 17:29:04 +08:00 |
|
huang
|
e34a00f66e
|
讨论区列表样式冲突
|
2015-04-16 11:17:44 +08:00 |
|
huang
|
dc81db1d8b
|
处理讨论区、缺陷列表样式显示异常
|
2015-04-16 11:07:37 +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
|
e0695fa51d
|
讨论区。描述、主题换行
|
2015-04-15 00:30:33 +08:00 |
whimlex
|
2a35e771c2
|
项目界面国际化及样式调整；标签模块国际化及样式调整
|
2015-04-10 12:48:02 +08:00 |
|
huang
|
8b379711d9
|
1、修改附件列表排列和样式
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
|
2015-04-07 17:45:00 +08:00 |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
2015-04-07 12:48:47 +08:00 |
|
whimlex
|
6e0de61458
|
项目讨论区回复修改
|
2015-04-03 16:13:31 +08:00 |
|
huang
|
1cdf397bc0
|
修改关注、申请方法中样式
|
2015-03-18 20:04:59 +08:00 |
|
huang
|
4111e2a940
|
1、讨论区新子界面
2、项目右侧优化
|
2015-03-17 17:02:32 +08:00 |
 sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
2015-03-11 10:16:06 +08:00 |