Commit Graph

2905 Commits

Author SHA1 Message Date
nwb f8328727cd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 10:46:15 +08:00
nwb dfdc58719a 课程主留言添加删除功能 2014-07-28 10:46:05 +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
sw cc215e6c7b 修复个人动态图片显示不准确的问题 2014-07-28 09:47:11 +08:00
nwb ef62fc1fac 修正缺陷搜索缺陷编号显示问题 2014-07-28 09:46:19 +08:00
nwb f36ccad76a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 09:23:47 +08:00
nwb 9c9778d433 项目的“资料下载”改为“作品下载” 2014-07-28 09:23:40 +08:00
yanxd 979d6dd067 dts_test. controller ===> model 2014-07-28 09:22:52 +08:00
nwb 983cdebbb6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 09:18:45 +08:00
nwb 00cf448bda 用户动态兼容空留言 2014-07-28 09:18:24 +08:00
yanxd 4fae105b96 project testing. 2014-07-25 17:43:19 +08:00
nwb 1922593fee Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-25 17:36:35 +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
sw 43efd63dda Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 15:42:01 +08:00
sw 758541250f 插件数据增加迁移文件,确保数据库数据正确 2014-07-25 15:41:21 +08:00
nwb 560ee0a2fc 数据库文件 2014-07-25 15:24:55 +08:00
sw b5b246f098 修复个性签名未自动换行的问题 2014-07-25 15:12:24 +08:00
nwb 2a4daf04f9 删除资源文件修改 2014-07-25 15:09:29 +08:00
sw ea322d6177 修复项目提交时间字的长度过长时会换行的BUG 2014-07-25 14:51:10 +08:00
nwb 6531bf5195 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 14:05:40 +08:00
nwb 735d7f2c1f 文件下载权限判断优化 2014-07-25 14:05:25 +08:00
z9hang 2c08f39001 修改首页简介样式 2014-07-25 14:02:23 +08:00
z9hang d6a425849a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 13:38:20 +08:00
z9hang 34626e03a4 调整主页显示图片大小 2014-07-25 13:37:49 +08:00
z9hang 5a0d76c1e0 竞赛通知发布完成 2014-07-25 11:51:52 +08:00
z9hang 673ffb1819 提交次数刷新问题 2014-07-25 11:31:16 +08:00
sw 70003c8374 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/controllers/zipdown_controller.rb
2014-07-25 11:10:45 +08:00
sw 6d5f72326f 增加定时任务 2014-07-25 11:09:47 +08:00
z9hang 42f0c49093 作业打包下载错误提示页无导航问题 2014-07-25 11:08:16 +08:00
z9hang 7eb1a76734 修改编辑贴吧无导航栏、提交失败无提示bug 2014-07-25 10:42:56 +08:00
z9hang 138d90a887 添加数据迁移文件 2014-07-25 10:09:38 +08:00
z9hang ca52de614d 修正错误 2014-07-25 10:07:14 +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
z9hang 4542b9e21a 积分修改 2014-07-24 18:05:37 +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
sw ec41054008 将configuration.yml从版本库删除 2014-07-24 16:26:19 +08:00
sw 37802e81de 修复CKEditor插件显示不正确的问题 2014-07-24 14:03:43 +08:00
nwb 0d7bedeb0d 测试提交 2014-07-24 11:30:12 +08:00
nwb 8b0b31f749 附件下载更新 2014-07-24 11:20:33 +08:00
sw 1b503f3b6d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-24 11:15:51 +08:00
nwb 0fc2e3be21 修改BUG 2014-07-24 10:43:19 +08:00
nwb d59ab02db8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-24 10:40:02 +08:00
nwb 990dc3cbff 修改项目文档显示 2014-07-24 10:39:42 +08:00
sw dd589c4811 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-24 08:50:44 +08:00
z9hang 6b441760c4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-23 17:57:34 +08:00