Commit Graph

975 Commits (86e63b60811abb92d41a92de64387d68ce22519c)

Author SHA1 Message Date
huang f1b8d74a07 修改加入项目字体大小、宽度
10 years ago
whimlex d73d842e31 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 34579e395f 附件上传bug修改;意见反馈收拉一致
10 years ago
huang cea43cb045 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 69eb7fbd77 关注、加入项目样式,处理样式冲突
10 years ago
sw b6b479f6f9 1、增加开启关闭匿评时弹框
10 years ago
whimlex 6995ead66c 项目ID
10 years ago
whimlex b400c9bb11 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex b95852dfcd 附件上传国际化:修改页面一些bug:用户主页个人得分身份信息修改
10 years ago
dingxu 79588489e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
dingxu 440855c0e6 修改项目tag样式
10 years ago
sw 7541a83b16 改课程首页用新建问卷
10 years ago
sw 90df8056c8 1、修改分页控件中省略号颜色
10 years ago
sw b9ed34f86e 1、右边内容区域、增加js:最短为左侧长度
10 years ago
lizanle 0424fc55db 项目资源数显示错误
10 years ago
lizanle 966f93012d Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle c209bccba0 项目资源数显示错误
10 years ago
alan cf3d836cf3 删除邮件发送时出现《"亲爱的Trustie用户,您好!"》
10 years ago
sw d92ac2d909 1、课程跳到其他页面后没有分块
10 years ago
sw 423849ca84 加入课程、退出课程、配置、关闭、复制等按钮
10 years ago
sw 1c30b8c81c 1、增加获取某个课程动态数的方法
10 years ago
sw 8f5d8c86a3 新版样式header调整
10 years ago
sw 64b0646281 base_course基本完成
10 years ago
sw e7cce1fd28 修改项目html错误
10 years ago
sw 642cf80bf8 调整课程主页分块显示
10 years ago
sw 278854156a 调整课程信息样式
10 years ago
sw 16872597b6 实现课程搜索
10 years ago
sw ec1ff6dfc3 1、修改课程界面未登录时,先显示注册,再显示登录
10 years ago
sw 4d60a6dabc 1、修改版权
10 years ago
huang 4111e2a940 1、讨论区新子界面
10 years ago
sw 4c482e1fac 完成新的用户反馈界面
10 years ago
sw d2c7861706 1、添加缺少图片
10 years ago
sw e4c0c840bf 1、完成课程模块导航栏样式调整
10 years ago
sw 747a109638 1、添加CSS文件
10 years ago
sw 3b0a229c43 1.修改意见反馈框默认关闭
10 years ago
sw e4895731ae Merge branch 'develop' into szzh
10 years ago
sw ca7c970094 修改意见反馈框位置
10 years ago
huang cc5a22f2c6 修改新建按钮样式
10 years ago
huang a010c800d6 修改权限库为空情况下403问题
10 years ago
huang 47e1427ead 左侧工具栏添加功能:左侧统计数目为零的手不显示
10 years ago
huang 77bf3be20d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang b809e8844c 修改项目中添加标签按钮显示异常
10 years ago
sw d18e9ff66b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 4bfc72dc28 用新表统计动态
10 years ago
sw 717be2b045 修改部分用户的用户首页报错
10 years ago
sw 69eecf49d1 还原冲突
10 years ago
whimlex 65ee3fdc74 项目主页国际化,项目主页JS冲突解决
10 years ago
huang c773e0fd39 JS冲突,去掉多余标点
10 years ago
huang 29655838f0 项目超过的部分用“展示更多信息”拉开
10 years ago
huang c36db9fd63 项目左侧按钮实现配置-模块进行显示/隐藏管理
10 years ago
whimlex 11da65c9ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 57c8575470 新版项目模块国际化,目前完成各项目主页,项目动态,项目评分
10 years ago
huang 3ee9ac2b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 8f0af4c00d 修改了未登陆情况下通过URL访问不允访问的
10 years ago
sw 52dfb0b0ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 27e72c1f39 #2000 增加项目每个模块的访问控制
10 years ago
huang cbfb72bd5b 修改新建资源库显示
10 years ago
whimlex 540ddd4a1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 0eafbb92d5 意见反馈模块国际化
10 years ago
huang 32a2e7ae1f 修改默认情况下 用户反馈框处于关闭状态
10 years ago
sw 9060c9acbc #1977 项目发布新贴跳转有问题
10 years ago
whimlex 4b19463db7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 115eb38a02 完善用户资料模块,用户主页课程栏、留言栏、项目栏和标签模块国际化;对一些存储在数据表中的固定的中文属性,比如学期,职称,在helper和model中定义方法封装;平台导航模块,包括各模块内部导航的国际化;课程平台模块国际化整理和修改,去除重复功能标签
10 years ago
sw 81b58e5c87 修改base_project中代码错误
10 years ago
huang d947ebff0c 添加国际化
10 years ago
huang e22b389971 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang b043d07d61 修改发布新贴显示问题
10 years ago
alan 5ff43fdea7 项目添加新用户邮件发送功能
10 years ago
huang ce792f6ce8 修改邮件发送界面
10 years ago
huang b3cbfd39ca 修改一些缺陷,删掉多余的文件
10 years ago
huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang beac15475d 新项目及用户反馈框的修改!!
10 years ago
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh
10 years ago
sw a2d986f70c 修改页面代码
10 years ago
sw 032e28067d #1959 项目评分是0的,就不显示了!
10 years ago
sw 5bba54432d #1930 项目缺陷显示个数修改
10 years ago
whimlex 22aae1910b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 59a2c8283a 国际化结构调整
11 years ago
lizanle d902d76ae2 将google统计换为了百度统计
11 years ago
sw 78d8a0a1c6 修改意见反馈折叠后背景为透明
11 years ago
alan b5e49e2e1c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
sw a265556cfe 搜索项目时增加js验证增加
11 years ago
whimlex 617107f0cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex f05e046751 首页国际化
11 years ago
sw ce526fde77 Merge branch 'dev_zanle' into szzh
11 years ago
sw 2978d9020f Merge branch 'develop' into szzh
11 years ago
sw b71d714103 #1887 用户职称显示问题
11 years ago
sw bf75f32903 修改个人留言界面,左侧个人信息样式显示不正确
11 years ago
whimlex b7c7cc4c64 意见反馈栏实现cookie缓存收拉属性,实现页面刷新跳转,意见反馈栏收拉一致
11 years ago
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle
11 years ago
sw 5950f0404b #1832 不显示无数据的字段,字段名
11 years ago
whimlex 0ff22b1ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex e5e24c1163 resolve conflict
11 years ago
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”,sidebar栏“缺陷”修改为“问题”;项目新建新闻按钮样式统一;新建课程样式统一;课程重开和关闭国际化;竞赛导航锁定;翻译缺失修正
11 years ago
alan 0944cc4ca8 < 邮件格式调整>
11 years ago
alan 472ccc45bf Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan a3cf79db96 修改编码问题
11 years ago
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle
11 years ago
sw bb64dc9452 修改问卷调查按钮的样式
11 years ago
sw 89ee38481b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang c65bab8c38 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang c6deffe245 修改首页样式显示异常
11 years ago
sw 2b5928602e 1.修改由于意见悬浮框引起的界面的padding不正确的问题
11 years ago
whimlex 3fcb2f14a5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 1e36ca504a 多种邮箱邮件样式调整,回复内容样式更改
11 years ago
sw a0e6b9c2fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 388ddac96b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 84bfd30fc5 修改问题反馈弹框!
11 years ago
sw e72ed1054e 修改问卷调查按钮的样式
11 years ago
whimlex 3279928bef 邮件样式调整,国际化;用户资料页面调整
11 years ago
alan 3315116832 修改《课程--留言:给课程留言却返回404》bug
11 years ago
lizanle 49ff5659d9 系统日志查看相关代码,资源
11 years ago
alan 0b0b6c9b6e 修改《托管平台中点击某项目进入该项目主页,右上角的搜索处不输入内容点击搜索按钮,给出的提示信息显示不合理》
11 years ago
alan 092265d53c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
sw 1e8c6374d7 Merge branch 'szzh' into Poll
11 years ago
sw 2f9e658697 增加问卷调查按钮的样式
11 years ago
alan ade0720331 邮件系统界面重置
11 years ago
sw b3f37f5154 111
11 years ago
sw bba213dec9 1.#1802 修复页面下方有很大一片空白
11 years ago
alan b9ea3e589e 修改《邮件系统》页面
11 years ago
alan 9c45e372b4 Merge remote-tracking branch 'remotes/origin/develop' into szzh
11 years ago
alan 479a1249ae Signed-off-by: alan <547533434@qq.com>
11 years ago
alan 90925edce2 修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug
11 years ago
sw d2dfff33d0 课程页面增加问卷调查的链接
11 years ago
huang 2cd805ef4c 去掉课程单独的弹框
11 years ago
alan 74af44a826 修改《修改个人资料页面》bug
11 years ago
alan 3db80fc3fc 修改《contest链接bug》
11 years ago
huang 293b3a3b42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang f7c1b76b3d 用户反馈弹框模块!
11 years ago
alan fb6c297a37 Signed-off-by: alan <547533434@qq.com>
11 years ago
alan 575b641e25 merge dev_chuangbin
11 years ago
alan 6c9f5136c0 修改《竞赛主页显示错误》
11 years ago
alan 3f354a019f 修改(个人主页个人签名格式乱了)
11 years ago
alan 53b57d4c53 修改《个人主页积分弹框显示错误》bug
11 years ago
alan 9bbc8d64eb 课程母版页加载缓慢
11 years ago
alan 2262997c31 修改《新建课程时:课程名中有空格或者特殊符号会提示名称无效,》
11 years ago
alanlong9278 da85c3efb8 进入某竞赛主页,点击创新竞赛链接没反应
11 years ago
sw 16201f79cf 去掉首页更新提示
11 years ago
alan 23140307aa 实现<去存储过程功能,并修改打分的表更新>
11 years ago
sw a07bb18dcb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
= 305cbae008 维护浮动框
11 years ago
sw 0bce2ae8f3 #1752“竞赛通知”,“参加竞赛”时,左侧以及上方布局不同
11 years ago
sw 819c4c0bc1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 3caf5c8657 #1736 猎豹浏览器中,打开某竞赛,进入竞赛主页看到右上方搜索按钮下移了
11 years ago
sw 30d8d82f37 #1734 某竞赛主页中当搜索框为空时,点击搜索的提示问题
11 years ago
zhuhao 61a859f91a 托管平台项目主业搜索按钮样式调整
11 years ago
alan 49cb52146f Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 815d2ceb3d 添加《添加相同组时应该给出相关提示信息》功能
11 years ago
sw d6d7331ec6 修改竞赛中搜索,搜索条件可以为空,且为空时搜出所有竞赛
11 years ago
sw c6be2317a7 项目搜索,增加搜索条件不能为空的提示
11 years ago
sw b6327460a8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 7c1b86556d 增加《作业评分弹窗》《学生列表增加作业评分》两项功能
11 years ago
sw cf2810f1c6 #1712点击打开某竞赛作品,网页名显示为托管项目的名称
11 years ago
sw 36b7c9ca90 修改部分页面导航栏点击课程实践报404
11 years ago
sw 0c1088be58 #1706点击导航链接“课程实践平台”跳转到404.具体如图所示
11 years ago
sw da751d1dcc #1706点击导航链接“课程实践平台”跳转到404.具体如图所示
11 years ago
sw 8eb583b971 修改课程左侧创建时间padding
11 years ago
zhuhao ebc66af3b5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
zhuhao ebed04c7bf 创客空间左侧公共页被拉伸导致出现滚动条的调整
11 years ago
sw 5bd8cc76f4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
zhuhao a7d7b790d2 公共页个性签名的提交按钮显示调整
11 years ago
sw 6fd68806d5 修改课程教师就具有开启、关闭匿评、修改作业的权限
11 years ago
sw 7fa8d2fff8 修改竞赛模块标题栏
11 years ago
sw cd3f4ef8d3 修改标签的显示js
11 years ago
sw d073cca712 修改作业列表相关界面样式
11 years ago
sw 6f0e18f3a6 修改竞赛相关模块的标题栏信息
11 years ago
sw 54ffd59eaf 修改作业、项目、用户base的主页链接
11 years ago
sw ff93a62685 修改课程,竞赛layout中主页连接。
11 years ago
sw 851ef240c1 修改页面代码
11 years ago
alan 760083ad20 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan ace5b514c6 修改bug<测试版--注册登录:成功激活注册的用户后,登录返回资料修改的页面,姓氏、名字还是标识为必填项>
11 years ago
z9hang cb88dd9064 添加td_tech_title非空判断
11 years ago
sw 198e2f24ae Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 6363208781 修改base_user
11 years ago
sw adf75d2e8a 修改匿评结束显示样式
11 years ago
sw ca7b56cbf0 修改当作业提交大于等于2份时才显示开启匿评按钮
11 years ago
sw d788e46546 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 287e9151a2 如果课程没有附件,取消显示附件列表
11 years ago
sw 9908a7f41f 修改作业左侧启动匿评按钮样式
11 years ago
sw a95a68caec 增加课程右侧js悬浮框
11 years ago
moon 600afdc6e0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
moon e4e4c94d53 封掉所有列表入口,及页面中更多入口
11 years ago
sw f9b3cc6588 Merge branch 'szzh' into CouerseResources
11 years ago
sw eb15db64ee 美化项目工具栏样式显示
11 years ago
sw 14da0c7d73 优化base_head代码
11 years ago
sw 5c4a9ac1f8 修改右上角课程的域名
11 years ago
sw 82233a4b54 修复老师开启匿评、学生匿评提示以及进入学生作业详细信息界面时界面会自动拉下去的BUG
11 years ago
sw ff185852eb 未开启匿评时老师界面取消开启/关闭匿评按钮显示
11 years ago
z9hang a7a6fbcd22 课程资源界面修改
11 years ago
sw aa0f10e9fd 修改课程通知页面访问报404
11 years ago
sw c74b5d7bb4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 63a141a75a 1.修改右上侧课程作业快捷栏显示js、css
11 years ago
z9hang 46e97b7ae4 删除多出来的页脚
11 years ago
z9hang 096b0e271f 课程页面页脚偏移问题
11 years ago
z9hang ae19532601 修改帮助的浮动边框
11 years ago
sw 512f16a036 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 61c8feac8f 课程后增加课程作业的快捷栏
11 years ago
alan b7a89d6108 Merge branch 'shaproup' into szzh
11 years ago
sw 56cc2a7ad3 修复老师编辑作业时课程作业tab没有高亮显示
11 years ago
sw a24d1493f9 1.修复点击课程动态,课程动态tab页不高亮显示
11 years ago