 yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
yanxd
|
9edb8a49de
|
fontsize fix
|
11 years ago |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
11 years ago |
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
yanxd
|
0ab17f1e90
|
contest image show
|
11 years ago |
|
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
11 years ago |
 wanglinchun
|
bcb3bf0c19
|
调整参赛作品编辑页面中托管项目列表的显示宽度
|
11 years ago |
|
yanxd
|
112b8de921
|
issues#575
|
11 years ago |
|
wanglinchun
|
f815410381
|
修改了新建参赛作品中托管项目的显示颜色和宽度
|
11 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
11 years ago |
|
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
11 years ago |
 z9hang
|
19d1682077
|
修改编辑作业提交文件处样式
|
11 years ago |
|
z9hang
|
ea095a6f61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
11 years ago |
 nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
11 years ago |
|
yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
11 years ago |
|
nwb
|
7e4343f00f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
8f153520b4
|
调整上传资源界面
|
11 years ago |
|
t430
|
09eae52fc1
|
hard picture file
|
11 years ago |
|
yanxd
|
4db228f88e
|
调整tag高度为啥要修改两个地方我自己也忘了，改天再说
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
yanxd
|
14e4bf5bcc
|
typo
|
11 years ago |
|
yanxd
|
829c77879a
|
typo
|
11 years ago |
|
nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
11 years ago |
ganyiang
|
27ade53af3
|
针对OSP社区的新需求的界面展示：
1.开源项目社区(OSP)index界面增加[软件安全漏洞]展示
2.osp项目主页增加[项目安全态势]、[技术创新趋势] 展示
ps.此次为不负责任的提交~
|
11 years ago |
|
z9hang
|
6e14e0b262
|
提交作业窗口删除全部图标位置修正
|
11 years ago |
|
z9hang
|
a80da022cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
11 years ago |
|
z9hang
|
7a341972e7
|
course网站中大学名加上该大学在本站的链接
|
11 years ago |
|
yanxd
|
c2284deaf7
|
application.css 分页css问题
|
11 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
11 years ago |
|
z9hang
|
268dc1acce
|
主页讨论吧动态前显示吧名
|
11 years ago |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
11 years ago |
|
ganyiang
|
5e780e6872
|
修复新建问题中autocomplete在Firefox下的不正常
|
11 years ago |
|
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
11 years ago |
|
yanxd
|
8770599352
|
css typo
|
11 years ago |
|
yanxd
|
eb19b0cb1f
|
welcome css改标点错误
|
11 years ago |
|
yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
11 years ago |
|
wanglinchun
|
0634f36c10
|
"打分后不要显示英文，而且还要提示：您可以重新打分"问题解决
|
11 years ago |
Wen
|
c893227609
|
个人资料页面学校选择框更改
|
11 years ago |
|
yanxd
|
0cfd5929d8
|
Revert "tag todo"
eee
This reverts commit 08b27f38a7.
|
11 years ago |
|
Wen
|
50745d5d21
|
course首页布局上的小调整
|
11 years ago |
|
Wen
|
815e7cf3af
|
个人资料修改页面 限制了学校列表的高度并添加了滚动条
|
11 years ago |
|
Wen
|
10fdcbb050
|
一个简单的后台上传学校logo的页面.
|
11 years ago |
|
Wen
|
a8e029da58
|
数据库迁移：更改了默认的学校logo
|
11 years ago |
|
yanxd
|
939e4cc100
|
footer 下方距离
welcome调整下主页
|
11 years ago |
|
Wen
|
ba80593ab0
|
别忘了改数据库！= =
|
11 years ago |
|
Wen
|
02295e5ca9
|
给严总调试用
|
11 years ago |
|
yanxd
|
08b27f38a7
|
tag todo
|
11 years ago |
|
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
yanxd
|
e2a5e2f730
|
footer
|
11 years ago |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
11 years ago |
|
wanglinchun
|
05c0d2a5ac
|
替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
|
11 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
11 years ago |
|
yanxd
|
8775eab3dd
|
iscas modify
|
11 years ago |
|
yanxd
|
83f039a014
|
modify pku.png
|
11 years ago |
|
yanxd
|
a4ab29f49d
|
footer logo modify
|
11 years ago |
 kg
