jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,248 Commits 98 Branches 0 Tags 0 B
Commit Graph

2910 Commits

Author SHA1 Message Date
chenmin 361e48fea8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-13 17:08:57 +08:00
sw 8c59abc070 #1279 修改搜索提示 2014-08-13 16:55:42 +08:00
sw 440395f26f #1290 修改admin配置管理--用户列表--项目列表界面以及相关功能问题 2014-08-13 16:52:07 +08:00
z9hang e65487d527 项目成员个人得分显示 2014-08-13 16:50:32 +08:00
zhanghaitao bc6ad5d416 #936 输入文档标题非汉族显示bug修复 2014-08-13 16:45:50 +08:00
zhanghaitao ce7d91d164 #932 输入主题为非汉字类型且字数较多时，显示超出边框Bug修改 2014-08-13 16:29:26 +08:00
sw a7e22a7379 修复admin用户列表界面，查询结果显示不正常的问题 2014-08-13 16:10:47 +08:00
sw f2f06a9d28 调整管理员用户配置界面，表格样式 2014-08-13 16:06:40 +08:00
z9hang 14026d0e0b 个人得分细节显示 2014-08-13 15:59:19 +08:00
zhanghaitao 88aa66b15b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-13 15:38:20 +08:00
zhanghaitao 4934c8c801 # 页面返回异常处理 2014-08-13 15:37:28 +08:00
sw a54676c583 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-08-13 15:24:38 +08:00
sw 0e35967433 修改wiki编辑页面初始化高度 2014-08-13 15:19:05 +08:00
sw 582ccd2ecf 添加wiki插件，修改项目讨论区模块回去格式化字符串不正确的BUG 2014-08-13 14:45:10 +08:00
z9hang 56aa2fb8dc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-08-13 11:21:37 +08:00
z9hang caed78327a 积分计算修改 2014-08-13 11:17:22 +08:00
chenmin ecccbf1cf7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-12 14:19:30 +08:00
sw 0064018a37 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-12 11:35:53 +08:00
sw 339a06007c 增加课程资源分离出来相关表 2014-08-12 11:31:42 +08:00
sw 835ef97510 wiki编辑页面插件更新 2014-08-12 11:22:37 +08:00
zhanghaitao 7b3468718f #898 引用回帖不转义的问题 2014-08-12 10:24:27 +08:00
zhanghaitao 64f6175f22 1.#912 admin管理配置窗口：项目列表、用户列表界面的文字超出显示框的修改 2014-08-11 17:06:45 +08:00
chenmin f6f1bddaff Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-11 17:06:24 +08:00
chenmin 50e172a25a 删除课程留言前增加提示 2014-08-11 16:51:45 +08:00
zhanghaitao d7bfdc8de4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-11 16:39:35 +08:00
zhanghaitao b9ee7fe00d 1.#878 缺陷输入计划完成时间小于开始时时间修改 
2.修改时间选择的最小默认值
 2014-08-11 16:39:18 +08:00
sw 0c597d23a2 Merge branch 'szzh' into develop 2014-08-11 15:09:25 +08:00
sw 33855f721d 优化课程首页效率 2014-08-11 15:07:56 +08:00
sw f7635370d7 优化课程首页效率 2014-08-11 14:49:58 +08:00
sw 8724b79296 清理页面代码 2014-08-11 13:37:54 +08:00
sw 8c6160f496 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-11 09:19:20 +08:00
chenmin e3ab21e409 修复当登陆的用户的学校没有课程时的课程列表显示bug 2014-08-11 09:19:40 +08:00
linhk 044bba4d0d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-08 16:44:00 +08:00
linhk 0028c11426 退出项目功能 2014-08-08 16:43:34 +08:00
sw ea0b7ef3f1 Merge branch 'szzh' into develop 2014-08-08 16:42:41 +08:00
sw 6ab17a2bf7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-08 16:41:36 +08:00
sw db826a71ff Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-08 16:19:58 +08:00
chenmin 6037421c7d 修复没有课程的学校显示bug 2014-08-08 15:45:06 +08:00
chenmin dd64f13e49 课程列表空行bug 2014-08-08 15:37:26 +08:00
sw 006d1eac8f Merge remote-tracking branch 'origin/szzh' into szzh 2014-08-08 15:34:44 +08:00
z9hang 87f6f81279 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-08 15:09:48 +08:00
z9hang f8c6b66119 修改密码处导航丢失问题 2014-08-08 15:09:32 +08:00
z9hang 683cd9f918 个人积分修改 2014-08-08 13:47:02 +08:00
sw b5e8b12806 修改密码页面查询按钮改为确定 2014-08-08 11:32:15 +08:00
linhk 3d76b26e26 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-08 09:31:42 +08:00
linhk 70a1839e74 英文界面-用户下拉菜单（我的课程、项目、编辑资料）显示问题 2014-08-08 09:30:48 +08:00
zhanghaitao dbe8456fd5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-07 17:56:49 +08:00
zhanghaitao eac85b338f 标示错误修改 2014-08-07 17:56:29 +08:00
linhk 192bc8d89c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-07 17:16:26 +08:00
linhk cb4869fd20 解决新建版本库名长255个字符时异常 
解决版本库名长时，界面显示错误
 2014-08-07 17:16:00 +08:00
