Commit Graph

1030 Commits

Author SHA1 Message Date
z9hang 4dc2a23f9d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-30 15:31:23 +08:00
z9hang 03b212e363 首页定制,是否显示课程,竞赛 2014-07-30 15:26:55 +08:00
yanxd 281c48c0b3 . 2014-07-30 10:18:49 +08:00
z9hang 5800cf5fff 修正登陆错误 2014-07-30 08:58:28 +08:00
z9hang 952fcce0de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-29 18:04:45 +08:00
z9hang c60188038e 得分机制修改 2014-07-29 18:04:35 +08:00
sw 28606f030d 修复搜索参赛作品结果翻页跳转不正确的BUG 2014-07-29 17:55:14 +08:00
sw c4aa9aadbe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-29 17:47:37 +08:00
sw 3119d9a9aa 增加竞赛作品的搜索功能 2014-07-29 17:35:22 +08:00
nwb 81b77bc870 文件删除修改 2014-07-29 16:14:49 +08:00
sw e7503237f1 Merge remote-tracking branch 'origin/szzh' into szzh 2014-07-29 11:16:14 +08:00
z9hang d8fcf8eb9b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-29 10:07:02 +08:00
sw 52dcc6d1a1 讨论区帖子添加回复时,取消修改帖子的更新时间。项目最新动态只显示最新的回复,不将帖子创建重复显示 2014-07-29 09:16:11 +08:00
sw e344f16f5c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 17:50:13 +08:00
sw 2141fcc3ca 将是否启用DTS测试移入项目模块配置 2014-07-28 17:49:28 +08:00
nwb 9da116c0e3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 17:14:20 +08:00
nwb cb4efd914e 修正项目文档删除BUG 2014-07-28 17:14:02 +08:00
yanxd bf9a992399 活跃度排序不一致 2014-07-28 15:37:26 +08:00
z9hang 90a35fa24a 竞赛、课程首页,贴吧动态名字过长显示问题
课程、项目编辑贴子导航丢失问题
2014-07-28 15:06:54 +08:00
nwb 2c79a51e48 优化文件读取编码解析 2014-07-28 14:43:38 +08:00
nwb 74de064cca 1.文件删除权限判断优化
2.课程通知附件删除BUG修改
2014-07-28 11:29:55 +08:00
z9hang 1daec14ab5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-28 10:38:23 +08:00
z9hang 8871652e01 添加首页定制,设置是否显示"我的课程"功能 2014-07-28 10:37:22 +08:00
yanxd 979d6dd067 dts_test. controller ===> model 2014-07-28 09:22:52 +08:00
z9hang a1e06991d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 17:36:11 +08:00
z9hang 97531960da 首页定制添加剂修改图片大小功能 2014-07-25 16:05:33 +08:00
nwb 2a4daf04f9 删除资源文件修改 2014-07-25 15:09:29 +08:00
nwb 735d7f2c1f 文件下载权限判断优化 2014-07-25 14:05:25 +08:00
z9hang 5a0d76c1e0 竞赛通知发布完成 2014-07-25 11:51:52 +08:00
z9hang 673ffb1819 提交次数刷新问题 2014-07-25 11:31:16 +08:00
z9hang 42f0c49093 作业打包下载错误提示页无导航问题 2014-07-25 11:08:16 +08:00
z9hang 7eb1a76734 修改编辑贴吧无导航栏、提交失败无提示bug 2014-07-25 10:42:56 +08:00
z9hang 3b54def1c7 首页定制修改 2014-07-25 10:01:02 +08:00
z9hang 6ad3a1128e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 09:19:47 +08:00
z9hang f83336aed0 修改首页定制中热门项目排序方式的实现 2014-07-25 09:19:29 +08:00
yanxd 6a14676248 remove pry 2014-07-24 17:24:30 +08:00
yanxd 1755d7a790 issues controller & unit testing, word log print. 2014-07-24 17:23:46 +08:00
nwb 8b0b31f749 附件下载更新 2014-07-24 11:20:33 +08:00
z9hang 80b5871756 竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节,及各种得分更新方法
2014-07-23 17:56:15 +08:00
z9hang fb6cd2e9d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-23 09:25:17 +08:00
z9hang 0b6168c7fd 添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
2014-07-23 09:24:26 +08:00
nwb 0a06e2033f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-23 08:43:36 +08:00
nwb 5d22bc5510 文件上传修改 2014-07-23 08:43:23 +08:00
yanxd ee95d9b115 user_activity page 2014-07-22 17:57:11 +08:00
yanxd 18d096f0d8 删除项目,竞赛表project_id会置空,projecting_softapplications模型不知道干嘛用,此表也不存在 2014-07-22 17:40:32 +08:00
yanxd cccbd941ce 用户删除,管理界面用户去排序,删除后跳转,去无效参数 2014-07-22 17:17:42 +08:00
nwb f22a39fbfa Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-22 16:56:34 +08:00
nwb a5d829b95e 1.优化课程通知模块
2.优化文件上传
2014-07-22 16:49:32 +08:00
z9hang 41ea3a1baf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-22 16:00:11 +08:00
z9hang dee09aad75 修复导航bug 2014-07-22 15:59:35 +08:00