z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
2014-07-18 16:39:39 +08:00 |
sw
|
999a252f7b
|
修改软件创客搜索结果显示样式
|
2014-07-18 15:47:48 +08:00 |
sw
|
46c7a4bb9f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 14:15:52 +08:00 |
sw
|
4a04d47c3c
|
commit
|
2014-07-18 14:15:30 +08:00 |
yanxd
|
164ec645ee
|
boards created frequently, css file file EOF.
|
2014-07-18 09:20:16 +08:00 |
nwb
|
02b4029e8c
|
资源文件下载界面调整
|
2014-07-17 15:05:49 +08:00 |
sw
|
4825c5287e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 10:15:43 +08:00 |
nwb
|
3254c4a237
|
修正二级菜单名称显示问题
|
2014-07-16 09:45:39 +08:00 |
sw
|
f8d3d60b27
|
tttttttt
|
2014-07-16 08:53:14 +08:00 |
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-15 16:16:13 +08:00 |
z9hang
|
6a45a0287d
|
添加删除图片功能,修复用户修改资料界面form.quene undefine的js错误(导致加载中不消失的原因)
|
2014-07-15 16:13:50 +08:00 |
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-11 11:45:46 +08:00 |
yanxd
|
2be5041d0d
|
文件界面的样式修改
|
2014-07-11 10:42:55 +08:00 |
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
2014-07-11 09:08:50 +08:00 |
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
2014-07-11 09:07:09 +08:00 |
yanxd
|
056f86caad
|
can't download, html. after exception return;
|
2014-07-10 16:41:34 +08:00 |
sw
|
a5518363c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-10 11:31:44 +08:00 |
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
2014-07-10 10:15:20 +08:00 |
yanxd
|
2ff24841fd
|
optimization image check.
|
2014-07-10 10:12:16 +08:00 |
yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
2014-07-10 10:05:45 +08:00 |
sw
|
aec6d33db7
|
添加wiki编辑插件
|
2014-07-10 09:12:44 +08:00 |
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
2014-07-07 13:41:44 +08:00 |
z9hang
|
2dd249a105
|
修正发帖不填主题报错问题,修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个
|
2014-07-04 10:10:20 +08:00 |
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
2014-07-02 14:58:52 +08:00 |
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 |
nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 14:39:00 +08:00 |
nwb
|
7df6be8ff4
|
调整资源文件界面
|
2014-05-17 14:07:57 +08:00 |
yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
2014-05-17 10:44:01 +08:00 |
nwb
|
7e4343f00f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-16 17:29:59 +08:00 |
nwb
|
8f153520b4
|
调整上传资源界面
|
2014-05-16 16:29:01 +08:00 |
t430
|
09eae52fc1
|
hard picture file
|
2014-05-15 19:09:35 +08:00 |
yanxd
|
4db228f88e
|
调整tag高度为啥要修改两个地方我自己也忘了,改天再说
|
2014-05-15 15:52:25 +08:00 |
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
yanxd
|
14e4bf5bcc
|
typo
|
2014-05-14 17:20:31 +08:00 |
yanxd
|
829c77879a
|
typo
|
2014-05-14 17:12:04 +08:00 |
nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-14 15:08:30 +08:00 |
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
2014-05-14 15:03:04 +08:00 |
ganyiang
|
27ade53af3
|
针对OSP社区的新需求的界面展示:
1.开源项目社区(OSP)index界面增加[软件安全漏洞]展示
2.osp项目主页增加[项目安全态势]、[技术创新趋势] 展示
ps.此次为不负责任的提交~
|
2014-05-14 09:45:11 +08:00 |
z9hang
|
6e14e0b262
|
提交作业窗口删除全部图标位置修正
|
2014-05-13 12:01:43 +08:00 |
z9hang
|
a80da022cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-12 09:33:19 +08:00 |
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
2014-05-10 09:22:45 +08:00 |
z9hang
|
7a341972e7
|
course网站中大学名加上该大学在本站的链接
|
2014-05-09 11:47:41 +08:00 |
yanxd
|
c2284deaf7
|
application.css 分页css问题
|
2014-05-08 18:40:10 +08:00 |
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
2014-05-08 18:15:58 +08:00 |
z9hang
|
268dc1acce
|
主页讨论吧动态前显示吧名
|
2014-05-08 17:37:38 +08:00 |
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
2014-05-08 15:27:16 +08:00 |
ganyiang
|
5e780e6872
|
修复新建问题中autocomplete在Firefox下的不正常
|
2014-05-08 12:18:05 +08:00 |
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
2014-05-07 20:30:42 +08:00 |
yanxd
|
8770599352
|
css typo
|
2014-05-07 10:58:49 +08:00 |
yanxd
|
eb19b0cb1f
|
welcome css改标点错误
|
2014-05-06 17:14:36 +08:00 |
yanxd
|
05baffe4f3
|
issue导航,首页贴吧动态html,加入了最后回复
|
2014-05-06 17:04:24 +08:00 |