|
158c950b78
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
bdefa322cc
|
modify foot
|
11 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
11 years ago |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
|
kg
|
d450da9df8
|
footer , footer of base_course,upload files count and delete all upload
|
11 years ago |
|
kg
|
3f096f9167
|
add pdl logo
|
11 years ago |
|
kg
|
69dbd5a85e
|
add logos and modify footer;footer position problem of some projects and courses
|
11 years ago |
|
wanglinchun
|
1a6a20e761
|
竞赛模块首页布局和显示效果调整好
|
11 years ago |
|
yanxd
|
6f5fcd0dee
|
测试作业下载
|
11 years ago |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
11 years ago |
|
yanxd
|
28bebb1ee7
|
add Gem
zip
root path firefox bug
|
11 years ago |
|
Wen
|
44560a679f
|
工作单位更改为下拉框选择
级联问题解决中 0.0
|
11 years ago |
|
wanglinchun
|
b4b61a3422
|
修改小bug；设计打分和评论唯一性前提交版
|
11 years ago |
|
yanxd
|
a5743cd987
|
button加作用域
|
11 years ago |
|
yanxd
|
2a62bc822a
|
修改ajax提交过程中，等待indicator被覆盖的问题
|
11 years ago |
|
wanglinchun
|
dfad0448e1
|
单个应用显示页面
|
11 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
11 years ago |
|
yanxd
|
3fad5abb5c
|
modal init
|
11 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
11 years ago |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
11 years ago |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
11 years ago |
|
yanxd
|
ad23ba646e
|
理理css
|
11 years ago |
|
yanxd
|
35d1c33a29
|
...
|
11 years ago |
|
yanxd
|
dba674dfec
|
首页调整
|
11 years ago |
|
yanxd
|
937d594c41
|
首页字体
|
11 years ago |
|
yanxd
|
a8d1608603
|
nil
|
11 years ago |
|
wanglinchun
|
8d2bbfe320
|
调整首页主题部分字体格式
|
11 years ago |
|
wanglinchun
|
83b97ef71d
|
调整主页中主体部分字体为粗体
|
11 years ago |
|
wanglinchun
|
1fabad8c2f
|
修改项目托管主页和课程实践主页主题句
|
11 years ago |
|
yanxd
|
b5215e95e0
|
store table用div重构
|
11 years ago |
|
yanxd
|
6cbd0f874c
|
store table用div重构
|
11 years ago |
|
yanxd
|
592d704a6d
|
主页 文件上传bug
|
11 years ago |
|
yanxd
|
0b385cdbbb
|
毛的资源库关联文件
|
11 years ago |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
11 years ago |
|
yanxd
|
2ca1362e83
|
“按用户搜索”和“搜索”的区别，分别可以搜索什么？ 上面搜索删掉
1、标签的格式需 要优化（所有涉及到标签的地方的标签的格式都需要调整） tag周围距离
“课程通知“应该调整到“课程作业”后面 改！
|
11 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
11 years ago |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
11 years ago |
|
Wen
|
2aa6a14289
|
回复按钮的位置调整
|
11 years ago |
|
Wen
|
12314de130
|
Redo
|
11 years ago |
|
yanxd
|
e7dab11250
|
wc modify
|
11 years ago |
 nieguanghui
|
a850cc8a04
|
修复侧边栏bug
|
11 years ago |
|
yanxd
|
f96428ef20
|
fix word break bug
|
11 years ago |
|
yanxd
|
f549645dce
|
字符超出边界问题， 新建课程404问题
|
11 years ago |
|
nieguanghui
|
c26cb56193
|
主页调整
|
11 years ago |
|
yanxd
|
0ed2e19268
|
项目列表
|
11 years ago |
|
yanxd
|
710adb8fed
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
eb7e2539b8
|
留言问题
|
11 years ago |
|
Wen
|
ed922dd192
|
删除了引用、删除之前的图标
|
11 years ago |
|
Wen
|
c231f3bd35
|
项目和课程的讨论区界面中，引用、编辑、删除均改为文字，且放置在楼层数旁边；
回复数量距离铸铁增加了四行的距离；
发表人及时间位置更改为主贴左下角，右下角改为“回复”
|
11 years ago |
|
wanglinchun
|
b621d15aaf
|
1485
|
12 years ago |
|
wanglinchun
|
f0132a0f5f
|
在“课程实践->讨论区”为匿名用户不能进行评论添加登陆的提示以及登陆的链接
在“课程实践->留言”中的用户反馈改为用户留言
将“课程实践”中讨论区、资源库、课程通知和留言中提示语格式进行统一
|
12 years ago |
|
yanxd
|
d202c84b44
|
导航条下拉菜单. [Version] alpha v0.1
|
12 years ago |
|
yanxd
|
0d9453080c
|
bug
|
12 years ago |
|
yanxd
|
099fffab51
|
Merge branch 'bigchange' into develop
|
12 years ago |
|
yanxd
|
951666a1ed
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
0e3dcf88ff
|
conflict
|
12 years ago |
|
yanxd
|
bacddf00d9
|
logo
|
12 years ago |
|
yanxd
|
52cffd3864
|
icon
|
12 years ago |
 baiyu
