 z9hang
|
67162bd8fb
|
admin编辑角色，项目权限、课程、；竞赛权限分开显示
|
11 years ago |
 alan
|
96268d7007
|
修复bug:点击contest主页最新参赛作品“更多”按钮返回异常
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8d657fd0af
|
修复bug:
1,竞赛通知，点击取消也能成功添加
2， “删除”二字竖的排列
3， 编辑竞赛显示为“新闻”
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
83c5d5c78d
|
#1283公告贴吧，编辑回帖控件建议修改样式,编辑按钮由图片改为字
|
11 years ago |
|
z9hang
|
e5d89590e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
97156f0de1
|
enable_module表被还原问题，原因课程新建失败时，@course对象未保存故其id为null，却做了删除操作级联删除enable_module表时sql语句就成了DELETE FROM `enabled_modules` WHERE `enabled_modules`.`course_id` IS NULL 而这刚好对应了所有项目数据。解决办法：去掉删除课程语句，未保存成功时不需删除
|
11 years ago |
|
alan
|
143defd384
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
b88c361525
|
修改新建参赛作品样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 sw
|
3fef2d8a3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
f741dedd29
|
Merge branch 'develop' into szzh
|
11 years ago |
|
alan
|
4604720475
|
修改竞赛作品信息
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d9fe607c5b
|
#1282 修复225号作业显示错误的BUG
解决方案：数据库问题
|
11 years ago |
|
z9hang
|
086d99fe2a
|
#1280 公共贴吧--新建帖子，置所有条件为空，点击发布按钮，却返回帖子列表及其他相关问题。修改：发布失败后停留在发帖页面
|
11 years ago |
|
z9hang
|
cc73b5e9d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
64107ca5cc
|
#1279 主页--“我要提问”/“我要反馈” 置所有条件为空，点击发布按钮，未给出类似于“主题/内容不能为空字符”的提示信息,给出错误信息后跳转错误，修正，将两个按钮并排
|
11 years ago |
|
sw
|
8688c03aee
|
限制文件列表中昵称的长度
|
11 years ago |
|
sw
|
7e6546d828
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
0a6364f669
|
修改竞赛新建作品按钮无反应的BUG
|
11 years ago |
|
sw
|
41329c8cc5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ef78066f3e
|
公共贴吧，回复帖子上传附件时回复信息显示不完整:还有一点点被遮住。。
|
11 years ago |
|
alan
|
a823700300
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
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>
|
11 years ago |
|
alan
|
f78be4ea51
|
解决竞赛作品提交不了bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
e1675c4009
|
课程动态显示增加自动换行
|
11 years ago |
|
sw
|
c8e54694c0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
567d929781
|
新建、修改课程课程标题最大长度限定为100
|
11 years ago |
|
sw
|
353f484bbe
|
course首页代码国际化
|
11 years ago |
linhk
|
d0979a7bf5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
c31b50421e
|
菜单栏项目、课程样式调整
|
11 years ago |
|
sw
|
8ed69576a6
|
Merge branch 'szzh' into develop
Conflicts:
app/views/memos/show.html.erb
|
11 years ago |
|
sw
|
5d65901ebd
|
解决冲突
|
11 years ago |
|
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>
|
11 years ago |
|
linhk
|
05a5bf863f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
0342dfa4c5
|
代码评审样式调整
|
11 years ago |
|
z9hang
|
ee00d7d20a
|
贴吧资源下载开放，判断贴吧资源修改为根据资源的container_type是否为‘Memo’判断
|
11 years ago |
|
alan
|
02470491bd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/index.html.erb
|
11 years ago |
|
alan
|
f44dbf76ac
|
测试course路由
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
5a14798290
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
0a02fbf10e
|
修复资源搜索，资源列表显示错误 #1262
链接解析方法不对
|
11 years ago |
|
alan
|
0e07bed1ad
|
将contest 中的中文转换成zh.yml中的标签
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
1976aa9c72
|
公共贴吧--编辑帖子，“置顶”与“引用”控件重叠及中英文混排问题 #1258
|
11 years ago |
|
sw
|
0ab7bfcda9
|
限制上传文件名、文件描述长度 #1252
|
11 years ago |
|
linhk
|
5824f70fe3
|
输出日志代码
|
11 years ago |
|
sw
|
98b6be61ba
|
1.修复回复贴吧信息错误后错误信息不及时清除的BUG
2.修复课程讨论区新建帖子跳转页面为回复的BUG
3.修复新建作业后报错的BUg
解决方案：路由错误
|
11 years ago |
|
sw
|
245e0a858c
|
修复新建竞赛连接错误
|
11 years ago |
|
sw
|
d3bd97acbf
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
7c97c0391b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
51a783c9a9
|
1.修改竞赛首页通知公告
2.调整竞赛首页页面布局
解决方案：查找系统中最新的最多5条通知公告，显示在首页，用户可以点击相应公告进入公告详细信息页面
|
11 years ago |
|
sw
|
5ac7304858
|
优化view层代码
|
11 years ago |
|
sw
|
e9a72b56cb
|
超级管理员可以在任何竞赛发布通知公告
|
11 years ago |
