Commit Graph

701 Commits (6fc496c8ee0c0e9f2e18aba1e0c33dfa76e97600)

Author SHA1 Message Date
sw 535cf74f1f 公共贴吧描述显示有html代码的BUG #1215
11 years ago
sw 9ff4fee8da 修改项目描述为1级标题时文字会重叠的BUG #1210
11 years ago
z9hang ab052d645b 空数据库发布帖子报错问题
11 years ago
z9hang 63470476a5 空数据库时,留下的新手讨论吧、网站建议吧创建人为空,引用时加上非空判断
11 years ago
z9hang bd636115d5 #1177 正式版:项目--文档,点击下载上传文件的图标按钮,弹出窗口中有两个“新增”评审任务按钮,解决:屏蔽掉页面右下角那个
11 years ago
sw fbb19480f5 修复火狐不兼容自动换行的问题
11 years ago
z9hang f0db3e1b4a 添加负积分修正为0的说明
11 years ago
linhk fa90219a52 在没有“我的课程”菜单项时"我的项目”显示子页显示位置错误的Bug
11 years ago
luguo 075b43f836 解决版权符号问题
11 years ago
ShengYue.Xu e6c8dbef4f 修改了版权符号,由原来的@改成了©
11 years ago
linhk a0a8868c24 个人主页的课程项目tab页显示优化
11 years ago
sw 5a7aabd7cf #1357
11 years ago
sw 1cd00f55fb Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
linhk ecae8d1f35 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
linhk 4f0817a146 项目--文档--文件--代码评审 中用户头像显示错误
11 years ago
sw 3d6ee127cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang a3fb08817c 分数不能为0、更新readme
11 years ago
sw 2b12654796 Merge branch 'szzh' into develop
11 years ago
z9hang 746022506d 用户列表排序问题、项目得分不一致问题
11 years ago
z9hang 2b6a376d31 修复数据库为初始状态时会出现的部分bug、去除部分连接的域名
11 years ago
sw ea0b7ef3f1 Merge branch 'szzh' into develop
11 years ago
linhk 0028c11426 退出项目功能
11 years ago
linhk 70a1839e74 英文界面-用户下拉菜单(我的课程、项目、编辑资料)显示问题
11 years ago
sw 08821b9391 Merge branch 'szzh' into develop
11 years ago
z9hang 1ca6447478 修复项目缺陷、新闻、讨论区等页面无法查看bug
11 years ago
z9hang 7907edf168 更新项目得分规则
11 years ago
sw d66dc65cca Merge branch 'szzh' into develop
11 years ago
z9hang 03b212e363 首页定制,是否显示课程,竞赛
11 years ago
sw 28606f030d 修复搜索参赛作品结果翻页跳转不正确的BUG
11 years ago
sw b05e112a3f 1.修改邮件服务器配置
11 years ago
sw 3119d9a9aa 增加竞赛作品的搜索功能
11 years ago
z9hang 90a35fa24a 竞赛、课程首页,贴吧动态名字过长显示问题
11 years ago
z9hang 8871652e01 添加首页定制,设置是否显示"我的课程"功能
11 years ago
nwb f8a59220e3 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
sw b5b246f098 修复个性签名未自动换行的问题
11 years ago
nwb 1257e67380 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 2bfc7aa93f Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
sw dd589c4811 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw a7debdae98 格式化代码
11 years ago
z9hang dee09aad75 修复导航bug
11 years ago
nwb 68be9c25b8 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
yanxd 87671e9d73 base footer merge bug.
11 years ago
z9hang 3e79dd6e32 竞赛通知鼠标悬停
11 years ago
nwb 35ab3a2c7d Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
z9hang 5e4571d6af 修复部分页面导航丢失问题
11 years ago
nwb 2a8929b90f Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
sw e24323147d 修复项目描述过长不会自动换行的BUG
11 years ago
nwb 4259d9c282 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 206aeeccfb 优化2级菜单效果
11 years ago
nwb f20f0aaa45 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
z9hang 4bd083b059 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang b44b488807 导航栏调整
11 years ago
z9hang bd43ef5d61 网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
11 years ago
nwb b655f0c7b0 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 29618d6a72 竞赛界面调整
11 years ago
nwb b7c4f87a8f Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
z9hang 5b7fc4048a user.trustie.net域名下课程主页导航栏多个课程实践菜单
11 years ago
z9hang 0f4933240b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 7c3a81735c user。trustie.net域名下跳转到项目页面时主域名没变bug(尚需测试)
11 years ago
nwb 3b1b057f0a 课程描述自动换行
11 years ago
nwb 634ef8df5f 界面修改
11 years ago
nwb 615b3ac2ac 课程界面调整
11 years ago
nwb a58a747cfa 屏蔽用户界面的关注需求功能
11 years ago
nwb 3254c4a237 修正二级菜单名称显示问题
11 years ago
nwb 1d4dad22ad Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
11 years ago
nwb bdaf59513b Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
11 years ago
yanxd 0998438e67 bootstrap fine tuning.
11 years ago
yanxd 449b87e38d remove cnzz
11 years ago
xianbo 25ee1d8672 for adjust test domain and give a setting reposwq
11 years ago
yanxd ab03962e9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd aca63146e9 搜索文件归属,课程相关逻辑修改,查询把过滤去掉了。暂时没想有什么过滤的好办法
11 years ago
nwb dd396a6da2 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb bc179fbc39 右上角菜单增加二级菜单
11 years ago
z9hang 470f40db82 去除绝对网址
11 years ago
nwb efbffa7436 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
sw eac725a0f4 修改作业、用户、课程界面中相关学校的链接
11 years ago
yanxd f664ec10b4 Merge branch 'szzh' into develop
11 years ago
yanxd 663634b9da Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
xianbo 830e2d4fb4 隐藏 站长统计
11 years ago
z9hang bc587f3e7d 屏蔽个人分数实时刷新功能
11 years ago
sw 12b16f0bb6 1.修复作业界面点击所属任务链接出错的BUG
11 years ago
sw 392dc0c365 增加访问作业显示列表的权限
11 years ago
sw ed9b97f987 增加访问作业显示列表的权限
11 years ago
sw c4b2c47dc7 调整作业显示样式
11 years ago
sw 7702b746c6 修复作业显示界面,提交作业按钮不显示的问题
11 years ago
nwb f4aa817f42 修改合并后首页出错的问题
11 years ago
nwb 7425178419 Merge branch 'CourseModify' into szzh
11 years ago
z9hang 02e221eedb 修改:网站中的旧分数显示为新分数
11 years ago
z9hang df89e5e173 去掉多的一个分数显示
11 years ago
z9hang 9d9bc76af4 定时刷新分数
11 years ago
z9hang f9612ca63f 实时刷新(ajax轮询)
11 years ago
z9hang 9061a77221 修改user.user_score为空问题的解决方式
11 years ago
z9hang d2db58050d 修复部分未填工作单位报错问题
11 years ago
z9hang 08ba10c32d 添加超链接
11 years ago
z9hang 1cb1eeeb1d 个人主页:姓名、工作单位
11 years ago
nwb 0de6cc8a31 修改作业基础视图
11 years ago
nwb 78612488e5 1.修改新建作业及视图
11 years ago
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
11 years ago
z9hang 697a6034b2 新得分显示
11 years ago
yanxd c5d892a214 footer
11 years ago
yanxd 70abac4c1e Merge branch 'competition' into develop
11 years ago
yanxd b58c5685ac Merge branch 'szzh' into develop
11 years ago
sw b7458abd9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 277aa81a60 修复占位列表界面显示的作业描述样式不正确的问题
11 years ago
yanxd 0536af6625 Merge branch 'szzh' into develop
11 years ago
nwb c8900c279c 课程标签增加、删除
11 years ago
yanxd 858a7936b5 revert userscore catch exception, added cache to footer.
11 years ago
yanxd cccb19e733 cnzz
11 years ago
nwb ae8fcca14f 1.课程接触视图修改
11 years ago
sw 43736ba8d6 兼容历史数据
11 years ago
sw 541ced18ec 作业显示界面增加导航栏
11 years ago
sw 26b933dddb t
11 years ago
wanglinchun 1393aebace 完成了按钮样式
11 years ago
yanxd 4c7bcd50f5 contests delete routes error
11 years ago
wanglinchun 372de9932a 英文版竞赛子站完成
11 years ago
wanglinchun 42aba52111 竞赛子站英文版5
11 years ago
yanxd 57994edc06 load user in homework
11 years ago
yanxd 1c7923e5bd sql
11 years ago
sw 8e2288a362 1.封装获取作业平均评分方法
11 years ago
nwb d22ffa84b4 1.课程标签迁移,从项目中分离
11 years ago
nwb cd3c69af94 课程资源文件迁移,从项目中分离
11 years ago
nwb 6ff26d06ab 修改课程基础页面逻辑(base_courses.html.erb)
11 years ago
sw 39ce95a950 美化作业显示界面
11 years ago
wanglinchun 9d783a7caa 修改竞赛通知等tab-menu的显示状态
11 years ago
sw 03c8f39729 1.修复登录提示描述不正确的问题
11 years ago
sw b9550cedb9 课程作业显示界面修改
11 years ago
yanxd 654cb404e2 bootstrap test
11 years ago
yanxd 12b1553a33 Merge branch 'develop' into szzh
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 a3a95556a3 fix 王林春提交了冲突文件
11 years ago
yanxd f44b930037 233
11 years ago
nwb 80e84069a1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 1d6816419d 优化用户申请加入项目界面刷新
11 years ago
z9hang 21e58ce3df 课程列表中课程成员数量显示n+(不显示精确数)
11 years ago
nwb 104ee13ac7 1.添加用户申请加入项目contrl、model及相关逻辑
11 years ago
yanxd f9166a71a7 issues#555
11 years ago
yanxd 9373666576 混淆课程数量
11 years ago
z9hang eaa9c94290 自己的用户界面也不现实邮箱
11 years ago
z9hang 2b12d31fb8 去除网站中的邮箱地址显示
11 years ago
z9hang fc1d5baf95 课程、竞赛、项目的主页的上下间距缩小
11 years ago
xianbo 66a5db5ad3 Merge branch 'szzh' into develop
11 years ago
yanxd 19e851d65a 路由注册验证ajax,课程边栏的单位
11 years ago
yanxd 9976697a58 Merge remote-tracking branch 'origin/develop' into szzh
11 years ago
wanglinchun 1e0e5a5ab1 Merge branch 'competition' into develop
11 years ago
wanglinchun 30f9bc9178 隐藏竞赛页面参赛项目和参赛应用;
11 years ago
wanglinchun 3edb1114c3 修改参赛作品列表页面的部分显示方式
11 years ago
wanglinchun 5c04f91857 修改了竞赛页面中关注人数的统计
11 years ago
wanglinchun caff0f55c9 调整了竞赛页面中参赛作品数量统计及跳转
11 years ago
kg 57e5cda513 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
kg db2ab5b945 modify issue filter and base_footer
11 years ago
nwb faab40456a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
fanqiang 547a268af8 修改合并之后的一些小问题
11 years ago
fanqiang 2c8580a4e8 Merge branch 'crawl' into develop
11 years ago
wanglinchun 688438241e 调整应用列表页面中的bug
11 years ago
wanglinchun c40bc242cd 调整了应用列表页面中的搜索显示格式;
11 years ago
t430 6b526ee438 fix
11 years ago
wanglinchun bdb1c3f74e 实现应用列表页面
11 years ago
fanqiang 87c70909be 可以在开源社区添加帖子,并且添加了帖子的URL,即帖子来源
11 years ago
yanxd be6ae6ef34 d
11 years ago
yanxd 939e4cc100 footer 下方距离
11 years ago
yanxd 08892d1cf7 s
11 years ago
wanglinchun c16933120d 修改竞赛子站首页显示
11 years ago
wanglinchun 189b935d5b Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
wanglinchun ed71a3faa1 调整删除竞赛的显示样式及位置
11 years ago
yanxd 2052d36abe issue:socialForge#381
11 years ago
wanglinchun 9af6c03547 Merge branch 'competition' into develop
11 years ago
yanxd e2a5e2f730 footer
11 years ago
Wen 7be7fd3d9b 学校选择形式改为弹窗
11 years ago
wanglinchun b318166c15 给参与竞赛的应用页面增加导航条
11 years ago
wanglinchun bc068eb12b 添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
11 years ago
alan 87fdecdabd 创新竞赛添加删除功能
11 years ago
yanxd b4209b7cc5 jrating
11 years ago
fanqiang 8600265f00 修改查询条件样式
11 years ago
xianbo bb4d141b0e erge branch 'competition' into develop
11 years ago
yanxd a4ab29f49d footer logo modify
11 years ago
wanglinchun 3d02cb7ce0 修改首页显示部分数据
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
11 years ago
Wen 775774ad63 临时措施:即使用户没有填写单位,页面也可以正常打开,而不是报错
11 years ago
wanglinchun 8f6d9fc6a5 0418
11 years ago
wanglinchun e136254c8d 回复了项目页面中的头像
11 years ago
Wen 5699a947ec 建立了学校与用户的关联
11 years ago
kg 4d727d8049 revert the mistaken move:base_courses and base_project footer
11 years ago
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload
11 years ago
kg 3013930f28 modify footer
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
kg 2cec3b0490 modify footer
11 years ago
wanglinchun 28ffd44e55 调整竞赛页面加入竞赛,关注以及配置竞赛的显示样式
11 years ago
wanglinchun 945ca3787a 调整个人主页中top-menu跳转菜单:增加跳转到竞赛模块首页
11 years ago
wanglinchun 6421f02ac8 调整了参赛应用列表布局显示样式
11 years ago
wanglinchun b4b61a3422 修改小bug;设计打分和评论唯一性前提交版
11 years ago
wanglinchun 733497fef8 调整竞赛列表页面中部分统计数字的超链接
11 years ago
wanglinchun f9e5dd47f6 修改了竞赛列表的排序问题
11 years ago
yanxd 28a5eff048 topics未登录footer飞出去的问题,擦屁股+10086,dom结构还有错,找不到崩溃
11 years ago
nieguanghui 6baa87a8ea 修复项目列表分数显示不一致的问题,修改用户列表显示不一致的问题,修改作业中项目显示分数和项目内部分数不一致的问题
11 years ago