chenmin f2f7dfaf12 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-07 16:21:00 +08:00
chenmin d087c52314 课程动态为空判断 2014-08-07 16:20:46 +08:00
linhk af683f917d 解决新建版本库名非法类型成功新建 2014-08-07 16:09:50 +08:00
linhk 5e8eda6a40 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-07 15:58:37 +08:00
linhk 387d482059 解决用户注册无地区、身份可注册成功 2014-08-07 15:58:00 +08:00
zhanghaitao 4c71af51f4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-07 15:54:22 +08:00
zhanghaitao f3fe5d918e #832 状态联动问题的解决 2014-08-07 15:54:05 +08:00
sw 08821b9391 Merge branch 'szzh' into develop 2014-08-07 14:03:06 +08:00
linhk b545c5034d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/en.yml
 2014-08-07 12:02:55 +08:00
z9hang 96fa28f70d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-07 11:36:08 +08:00
sw b0b3f257a4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-07 11:31:39 +08:00
sw dac4042ee9 ttt 2014-08-07 11:31:24 +08:00
z9hang 722a568466 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-07 11:29:38 +08:00
z9hang 56a06c4a04 修复git说明页面导航丢失问题 
修改个人得分
 2014-08-07 11:28:58 +08:00
zhanghaitao 68a86c5e5d #873 #829问题修改 2014-08-07 11:20:24 +08:00
z9hang eacc0fdf53 修复编辑作业提交时的bug 
修改个人得分
 2014-08-07 10:45:56 +08:00
sw 34af8053cc Merge remote-tracking branch 'origin/szzh' into szzh 2014-08-07 09:23:28 +08:00
linhk 0c00754057 解决谷歌浏览器再上传相同文件时不可用 2014-08-07 09:13:01 +08:00
z9hang 17e6f0ee4f 部分私有的项目提交次数显示问题 2014-08-07 08:51:19 +08:00
z9hang c6271e2aa9 修复由项目积分改动引起的一个页面无法查看bug、添加项目得分统计任务 2014-08-06 16:02:26 +08:00
sw a4199e4c54 修改错误代码 2014-08-06 15:39:06 +08:00
sw 22335b23a6 修复新建账号申请项目时在申请列表无法显示的BUG #1180 2014-08-06 15:10:53 +08:00
z9hang 0eca547ec5 修复两个导航栏丢失问题、版本库=》查看差别，没有对应的文件或修订版本时报错问题 2014-08-06 15:03:43 +08:00
linhk 23c9d5381e 注册界面失败填写信息继续保留 
修改注册见面企业提交失败姓、名内容错误Bug
 2014-08-06 14:41:22 +08:00
z9hang 05186c8590 项目积分存数据库 
有项目积分引起的系列bug
 2014-08-06 11:46:38 +08:00
z9hang 1ca6447478 修复项目缺陷、新闻、讨论区等页面无法查看bug 2014-08-05 17:31:05 +08:00
linhk d8964d81a8 用户注册lastname超长报错 2014-08-05 17:13:50 +08:00
z9hang b4be18ab9d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/files_controller.rb
 2014-08-05 16:41:23 +08:00
z9hang 7907edf168 更新项目得分规则 
调整项目列表显示样式
 2014-08-05 16:39:33 +08:00
