Commit Graph

645 Commits (2954bba4117c7d852a1e7a5f88b7db51f01fb07e)

Author SHA1 Message Date
sw 943b9656d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 29e6158fa4 修改版本列表名称过长时显示为隐藏
11 years ago
alan 72ed73fb05 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
z9hang 30e355fa35 #948 admin配置管理--用户列表--项目列表:如图下拉框显示超出边框且项目问题,解决,说小选项长度,添加title属性,鼠标悬停时显示选项的完整信息
11 years ago
alan 66aa72d210 Signed-off-by: alan <547533434@qq.com>
11 years ago
z9hang efc247f2e7 1、各个页面在,没有数据情况下的显示调整。2、点击竞赛列表,在没有竞赛的情况下显示的是无搜索结果界面修正为列表界面
11 years ago
z9hang 14a6dec46a 空数据库时的贴吧列表优化
11 years ago
z9hang 3d860af48b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 269e1cf497 1、空数据库情况下3个主页布局修改。2、上传附件成功提交后公开自动变成私有的bug
11 years ago
alan e044f5b615 修改contest中出现的逻辑错误
11 years ago
alan 859a1122b7 修改contest中contestnotification列表和通知公告的界面
11 years ago
z9hang 38345c0c68 重新修改编辑角色有label字未显示全问题(前次修改影响了其他地方),新建合作单位,填写字段不正确时不清空用户填写的数据
11 years ago
z9hang a8bc274621 admin操作时提示信息多一条问题(去掉一条)。编辑角色时“问题可指派给此角色”标签显示不全问题(修改css样式)
11 years ago
gonglexin 6e0c916246 #1026 上传出现网络问题时给出提示
11 years ago
sw ef48fec26b 优化加入课程弹出框显示样式
11 years ago
sw 215d8f0e0c #1370修复版本库样式显示异常的BUG
11 years ago
sw 43f2cc71ce #1237修复公共贴吧有序/无序列表显示不正确的BUG
11 years ago
sw 9ba6fe13a3 #1307 修复trustie-forge项目中--讨论区--回帖显示超出边框的BUG
11 years ago
sw 5b91356463 项目列表--项目描述显示不全
11 years ago
sw 13ee0dc9b2 修改403、403页面显示
11 years ago
sw 00278d8571 #1347 修复通过标签搜索出的资源显示超出页面的BUG
11 years ago
sw 3b9704ed4e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 2dc5b1f18c #1198 项目--项目新闻--新闻回复、课程--课程通知--添加评论:通知或评论中含图片内容,其显示超出边框
11 years ago
sw 5180c959a8 1.修复 项目--新闻、课程--课程通知 列表显示问题
11 years ago
z9hang a6efe10984 1、#1313 课程/项目:资源库“下载次数“字样显示错误,解决修改其样式。2、项目缺陷模块勾上也不显示问题,原因:模块名称匹配错误,修正之
11 years ago
sw 1361801723 上传文件描述最长限定254个字符
11 years ago
z9hang 1995500230 #1245差别显示超边框问题,修改css,同时将style移到application.css文件中
11 years ago
z9hang da853bf4eb 修复redmin.rb被重置的修改
11 years ago
z9hang 21343a0111 超级管理员权限报表界面项目权限与课程权限分开整理,#1300 配置管理--角色和权限--权限报表,显示超出边框 解决:修改css样式
11 years ago
sw 1976aa9c72 公共贴吧--编辑帖子,“置顶”与“引用”控件重叠及中英文混排问题 #1258
11 years ago
linhk 3ef05e64b8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
linhk 879e93beb9 项目、竞赛、课程首页的微信部分样式修改并添加js跟随滚动处理
11 years ago
alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 9ff4fee8da 修改项目描述为1级标题时文字会重叠的BUG #1210
11 years ago
sw f70edc1a0b 修复老师角色在没有任何附件情况下点击打包下载报500错误的BUG #1209
11 years ago
z9hang e99f9250c3 前次解决缺陷#1087换行问题的提交中换行样式影响了版本库中修订列表的显示,两者共用了同一段css,将之改回去,在添加另一css给项目配置=>版本中的表格使用
11 years ago
z9hang a3aa2b0c2b #1087 项目--配置--版本:新建版本跳转问题及相关显示问题 名字过长时提交返回失败信息,第二次正确填写名称提交成功,但页面跳转错误问题:原因:提交成功后他用的是返回上一个页面或默认页面,第二次提交返回到上一个页面依然是新建版本的页面,修改为提交成功则指定跳到项目配置的版本配置页面。两个换行问题,添加换行的css属性
11 years ago
z9hang 6ec1a7ce05 缺陷自定义查询布局问题,下拉框太长导致,缩小其最大长度
11 years ago
z9hang 05083fa679 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang f13eb73a72 label写错纠正,一个写死的主页链接纠正
11 years ago
sw b49e76bf79 Merge branch 'xiaoguang-contest' into szzh
11 years ago
z9hang e0cdcc0211 课程讨论区发帖,添加附件,admin帐户删除附件报错,原因:判断attachment的containers是否为课程的时候少判断了课程讨论区的附件这种情况,解决:加上该判断。问题2 #1002 forge网站的主页项目列表登录前和登陆后,显示的不一样。 解决方法:项目列表、课程列表中的私有项目、私有课程添加私有标志
11 years ago
z9hang 59fadeacf6 wiki=》历史=》追溯不换行问题
11 years ago
z9hang d256b2d336 缺陷查询布局问题
11 years ago
z9hang cb8b0e0f41 admin页面中问题追踪项相关错误(课程、项目分离此处代码未改导致的问题)、项目列表中项目提交次数改为从数据库中读取(运行bundle exec rake project_score:calculate统计项目提交次数)
11 years ago
z9hang 38c5c86a39 日期选择器不能用问题
11 years ago
hhuai b34e74bd1c issue 1012, table中td撑坏的问题
11 years ago
hhuai 8b121c3e50 fixed issue #998, 主页的通知公告区域显示优化
11 years ago
z9hang 4cea972e56 micro版图片丢失问题
11 years ago
chenmin 4acf5f3f06 添加文件提示页面元素变量处理
11 years ago
chenmin 87ada7c0d5 资源搜索页面下载文件改为中文提示;
11 years ago
z9hang 7907edf168 更新项目得分规则
11 years ago
z9hang 087105ad9e 贴吧长串数字不换行问题
11 years ago
z9hang 2505cb30c4 贴吧描述不换行问题
11 years ago
z9hang 583bdd7a54 调整贴吧编辑按钮样式
11 years ago
sw 37802e81de 修复CKEditor插件显示不正确的问题
11 years ago
nwb 095cb7fc32 加强对chrome浏览器文件上传的支持
11 years ago
nwb 6bced5106e 调整课程列表视图
11 years ago
z9hang 40d8ec6c6e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 4bd083b059 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang bd43ef5d61 网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
11 years ago
sw 999a252f7b 修改软件创客搜索结果显示样式
11 years ago
sw 46c7a4bb9f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 4a04d47c3c commit
11 years ago
yanxd 164ec645ee boards created frequently, css file file EOF.
11 years ago
nwb 02b4029e8c 资源文件下载界面调整
11 years ago
sw 4825c5287e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 3254c4a237 修正二级菜单名称显示问题
11 years ago
sw f8d3d60b27 tttttttt
11 years ago
z9hang 53ff6ea335 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
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
11 years ago
yanxd 2be5041d0d 文件界面的样式修改
11 years ago
nwb 9b3ffc90ba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件
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
11 years ago
nwb ae3457e68b 1.添加代码评审(CodeReview)插件
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
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
11 years ago
yanxd 13a65821e2
11 years ago
wanglinchun a40db3dc4b 首页添加了竞赛所获奖项显示
11 years ago
yanxd 73f5bab075 document css/
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
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 引用被遮住不能点问题
12 years ago
z9hang bf12692de4 登录名==》账号/邮箱
12 years ago
yanxd 654cb404e2 bootstrap test
12 years ago
yanxd 12b1553a33 Merge branch 'develop' into szzh
12 years ago
yanxd 2273a6fd0b Merge remote-tracking branch 'origin/develop' into develop
12 years ago
yanxd d77d7e14c7 home page memo css no wrap
12 years ago
yanxd 7a4e5afba0 test
12 years ago
t430 fd0a504d84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
12 years ago
yanxd 5364687160 bootstrap & tag bug
12 years ago
xianbo e52886cf46 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo cda9942723 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd 2681c3ce88 ...
12 years ago
ganyiang c70352011d 修复buglist.css对整体界面的影响
12 years ago
yanxd 34aa8433de import hubspot
12 years ago
yanxd 3517dbb88b Merge branch 'szzh' into develop
12 years ago
yanxd 9edb8a49de fontsize fix
12 years ago
yanxd c5a3a5bac3 user_courses.html
12 years ago
xianbo 4b063a2c69 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd 0ab17f1e90 contest image show
12 years ago
xianbo e3fe69c445 Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
12 years ago
wanglinchun bcb3bf0c19 调整参赛作品编辑页面中托管项目列表的显示宽度
12 years ago
yanxd 112b8de921 issues#575
12 years ago
wanglinchun f815410381 修改了新建参赛作品中托管项目的显示颜色和宽度
12 years ago
wanglinchun 9fb9d2dbdf 初步增加了新建参赛作品中参赛作品所属的托管项目列表
12 years ago
yanxd a76620a741 welcome footer
12 years ago
z9hang 19d1682077 修改编辑作业提交文件处样式
12 years ago
z9hang ea095a6f61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
z9hang fc1d5baf95 课程、竞赛、项目的主页的上下间距缩小
12 years ago
nwb 5ca9d96acd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
nwb 7df6be8ff4 调整资源文件界面
12 years ago
yanxd 63af60d7b6 edit 图标丢失
12 years ago
nwb 7e4343f00f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
nwb 8f153520b4 调整上传资源界面
12 years ago
t430 09eae52fc1 hard picture file
12 years ago
yanxd 4db228f88e 调整tag高度为啥要修改两个地方我自己也忘了,改天再说
12 years ago
xianbo 66a5db5ad3 Merge branch 'szzh' into develop
12 years ago
yanxd 14e4bf5bcc typo
12 years ago
yanxd 829c77879a typo
12 years ago
nwb 4136cd27c8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
nwb 8badbb1e78 1.添加附件资源类型编辑视图与逻辑
12 years ago
ganyiang 27ade53af3 针对OSP社区的新需求的界面展示:
12 years ago
z9hang 6e14e0b262 提交作业窗口删除全部图标位置修正
12 years ago
z9hang a80da022cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
yanxd 19ddb38e1b 异步验证注册字段合法
12 years ago
z9hang 7a341972e7 course网站中大学名加上该大学在本站的链接
12 years ago
yanxd c2284deaf7 application.css 分页css问题
12 years ago
yanxd 2f47cc1cd8 Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
12 years ago
z9hang 268dc1acce 主页讨论吧动态前显示吧名
12 years ago
yanxd cc2f359e8c 1. Three expressions syntax
12 years ago
ganyiang 5e780e6872 修复新建问题中autocomplete在Firefox下的不正常
12 years ago
ganyiang 786481e144 新建问题-主题-autocomplete-选中跳转
12 years ago
yanxd 8770599352 css typo
12 years ago
yanxd eb19b0cb1f welcome css改标点错误
12 years ago
yanxd 05baffe4f3 issue导航,首页贴吧动态html,加入了最后回复
12 years ago
wanglinchun 0634f36c10 "打分后不要显示英文,而且还要提示:您可以重新打分"问题解决
12 years ago
Wen c893227609 个人资料页面学校选择框更改
12 years ago
yanxd 0cfd5929d8 Revert "tag todo"
12 years ago
Wen 50745d5d21 course首页布局上的小调整
12 years ago
Wen 815e7cf3af 个人资料修改页面 限制了学校列表的高度并添加了滚动条
12 years ago
Wen 10fdcbb050 一个简单的后台上传学校logo的页面.
12 years ago
Wen a8e029da58 数据库迁移:更改了默认的学校logo
12 years ago
yanxd 939e4cc100 footer 下方距离
12 years ago
Wen ba80593ab0 别忘了改数据库!= =
12 years ago
Wen 02295e5ca9 给严总调试用
12 years ago
yanxd 08b27f38a7 tag todo
12 years ago
Wen 6a2626c90e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
Wen 473a44d11a 学校-课程模式!
12 years ago
wanglinchun 9af6c03547 Merge branch 'competition' into develop
12 years ago
yanxd e2a5e2f730 footer
12 years ago
yanxd 60bc3bb1b2 seem_rateable to lib, using Engine setting routes
12 years ago
wanglinchun 05c0d2a5ac 替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
12 years ago
yanxd b4209b7cc5 jrating
12 years ago
yanxd 8775eab3dd iscas modify
12 years ago
yanxd 83f039a014 modify pku.png
12 years ago
yanxd a4ab29f49d footer logo modify
12 years ago
kg 158c950b78 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
kg bdefa322cc modify foot
12 years ago
wanglinchun 76ccfe8ac4 fix
12 years ago
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop
12 years ago
wanglinchun 8f6d9fc6a5 0418
12 years ago
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload
12 years ago
kg 3f096f9167 add pdl logo
12 years ago
kg 69dbd5a85e add logos and modify footer;footer position problem of some projects and courses
12 years ago
wanglinchun 1a6a20e761 竞赛模块首页布局和显示效果调整好
12 years ago
yanxd 6f5fcd0dee 测试作业下载
12 years ago
wanglinchun 6421f02ac8 调整了参赛应用列表布局显示样式
12 years ago
yanxd 28bebb1ee7 add Gem
12 years ago
Wen 44560a679f 工作单位更改为下拉框选择
12 years ago
wanglinchun b4b61a3422 修改小bug;设计打分和评论唯一性前提交版
12 years ago
yanxd a5743cd987 button加作用域
12 years ago
yanxd 2a62bc822a 修改ajax提交过程中,等待indicator被覆盖的问题
12 years ago
wanglinchun dfad0448e1 单个应用显示页面
12 years ago
yanxd 1b6cdeac05 列表上提交作业,大概好了吧
12 years ago
yanxd 3fad5abb5c modal init
12 years ago