 lizanle
|
10bd7c2855
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-16 14:59:11 +08:00 |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
2015-04-16 14:59:05 +08:00 |
whimlex
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
2015-04-16 14:25:02 +08:00 |
 huang
|
4afd9afd08
|
解决冲突。修改版本页面
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/project.css
|
2015-04-16 13:42:45 +08:00 |
|
huang
|
08fb04aff4
|
修改版本库样式
|
2015-04-16 13:40:46 +08:00 |
|
whimlex
|
20b17f5503
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 12:15:55 +08:00 |
|
whimlex
|
301e44c695
|
修改附件上传功能无效
|
2015-04-16 12:15:36 +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
|
61ce44af76
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 05:01:58 +08:00 |
|
huang
|
c11fdc7273
|
版本库调整：未完成
|
2015-04-16 05:01:09 +08:00 |
|
whimlex
|
1d8dee15f4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 04:59:18 +08:00 |
|
whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整
|
2015-04-16 04:12:26 +08:00 |
|
huang
|
fec751608a
|
完成里程碑界面
|
2015-04-16 03:54:07 +08:00 |
|
huang
|
8e7b4868ca
|
wiki页面调整
|
2015-04-16 00:30:23 +08:00 |
|
huang
|
6229acac71
|
完成wiki新建界面
|
2015-04-15 21:44:19 +08:00 |
|
whimlex
|
d79de0a354
|
课程日期控件样式冲突
|
2015-04-15 20:27:09 +08:00 |
|
whimlex
|
7fa2338ce6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-15 16:34:52 +08:00 |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
2015-04-15 16:34:34 +08:00 |
 sw
|
898d15aa7a
|
更新course.css文件
|
2015-04-15 14:41:48 +08:00 |
|
sw
|
e579157604
|
更新public.css
课程讨论区文件按钮和editor靠的太近
|
2015-04-15 14:29:35 +08:00 |
|
huang
|
c607bd5cbf
|
定义缺陷中样式
|
2015-04-15 12:50:27 +08:00 |
|
sw
|
be08a9afbb
|
修改application.css中错误css
|
2015-04-15 11:42:23 +08:00 |
|
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
2015-04-15 10:06:52 +08:00 |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
2015-04-14 23:58:27 +08:00 |
|
whimlex
|
cdf1ce1c17
|
缺陷页面
|
2015-04-14 19:56:03 +08:00 |
|
sw
|
c60515ac50
|
学生作业增加按学生真实姓名、昵称、学号搜索功能
|
2015-04-14 19:24:39 +08:00 |
|
sw
|
bb9513b313
|
课程学生作业列表增加搜索的静态页面
|
2015-04-14 16:36:03 +08:00 |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
2015-04-13 18:34:44 +08:00 |
|
sw
|
01f56a761f
|
完成配置---模块
|
2015-04-11 17:28:18 +08:00 |
|
sw
|
fb935f124c
|
完成修改项目界面
|
2015-04-11 17:04:48 +08:00 |
|
huang
|
78868b34f0
|
修改缺陷中四中颜色按钮会折断换行的bug
区别新闻和通知
|
2015-04-11 15:12:06 +08:00 |
|
huang
|
4adfec5640
|
解决样式冲突
添加新闻展示页面
|
2015-04-11 14:49:26 +08:00 |
|
sw
|
b06e9ce468
|
干掉重复样式
|
2015-04-11 14:22:50 +08:00 |
|
sw
|
633a53d1d4
|
更新css文件
|
2015-04-11 14:17:51 +08:00 |
|
sw
|
9ad00e437f
|
1、修改引用的样式
2、修改错误图片链接
|
2015-04-11 11:51:11 +08:00 |
|
huang
|
b8b8a12ca8
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-11 11:50:33 +08:00 |
|
huang
|
8f6b095fdb
|
新闻页面调整
|
2015-04-11 11:48:39 +08:00 |
|
sw
|
3313bef0b1
|
路由报错
|
2015-04-11 11:00:06 +08:00 |
|
huang
|
33abbaffe1
|
修改isuue显示界面
附件显示形式
国际化
部分样式调整
|
2015-04-10 17:49:16 +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
|
600003e48c
|
公共贴吧中使用新编辑器上传大图片，图片超出界面
|
2015-04-10 15:54:17 +08:00 |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
2015-04-10 15:43:37 +08:00 |
|
sw
|
ea0bd7e0dd
|
1、技术支持只有白羽
2、修改鼠标悬浮在白羽上有下划线
|
2015-04-10 15:22:03 +08:00 |
|
sw
|
172e69a552
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
2015-04-10 15:16:11 +08:00 |
|
sw
|
0c949b7117
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
2015-04-10 15:16:02 +08:00 |
|
sw
|
596bc213ca
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
2015-04-10 15:15:49 +08:00 |
|
huang
|
f2cf46f0a0
|
修改缺陷列表显示bug
|
2015-04-09 19:38:49 +08:00 |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
2015-04-09 19:18:04 +08:00 |