 nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
2014-06-26 08:53:16 +08:00 |
|
nwb
|
ae3457e68b
|
1.添加代码评审(CodeReview)插件
2.添加代码评审插件使用文档
|
2014-06-24 15:42:28 +08:00 |
|
nwb
|
067a2d7841
|
修改文件未找到界面
|
2014-06-23 16:13:00 +08:00 |
|
nwb
|
6039cf63af
|
课程讨论区文件上传权限优化
|
2014-06-20 09:08:18 +08:00 |
 yanxd
|
8840a11a99
|
attachments error
|
2014-06-17 18:38:13 +08:00 |
|
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
2014-06-17 10:12:44 +08:00 |
|
yanxd
|
099577fb59
|
remove all icon display
|
2014-06-16 17:51:51 +08:00 |
|
yanxd
|
63cd19c15c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-16 09:18:48 +08:00 |
 z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
2014-06-13 16:09:43 +08:00 |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
2014-06-13 10:59:43 +08:00 |
|
yanxd
|
13a65821e2
|
坑
|
2014-06-10 17:33:40 +08:00 |
 wanglinchun
|
a40db3dc4b
|
首页添加了竞赛所获奖项显示
|
2014-06-10 17:17:31 +08:00 |
|
yanxd
|
73f5bab075
|
document css/
wiki h2 bug
|
2014-06-10 15:59:57 +08:00 |
|
nwb
|
10397eec3e
|
更改课程图标显示逻辑，添加课程图标文件夹
|
2014-06-04 17:30:42 +08:00 |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
2014-06-03 21:52:16 +08:00 |
|
z9hang
|
2e9251530c
|
修改缺陷状态留言处引用的链接被遮住问题
|
2014-05-30 16:27:05 +08:00 |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
2014-05-30 10:57:13 +08:00 |
ganyiang
|
b4c299bff8
|
修复osp中“热帖”下显示“没有帮助”的问题
|
2014-05-30 09:35:06 +08:00 |
|
ganyiang
|
e901e8046d
|
修改osp中allbug的显示界面
|
2014-05-29 22:25:53 +08:00 |
|
ganyiang
|
c8ca5277a6
|
新增osp项目“聚焦”标签 （演示用）
|
2014-05-29 21:43:50 +08:00 |
|
ganyiang
|
6ca1d7f7ab
|
修改osp的css文件，解决标题过长的显示问题
|
2014-05-29 20:04:09 +08:00 |
|
yanxd
|
006e4ae45e
|
user tab bar
|
2014-05-29 18:34:51 +08:00 |
|
z9hang
|
97ae2356bf
|
引用被遮住不能点问题
|
2014-05-28 20:09:49 +08:00 |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
2014-05-27 17:04:29 +08:00 |
|
yanxd
|
654cb404e2
|
bootstrap test
|
2014-05-26 11:27:10 +08:00 |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
2014-05-26 09:05:36 +08:00 |
|
yanxd
|
2273a6fd0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-26 08:56:58 +08:00 |
|
yanxd
|
d77d7e14c7
|
home page memo css no wrap
|
2014-05-26 08:56:16 +08:00 |
|
yanxd
|
7a4e5afba0
|
test
|
2014-05-24 12:12:38 +08:00 |
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 17:12:10 +08:00 |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
2014-05-23 17:07:58 +08:00 |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
2014-05-23 09:49:36 +08:00 |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 09:44:33 +08:00 |
|
yanxd
|
2681c3ce88
|
...
|
2014-05-22 16:12:42 +08:00 |
|
ganyiang
|
c70352011d
|
修复buglist.css对整体界面的影响
|
2014-05-22 15:46:22 +08:00 |
|
yanxd
|
34aa8433de
|
import hubspot
|
2014-05-22 11:00:13 +08:00 |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
2014-05-22 09:58:19 +08:00 |
|
yanxd
|
9edb8a49de
|
fontsize fix
|
2014-05-21 18:38:46 +08:00 |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
2014-05-21 18:21:57 +08:00 |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-21 11:09:22 +08:00 |
|
yanxd
|
0ab17f1e90
|
contest image show
|
2014-05-21 09:46:40 +08:00 |
|
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
2014-05-21 08:25:20 +08:00 |
|
wanglinchun
|
bcb3bf0c19
|
调整参赛作品编辑页面中托管项目列表的显示宽度
|
2014-05-20 16:13:59 +08:00 |
|
yanxd
|
112b8de921
|
issues#575
|
2014-05-20 09:50:28 +08:00 |
|
wanglinchun
|
f815410381
|
修改了新建参赛作品中托管项目的显示颜色和宽度
|
2014-05-20 09:40:13 +08:00 |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
2014-05-19 17:39:51 +08:00 |
|
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
2014-05-19 16:12:18 +08:00 |
|
z9hang
|
19d1682077
|
修改编辑作业提交文件处样式
|
2014-05-19 15:23:34 +08:00 |
|
z9hang
|
ea095a6f61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 15:17:09 +08:00 |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
2014-05-17 15:15:33 +08:00 |