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 |