sw c155ebdfd7 Merge remote-tracking branch 'origin/szzh' into szzh 2014-08-05 15:38:01 +08:00
chenmin fbe3e535b4 修复课程资源排序bug 
修复课程动态时间段约束bug
 2014-08-05 15:23:01 +08:00
linhk 3862f857f7 解决当帖子回复条件为空排列次序错误 2014-08-05 14:02:39 +08:00
chenmin 8b217735c3 1029 修复部分课程资源排序不可用问题 2014-08-05 12:00:39 +08:00
z9hang 2c77d1b4cf 访问资源库问题 2014-08-05 11:10:41 +08:00
linhk 65174ad8ef 项目--wiki--重定向/重命名：“重”字被掩盖 2014-08-05 09:19:05 +08:00
linhk f8d7aeebac Merge remote-tracking branch 'origin/szzh' into szzh 2014-08-05 08:49:28 +08:00
chenmin 226d19b912 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-04 17:36:44 +08:00
sw 37e5bdee22 修复某些课程动态内容为空的BUG #1128 2014-08-04 17:36:07 +08:00
chenmin 8c8127c8d9 1016 修复课程显示界面空行问题； 2014-08-04 17:36:04 +08:00
z9hang 426ea23d6e 回复帖子内容为空时报错问题 2014-08-04 17:30:29 +08:00
sw 94f6e871b1 修改新建用户时企业名不是英文且提示错误的BUG #1130 2014-08-04 15:49:23 +08:00
sw 8b3b1bdcfa 取消编辑参赛作品时注意提示 2014-08-04 15:36:19 +08:00
sw 9cb026ed39 增加竞赛删除评论的功能 2014-08-04 15:01:39 +08:00
z9hang 80b2a2dc45 修正公共贴吧新建帖子问题 
修正课程列表错误
 2014-08-04 12:23:20 +08:00
linhk 653c505471 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-04 09:39:14 +08:00
sw 209c1aeaab Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-02 17:06:39 +08:00
sw 69f7f97bf8 修复个人动态主页缺陷描述超出页面的BUG 2014-08-02 17:05:56 +08:00
zhanghaitao 01ab676622 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-02 15:17:21 +08:00
zhanghaitao 5a5ac28833 用户列表显示修改 2014-08-02 15:16:51 +08:00
linhk 25cfb7aa71 解决谷歌浏览器新建版本库文本框会默认填写缓存内容的问题 2014-08-02 14:43:05 +08:00
z9hang ff02c4f9f2 修正课程显示老师、学生人数与课程中老师、学生数量不一致问题 
修正学校主页课程推荐中显示的课程人数与课程总人数不一致问题
 2014-08-01 17:43:06 +08:00
sw c5a7497910 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-01 17:36:50 +08:00
sw 63cfa9b35a 取消打包下载的ajax 2014-08-01 16:14:00 +08:00
z9hang c78047ae98 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-01 16:01:33 +08:00
z9hang acb41158e7 错误提示页面导航栏添加 
登陆时自动忽略登陆名前后空格
 2014-08-01 16:01:16 +08:00
