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

3456 Commits

Author SHA1 Message Date
z9hang 83c5d5c78d #1283公告贴吧，编辑回帖控件建议修改样式,编辑按钮由图片改为字 2014-09-24 09:03:38 +08:00
z9hang e5d89590e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-23 14:48:41 +08:00
z9hang 97156f0de1 enable_module表被还原问题，原因课程新建失败时，@course对象未保存故其id为null，却做了删除操作级联删除enable_module表时sql语句就成了DELETE FROM `enabled_modules` WHERE `enabled_modules`.`course_id` IS NULL 而这刚好对应了所有项目数据。解决办法：去掉删除课程语句，未保存成功时不需删除 2014-09-23 14:46:19 +08:00
alan 143defd384 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-22 17:33:02 +08:00
alan b88c361525 修改新建参赛作品样式 
Signed-off-by: alan <547533434@qq.com>
 2014-09-22 17:32:18 +08:00
sw 3fef2d8a3c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-22 17:08:24 +08:00
sw f741dedd29 Merge branch 'develop' into szzh 2014-09-22 17:07:39 +08:00
alan 4604720475 修改竞赛作品信息 
Signed-off-by: alan <547533434@qq.com>
 2014-09-22 14:55:29 +08:00
sw d9fe607c5b #1282 修复225号作业显示错误的BUG 
解决方案：数据库问题
 2014-09-22 11:36:05 +08:00
z9hang 086d99fe2a #1280 公共贴吧--新建帖子，置所有条件为空，点击发布按钮，却返回帖子列表及其他相关问题。修改：发布失败后停留在发帖页面 2014-09-22 10:35:18 +08:00
z9hang cc73b5e9d7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-19 15:44:32 +08:00
z9hang 64107ca5cc #1279 主页--“我要提问”/“我要反馈” 置所有条件为空，点击发布按钮，未给出类似于“主题/内容不能为空字符”的提示信息,给出错误信息后跳转错误，修正，将两个按钮并排 2014-09-19 15:43:25 +08:00
sw 8688c03aee 限制文件列表中昵称的长度 2014-09-18 16:20:58 +08:00
sw 7e6546d828 Merge branch 'szzh' into develop 2014-09-18 14:38:47 +08:00
sw 0a6364f669 修改竞赛新建作品按钮无反应的BUG 2014-09-18 13:54:03 +08:00
sw 41329c8cc5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-18 13:43:12 +08:00
sw ef78066f3e 公共贴吧，回复帖子上传附件时回复信息显示不完整:还有一点点被遮住。。 2014-09-18 11:00:15 +08:00
alan a823700300 Signed-off-by: alan <547533434@qq.com> 2014-09-18 10:10:14 +08:00
alan c3341eb368 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/contests/index.html.erb
从远端下载该文件到本地
Signed-off-by: alan <547533434@qq.com>
 2014-09-17 20:10:06 +08:00
alan f78be4ea51 解决竞赛作品提交不了bug 
Signed-off-by: alan <547533434@qq.com>
 2014-09-17 19:57:26 +08:00
sw e1675c4009 课程动态显示增加自动换行 2014-09-17 17:53:19 +08:00
sw c8e54694c0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-17 17:38:41 +08:00
sw 567d929781 新建、修改课程课程标题最大长度限定为100 2014-09-17 17:36:37 +08:00
sw 353f484bbe course首页代码国际化 2014-09-17 17:07:18 +08:00
linhk d0979a7bf5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-17 16:36:16 +08:00
linhk c31b50421e 菜单栏项目、课程样式调整 2014-09-17 16:35:52 +08:00
sw 8ed69576a6 Merge branch 'szzh' into develop 
Conflicts:
	app/views/memos/show.html.erb
 2014-09-17 16:12:34 +08:00
sw 5d65901ebd 解决冲突 2014-09-17 16:08:49 +08:00
alan 875249ba58 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/contests/index.html.erb

Signed-off-by: alan <547533434@qq.com>
 2014-09-17 16:05:30 +08:00
linhk 05a5bf863f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-17 16:03:17 +08:00
linhk 0342dfa4c5 代码评审样式调整 2014-09-17 16:02:57 +08:00
z9hang ee00d7d20a 贴吧资源下载开放，判断贴吧资源修改为根据资源的container_type是否为‘Memo’判断 2014-09-17 15:58:57 +08:00
alan 02470491bd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/contests/index.html.erb
 2014-09-17 15:33:47 +08:00
alan f44dbf76ac 测试course路由 
Signed-off-by: alan <547533434@qq.com>
 2014-09-17 15:17:43 +08:00
sw 5a14798290 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-17 15:05:15 +08:00
sw 0a02fbf10e 修复资源搜索，资源列表显示错误 #1262 
链接解析方法不对
 2014-09-17 15:04:41 +08:00
alan 0e07bed1ad 将contest 中的中文转换成zh.yml中的标签 
Signed-off-by: alan <547533434@qq.com>
 2014-09-17 14:58:13 +08:00
sw 1976aa9c72 公共贴吧--编辑帖子，“置顶”与“引用”控件重叠及中英文混排问题 #1258 2014-09-17 14:55:36 +08:00
sw 0ab7bfcda9 限制上传文件名、文件描述长度 #1252 2014-09-17 14:14:17 +08:00
linhk 5824f70fe3 输出日志代码 2014-09-17 13:54:55 +08:00
sw 98b6be61ba 1.修复回复贴吧信息错误后错误信息不及时清除的BUG 
2.修复课程讨论区新建帖子跳转页面为回复的BUG
3.修复新建作业后报错的BUg
解决方案：路由错误
 2014-09-17 12:31:53 +08:00
sw 245e0a858c 修复新建竞赛连接错误 2014-09-17 12:06:07 +08:00
sw d3bd97acbf Merge branch 'szzh' into develop 2014-09-16 15:39:38 +08:00
sw 7c97c0391b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-16 15:38:49 +08:00
sw 51a783c9a9 1.修改竞赛首页通知公告 
2.调整竞赛首页页面布局
解决方案：查找系统中最新的最多5条通知公告，显示在首页，用户可以点击相应公告进入公告详细信息页面
 2014-09-16 15:38:21 +08:00
sw 5ac7304858 优化view层代码 2014-09-16 14:23:13 +08:00
sw e9a72b56cb 超级管理员可以在任何竞赛发布通知公告 2014-09-16 14:15:52 +08:00
linhk 111e5bea7c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-16 14:09:22 +08:00
linhk aabd183299 注册界面姓氏文本框内容修改 2014-09-16 14:08:44 +08:00
z9hang 943f428aad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-16 14:07:30 +08:00