Commit Graph

979 Commits (3484fd34bb9489a8e4705cc0c51bc14df3ff2566)

Author SHA1 Message Date
alan 3484fd34bb merge dev_zanle branch
11 years ago
alan 7710af316d Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh
11 years ago
huang 768e06ea8a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang be9ff9b4bb 修改控制器名
11 years ago
alan 2f168dd4d7 修改《课程动态》样式
11 years ago
lizanle ff80bea0c2 添加Kaminari配置文件,并给出了比较详细的注释
11 years ago
lizanle c543a28cc8 重写url_helper link_to_unless方法,给Kaminari当前页添加样式
11 years ago
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug
11 years ago
huang 864ed349e4 国际化
11 years ago
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang d0a675f2b8 企业版模块
11 years ago
sw 0d5384c6d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
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
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle
11 years ago
lizanle 87b230623b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 950d831108 Merge branch 'api' into szzh
11 years ago
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle
11 years ago
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
lizanle b6db353b57 newrelic配置文件
11 years ago
sw 56700f4d62 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 97c7ccac16 增加关闭问卷功能
11 years ago
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”,sidebar栏“缺陷”修改为“问题”;项目新建新闻按钮样式统一;新建课程样式统一;课程重开和关闭国际化;竞赛导航锁定;翻译缺失修正
11 years ago
z9hang db1cd8851c Merge branch 'szzh' into api
11 years ago
whimlex 14685f2656 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 38157e560e 课程--资源库--上传资源:当变化屏幕分辨率时,“上传文件”字样显示异常;添加用户或组没有链接;新建课程中,平台按钮样式调整成统一风格;课程主页,竞赛
11 years ago
alan 38da932f4c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 61634585f5 修改《news,forum模块发送邮件的模板》
11 years ago
sw 08e646c752 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 900cff8f8e 1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
11 years ago
whimlex 2be757a3d5 翻译缺失完善
11 years ago
whimlex 9886a3212c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 15a8bddfe6 缺失翻译
11 years ago
lizanle b26f2029ef Merge branch 'szzh' into dev_zanle
11 years ago
lizanle e96302d219 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
11 years ago
lizanle 69ced4b14b 添加国际化内容
11 years ago
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle
11 years ago
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
lizanle 7bf89c1fc1 开发环境不缓存
11 years ago
lizanle f394c3878e 生产环境日志名字规定为production.log
11 years ago
lizanle d2d1a9659b 开发环境下去掉缓存
11 years ago
lizanle ae74dff89b 添加注释
11 years ago
lizanle 79fd7ebd7a 生产环境下日志分天
11 years ago
whimlex 3fcb2f14a5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
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 90a81ee1f1 增加网站项目首页加入项目的功能
11 years ago