|
13fdbde1cf
|
个人分数
|
12 years ago |
|
nieguanghui
|
346e9574ca
|
Merge branch 'bigchange' of 10.0.47.245:/home/trustie2 into bigchange
|
12 years ago |
|
nieguanghui
|
18b4a3ff5c
|
changge
|
12 years ago |
|
yanxd
|
00022ce9fe
|
icon search controller
|
12 years ago |
|
nieguanghui
|
8d788fac45
|
modified
|
12 years ago |
|
yanxd
|
7ee1b06462
|
change image
|
12 years ago |
|
yanxd
|
a5c9d9c31e
|
um...
|
12 years ago |
|
yanxd
|
3d2c0ba721
|
add activityBox to project/course/contest html
|
12 years ago |
|
yanxd
|
289b0581df
|
stores css
|
12 years ago |
|
yanxd
|
16c4b0e18c
|
board#new css
|
12 years ago |
|
yanxd
|
b9967074dc
|
新闻界面修改，new页面bug修复
|
12 years ago |
|
wanglinchun
|
4be4fa5e9a
|
welome css
|
12 years ago |
|
wanglinchun
|
97749cfd8e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
wanglinchun
|
4167e8bb8f
|
修改了门户网站中用户动态的[进入附件列表]显示颜色
|
12 years ago |
|
yanxd
|
4587c840b1
|
a
|
12 years ago |
|
yanxd
|
4c0acc5f3e
|
welcome css
|
12 years ago |
|
nieguanghui
|
8b1264c99e
|
replace table with div + css ---- bids/show
|
12 years ago |
|
yanxd
|
32510028aa
|
论坛留言里发帖的分界
|
12 years ago |
|
yanxd
|
3dd3578bcb
|
设置回复时间字体大小，在Firefox页面中乱跳的问题
|
12 years ago |
|
nieguanghui
|
ae094bde28
|
主页界面修改
|
12 years ago |
|
nieguanghui
|
b0bb8b4a48
|
主页界面修改
|
12 years ago |
|
nieguanghui
|
398e35cf19
|
留言增加字数限制
|
12 years ago |
|
yanxd
|
8a1316cf8f
|
删除留言操作
|
12 years ago |
|
nieguanghui
|
4fc47ce3a3
|
修改回复按钮表现方式
|
12 years ago |
|
nieguanghui
|
6d47031d72
|
改变样式
|
12 years ago |
|
nieguanghui
|
d0c28a60bc
|
留言页面显示改进
|
12 years ago |
|
yanxd
|
7130347f39
|
回复框 设置姓名 七八糟
|
12 years ago |
|
nieguanghui
|
c05dd4f900
|
修改用户页面留言显示样式
|
12 years ago |
|
yanxd
|
1af4e4f712
|
welcome index css.
|
12 years ago |
|
yanxd
|
8e8f58a813
|
试试字体
|
12 years ago |
|
yanxd
|
60be338848
|
作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
|
12 years ago |
|
xianbo
|
da74c97b7d
|
fix the show of manager web
|
12 years ago |
|
nieguanghui
|
41fd14c074
|
1234
|
12 years ago |
|
yanxd
|
8043c527ce
|
项目-设置-问题-居中;
|
12 years ago |
|
yanxd
|
5e9bb9a99f
|
删除提示框作业，作业提交的问题。附件提交之后还会存在。
|
12 years ago |
|
yanxd
|
fcc2dd7952
|
首页版本库，sth.
|
12 years ago |
|
xianbo
|
25290770b3
|
delete redundance about css
|
12 years ago |
|
yanxd
|
3484632ce8
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
nieguanghui
|
f2d392de1d
|
调整主页界面显示
|
12 years ago |
|
yanxd
|
ee5194e052
|
jkl
|
12 years ago |
|
yanxd
|
b8e95ffc67
|
修改查询过滤样式
|
12 years ago |
|
yanxd
|
f29b2cfe12
|
整理issues界面，问题列表左移
|
12 years ago |
|
nieguanghui
|
c27528ffb7
|
1234
|
12 years ago |
|
yanxd
|
0bc2b8f2b3
|
项目论坛丢失了的编辑功能
贴吧的置顶锁定功能，目前只针对管理员开放
贴吧列表搜索功能重构
增加1/2帖子显示数目
取出楼主，防止输入帖子id让回复作为主贴显示
首页取新帖子
帖子下载内容随意删除功能
|
12 years ago |
xianbo
|
0f93065ac4
|
imitate github show help doucument
|
12 years ago |
|
yanxd
|
9742a94583
|
change line height in forums/index
|
12 years ago |
|
yanxd
|
eec3997c18
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
ad1e36b896
|
dxx it.
|
12 years ago |
|
nieguanghui
|
69c113f386
|
修改主页显示
|
12 years ago |
 huangjingquan