nwb 204ced9490 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-01 16:00:06 +08:00
nwb 5a2d0ce649 issue#1077 新建竞赛的奖金换行显示，长度约束 2014-08-01 15:52:18 +08:00
linhk 54a246b6e6 中国高校搜索文本Enter快捷操作 2014-08-01 15:46:05 +08:00
z9hang 0d46c63c54 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-01 14:55:55 +08:00
sw 9e5f7e6fc6 取消主页加入课程链接 2014-08-01 14:36:41 +08:00
z9hang 2ad51d7afe 修改引用的留言为不能修改 2014-08-01 14:08:38 +08:00
zhanghaitao c1519984de Issue#1091,文本显示修改 2014-08-01 13:56:12 +08:00
sw b8f27b51c0 取消主页加入课程链接 2014-08-01 11:37:14 +08:00
sw d66dc65cca Merge branch 'szzh' into develop 2014-07-31 17:27:01 +08:00
sw d5ac443f90 修复竞赛列表搜索结果不正确的BUG 2014-07-31 17:02:30 +08:00
sw 8b80d99a70 修复资源标记搜索不正确的BUG issues#1089 2014-07-31 14:39:18 +08:00
sw 2c689b6399 删除竞赛时删除竞赛下所有作品 2014-07-31 14:02:25 +08:00
sw 7b32debb92 修复谷歌浏览器用户列表翻到第5页后角色信息和翻页列表在同一行的BUG 2014-07-31 13:55:22 +08:00
sw a9fad79c8d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-31 11:35:50 +08:00
sw bb6be3ed8a 修改html错误 2014-07-31 11:35:16 +08:00
z9hang 27feeee03f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-31 10:21:33 +08:00
z9hang 8a9e2b47ad 调用存储过程刷新项目提交次数 2014-07-31 10:21:11 +08:00
sw a3cbcdad51 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-31 10:13:51 +08:00
sw 41d983e904 取消过期缺陷邮件的发送(很有问题)！！！ 2014-07-31 09:45:46 +08:00
z9hang 290d9b1973 课程首页课程名过长导致个别信息显示不全问题 2014-07-30 16:31:59 +08:00
z9hang cb6c95c632 课程列表提示框里有html标签问题 2014-07-30 16:03:23 +08:00
sw 31e8ad98ae 1.修复竞赛作品每次修改之后，都会吧图片清空的BUG 
2.修改删除竞赛作品图片功能
 2014-07-30 15:48:13 +08:00
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
sw 1f4943483e 1.现在竞赛作品名称、开发人员、开发环境的长度 
2.修复竞赛作品一上传的图片，编辑时资源列表不显示的问题
 2014-07-30 13:52:55 +08:00
yanxd 281c48c0b3 . 2014-07-30 10:18:49 +08:00
z9hang 847bb35906 修正谷歌浏览器贴吧图标偏移问题 2014-07-30 10:00:07 +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 b05e112a3f 1.修改邮件服务器配置 
2.查询竞赛作品在js中提交，增加搜索条件是不是为空的判断
3.查询结果取消按照时间/活跃度排序功能
 2014-07-29 17:47:20 +08:00
sw 3119d9a9aa 增加竞赛作品的搜索功能 2014-07-29 17:35:22 +08:00
nwb 81b77bc870 文件删除修改 2014-07-29 16:14:49 +08:00
sw c1bbd8a535 对于设置了完成日期的缺陷，到日期还没解决，给相关人员发一个通知邮件 2014-07-29 14:29:59 +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
z9hang 225e3c396a 个人得相关分方法添加 2014-07-29 10:06:48 +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 0d0fb7052e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 15:16:37 +08:00
sw a39672dd14 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-28 15:09:14 +08:00
z9hang 90a35fa24a 竞赛、课程首页，贴吧动态名字过长显示问题 
课程、项目编辑贴子导航丢失问题
 2014-07-28 15:06:54 +08:00
sw 18ddb8604b 取消参赛作品名称、描述的字数限制 2014-07-28 14:58:01 +08:00
nwb 2c79a51e48 优化文件读取编码解析 2014-07-28 14:43:38 +08:00
z9hang 9bf8abd03b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 13:53:57 +08:00
z9hang a4ecccc048 修复贴吧动态中昵称过长回复被挤到不正确位置bug 2014-07-28 13:53:39 +08:00
nwb 1b589bf562 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 11:30:02 +08:00
nwb 74de064cca 1.文件删除权限判断优化 
2.课程通知附件删除BUG修改
 2014-07-28 11:29:55 +08:00
yanxd a8ed4272cc ckeditor: 描述中网址后面带有换行，projects列表出错 2014-07-28 11:03:39 +08:00
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
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 f052d0d461 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-25 17:37:07 +08:00
z9hang a1e06991d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 17:36:11 +08:00
nwb f8a59220e3 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-25 17:08:01 +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 b5b246f098 修复个性签名未自动换行的问题 2014-07-25 15:12:24 +08:00
nwb c0ac9924e7 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-25 15:09:56 +08:00
nwb 2a4daf04f9 删除资源文件修改 2014-07-25 15:09:29 +08:00
sw ea322d6177 修复项目提交时间字的长度过长时会换行的BUG 2014-07-25 14:51:10 +08:00
nwb 1257e67380 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-25 14:06:59 +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
nwb 2bfc7aa93f Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-25 11:12:08 +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 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
nwb 8b0b31f749 附件下载更新 2014-07-24 11:20:33 +08:00