 z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
6a45a0287d
|
添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）
|
11 years ago |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
 yanxd
|
2be5041d0d
|
文件界面的样式修改
|
11 years ago |
 nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
11 years ago |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
|
yanxd
|
056f86caad
|
can't download, html. after exception return;
|
11 years ago |
 sw
|
a5518363c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
11 years ago |
|
yanxd
|
2ff24841fd
|
optimization image check.
|
11 years ago |
|
yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
11 years ago |
|
sw
|
aec6d33db7
|
添加wiki编辑插件
|
11 years ago |
|
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
11 years ago |
|
z9hang
|
2dd249a105
|
修正发帖不填主题报错问题，修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个
|
11 years ago |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
11 years ago |
|
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
|
11 years ago |
|
nwb
|
ae3457e68b
|
1.添加代码评审(CodeReview)插件
2.添加代码评审插件使用文档
|
11 years ago |
|
nwb
|
067a2d7841
|
修改文件未找到界面
|
11 years ago |
|
nwb
|
6039cf63af
|
课程讨论区文件上传权限优化
|
11 years ago |
|
yanxd
|
8840a11a99
|
attachments error
|
11 years ago |
|
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
|
11 years ago |
|
yanxd
|
099577fb59
|
remove all icon display
|
11 years ago |
|
yanxd
|
63cd19c15c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
11 years ago |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
11 years ago |
|
yanxd
|
13a65821e2
|
坑
|
11 years ago |
 wanglinchun
|
a40db3dc4b
|
首页添加了竞赛所获奖项显示
|
11 years ago |
|
yanxd
|
73f5bab075
|
document css/
wiki h2 bug
|
11 years ago |
|
nwb
|
10397eec3e
|
更改课程图标显示逻辑，添加课程图标文件夹
|
11 years ago |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
11 years ago |
|
z9hang
|
2e9251530c
|
修改缺陷状态留言处引用的链接被遮住问题
|
11 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
ganyiang
|
b4c299bff8
|
修复osp中“热帖”下显示“没有帮助”的问题
|
11 years ago |
|
ganyiang
|
e901e8046d
|
修改osp中allbug的显示界面
|
11 years ago |
|
ganyiang
|
c8ca5277a6
|
新增osp项目“聚焦”标签 （演示用）
|
11 years ago |
|
ganyiang
|
6ca1d7f7ab
|
修改osp的css文件，解决标题过长的显示问题
|
11 years ago |
|
yanxd
|
006e4ae45e
|
user tab bar
|
11 years ago |
|
z9hang
|
97ae2356bf
|
引用被遮住不能点问题
|
11 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
11 years ago |
|
yanxd
|
654cb404e2
|
bootstrap test
|
11 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
2273a6fd0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 years ago |
|
yanxd
|
d77d7e14c7
|
home page memo css no wrap
|
11 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
11 years ago |
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
11 years ago |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
11 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
2681c3ce88
|
...
|
11 years ago |
|
ganyiang
|
c70352011d
|
修复buglist.css对整体界面的影响
|
11 years ago |
|
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 |
