 sw
|
46ba7f6a7b
|
Merge branch 'szzh' into develop
|
11 years ago |
 zhanghaitao
|
88aa66b15b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhanghaitao
|
4934c8c801
|
# 页面返回异常处理
|
11 years ago |
 z9hang
|
56aa2fb8dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
caed78327a
|
积分计算修改
|
11 years ago |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
11 years ago |
linhk
|
044bba4d0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
0028c11426
|
退出项目功能
|
11 years ago |
|
z9hang
|
87f6f81279
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
f8c6b66119
|
修改密码处导航丢失问题
|
11 years ago |
|
z9hang
|
683cd9f918
|
个人积分修改
|
11 years ago |
|
linhk
|
387d482059
|
解决用户注册无地区、身份可注册成功
|
11 years ago |
|
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
11 years ago |
|
linhk
|
b545c5034d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
|
11 years ago |
|
z9hang
|
96fa28f70d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
56a06c4a04
|
修复git说明页面导航丢失问题
修改个人得分
|
11 years ago |
|
z9hang
|
eacc0fdf53
|
修复编辑作业提交时的bug
修改个人得分
|
11 years ago |
|
sw
|
34af8053cc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
c6271e2aa9
|
修复由项目积分改动引起的一个页面无法查看bug、添加项目得分统计任务
|
11 years ago |
|
sw
|
a4199e4c54
|
修改错误代码
|
11 years ago |
|
z9hang
|
0eca547ec5
|
修复两个导航栏丢失问题、版本库=》查看差别，没有对应的文件或修订版本时报错问题
|
11 years ago |
|
linhk
|
23c9d5381e
|
注册界面失败填写信息继续保留
修改注册见面企业提交失败姓、名内容错误Bug
|
11 years ago |
|
z9hang
|
05186c8590
|
项目积分存数据库
有项目积分引起的系列bug
|
11 years ago |
|
z9hang
|
1ca6447478
|
修复项目缺陷、新闻、讨论区等页面无法查看bug
|
11 years ago |
|
z9hang
|
b4be18ab9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/files_controller.rb
|
11 years ago |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
11 years ago |
|
sw
|
c155ebdfd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
 chenmin
|
fbe3e535b4
|
修复课程资源排序bug
修复课程动态时间段约束bug
|
11 years ago |
|
linhk
|
3862f857f7
|
解决当帖子回复条件为空排列次序错误
|
11 years ago |
|
chenmin
|
8b217735c3
|
1029 修复部分课程资源排序不可用问题
|
11 years ago |
|
z9hang
|
2c77d1b4cf
|
访问资源库问题
|
11 years ago |
|
z9hang
|
426ea23d6e
|
回复帖子内容为空时报错问题
|
11 years ago |
|
sw
|
9cb026ed39
|
增加竞赛删除评论的功能
|
11 years ago |
|
z9hang
|
80b2a2dc45
|
修正公共贴吧新建帖子问题
修正课程列表错误
|
11 years ago |
|
sw
|
c5a7497910
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
acb41158e7
|
错误提示页面导航栏添加
登陆时自动忽略登陆名前后空格
|
12 years ago |
|
z9hang
|
0d46c63c54
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
9e5f7e6fc6
|
取消主页加入课程链接
|
12 years ago |
|
z9hang
|
2ad51d7afe
|
修改引用的留言为不能修改
|
12 years ago |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
12 years ago |
|
sw
|
d5ac443f90
|
修复竞赛列表搜索结果不正确的BUG
|
12 years ago |
|
sw
|
8b80d99a70
|
修复资源标记搜索不正确的BUG issues#1089
|
12 years ago |
|
z9hang
|
27feeee03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
8a9e2b47ad
|
调用存储过程刷新项目提交次数
|
12 years ago |
|
sw
|
a3cbcdad51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
12 years ago |
|
sw
|
31e8ad98ae
|
1.修复竞赛作品每次修改之后，都会吧图片清空的BUG
2.修改删除竞赛作品图片功能
|
12 years ago |
|
z9hang
|
4dc2a23f9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
12 years ago |
 yanxd