|
096f0eed03
|
添加了留言结果在用户动态里面显示
|
12 years ago |
|
nieguanghui
|
9c192f5a92
|
主页界面修改
|
12 years ago |
|
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉，
5.学生分页，分页方法封装
|
12 years ago |
|
nieguanghui
|
39bf4ff188
|
解决鼠标bug
|
12 years ago |
|
huangjingquan
|
fc78a2b876
|
修改了项目里面成员列表角色错位
|
12 years ago |
|
yanxd
|
9aa7294f5a
|
forum/memo fix
|
12 years ago |
|
nieguanghui
|
3700294890
|
门户网站页面微调
|
12 years ago |
|
huangjingquan
|
c1ea53faf0
|
修改了主页里面页面漂移问题
|
12 years ago |
|
yanxd
|
f14f73414e
|
Merge branch 'welcome' into develop
|
12 years ago |
|
nieguanghui
|
aa4596e170
|
增加图标显示
|
12 years ago |
|
huangjingquan
|
2ba8bb8fd0
|
修改了forums主页显示，限制了讨论区用户图片显示大小
|
12 years ago |
|
nieguanghui
|
90b38cf5e8
|
s
|
12 years ago |
|
nieguanghui
|
c4d1b884e8
|
aaa
|
12 years ago |
|
nieguanghui
|
1f83ca612b
|
显示部分数据
|
12 years ago |
|
huangjingquan
|
6dc692bb6a
|
修改了主页、论坛显示
|
12 years ago |
|
nieguanghui
|
f0b17a1a10
|
主页界面设计
|
12 years ago |
|
huangjingquan
|
860c46e1c7
|
修改了字体大小
|
12 years ago |
|
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
12 years ago |
|
huangjingquan
|
dc00216603
|
修改了谈论区框架、列表等
|
12 years ago |
|
huangjingquan
|
19f183cb2b
|
讨论区message样式
|
12 years ago |
|
yanxd
|
5de8e1c2f2
|
new welcome index.
|
12 years ago |
|
huangjingquan
|
0f652b4955
|
首页显示样式
|
12 years ago |
|
huangjingquan
|
b8db0f59d2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
67bec27f34
|
.
|
12 years ago |
|
huangjingquan
|
9b044f8d13
|
修改了讨论区显示
|
12 years ago |
|
baiyu
|
6c9c849e7c
|
1、增加了竞赛的配置功能
2、增加了课程的成员学号显示
|
12 years ago |
|
huangjingquan
|
16611d8eff
|
修改了管理员权限
|
12 years ago |
|
huangjingquan
|
4d8345593d
|
将作业情况改成作业提交情况
|
12 years ago |
|
huangjingquan
|
3055286cdd
|
修改了作业不能提交bug
|
12 years ago |
|
huangjingquan
|
7935520612
|
对课程、项目、作业页面 当前位置显示做了隐藏
|
12 years ago |