|
281c48c0b3
|
.
|
12 years ago |
|
z9hang
|
5800cf5fff
|
修正登陆错误
|
12 years ago |
|
z9hang
|
952fcce0de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
c60188038e
|
得分机制修改
|
12 years ago |
|
sw
|
28606f030d
|
修复搜索参赛作品结果翻页跳转不正确的BUG
|
12 years ago |
|
sw
|
c4aa9aadbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
3119d9a9aa
|
增加竞赛作品的搜索功能
|
12 years ago |
 nwb
|
81b77bc870
|
文件删除修改
|
12 years ago |
|
sw
|
e7503237f1
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
z9hang
|
d8fcf8eb9b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
52dcc6d1a1
|
讨论区帖子添加回复时，取消修改帖子的更新时间。项目最新动态只显示最新的回复，不将帖子创建重复显示
|
12 years ago |
|
sw
|
e344f16f5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
12 years ago |
|
nwb
|
9da116c0e3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
cb4efd914e
|
修正项目文档删除BUG
|
12 years ago |
|
yanxd
|
bf9a992399
|
活跃度排序不一致
|
12 years ago |
|
z9hang
|
90a35fa24a
|
竞赛、课程首页，贴吧动态名字过长显示问题
课程、项目编辑贴子导航丢失问题
|
12 years ago |
|
nwb
|
2c79a51e48
|
优化文件读取编码解析
|
12 years ago |
|
nwb
|
74de064cca
|
1.文件删除权限判断优化
2.课程通知附件删除BUG修改
|
12 years ago |
|
z9hang
|
1daec14ab5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
12 years ago |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
12 years ago |
|
yanxd
|
979d6dd067
|
dts_test. controller ===> model
|
12 years ago |
|
nwb
|
f052d0d461
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
12 years ago |
|
z9hang
|
a1e06991d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
12 years ago |
|
nwb
|
c0ac9924e7
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
12 years ago |
|
nwb
|
2a4daf04f9
|
删除资源文件修改
|
12 years ago |
|
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
12 years ago |
|
nwb
|
735d7f2c1f
|
文件下载权限判断优化
|
12 years ago |
|
z9hang
|
5a0d76c1e0
|
竞赛通知发布完成
|
12 years ago |
|
z9hang
|
673ffb1819
|
提交次数刷新问题
|
12 years ago |
|
nwb
|
2bfc7aa93f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
12 years ago |
|
z9hang
|
42f0c49093
|
作业打包下载错误提示页无导航问题
|
12 years ago |
|
z9hang
|
7eb1a76734
|
修改编辑贴吧无导航栏、提交失败无提示bug
|
12 years ago |
|
z9hang
|
3b54def1c7
|
首页定制修改
|
12 years ago |
|
z9hang
|
6ad3a1128e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
f83336aed0
|
修改首页定制中热门项目排序方式的实现
|
12 years ago |
|
yanxd
|
6a14676248
|
remove pry
|
12 years ago |
|
yanxd
|
1755d7a790
|
issues controller & unit testing, word log print.
|
12 years ago |
|
nwb
|
8b0b31f749
|
附件下载更新
|
12 years ago |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
12 years ago |
|
z9hang
|
fb6cd2e9d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
12 years ago |
|
nwb
|
0a06e2033f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
5d22bc5510
|
文件上传修改
|
12 years ago |
|
yanxd
|
ee95d9b115
|
user_activity page
|
12 years ago |
|
yanxd
|
18d096f0d8
|
删除项目，竞赛表project_id会置空，projecting_softapplications模型不知道干嘛用，此表也不存在
|
12 years ago |
|
yanxd
|
cccbd941ce
|
用户删除，管理界面用户去排序，删除后跳转，去无效参数
|
12 years ago |
|
nwb
|
f22a39fbfa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
a5d829b95e
|
1.优化课程通知模块
2.优化文件上传
|
12 years ago |
|
z9hang
|
41ea3a1baf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
