sw
|
8b80d99a70
|
修复资源标记搜索不正确的BUG issues#1089
|
2014-07-31 14:39:18 +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
|
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 |
yanxd
|
281c48c0b3
|
.
|
2014-07-30 10:18:49 +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
|
3119d9a9aa
|
增加竞赛作品的搜索功能
|
2014-07-29 17:35:22 +08:00 |
nwb
|
81b77bc870
|
文件删除修改
|
2014-07-29 16:14:49 +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 |
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
|
90a35fa24a
|
竞赛、课程首页,贴吧动态名字过长显示问题
课程、项目编辑贴子导航丢失问题
|
2014-07-28 15:06:54 +08:00 |
nwb
|
2c79a51e48
|
优化文件读取编码解析
|
2014-07-28 14:43:38 +08:00 |
nwb
|
74de064cca
|
1.文件删除权限判断优化
2.课程通知附件删除BUG修改
|
2014-07-28 11:29:55 +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 |
yanxd
|
979d6dd067
|
dts_test. controller ===> model
|
2014-07-28 09:22:52 +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 |
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
2014-07-25 16:05:33 +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 |
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 14:06:59 +08:00 |
nwb
|
735d7f2c1f
|
文件下载权限判断优化
|
2014-07-25 14:05:25 +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 |
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 |
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 |
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节,及各种得分更新方法
|
2014-07-23 17:56:15 +08:00 |
z9hang
|
fb6cd2e9d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 09:25:17 +08:00 |
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
2014-07-23 09:24:26 +08:00 |
nwb
|
0a06e2033f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 08:43:36 +08:00 |
nwb
|
5d22bc5510
|
文件上传修改
|
2014-07-23 08:43:23 +08:00 |
yanxd
|
ee95d9b115
|
user_activity page
|
2014-07-22 17:57:11 +08:00 |
yanxd
|
18d096f0d8
|
删除项目,竞赛表project_id会置空,projecting_softapplications模型不知道干嘛用,此表也不存在
|
2014-07-22 17:40:32 +08:00 |
yanxd
|
cccbd941ce
|
用户删除,管理界面用户去排序,删除后跳转,去无效参数
|
2014-07-22 17:17:42 +08:00 |
nwb
|
f22a39fbfa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 16:56:34 +08:00 |
nwb
|
a5d829b95e
|
1.优化课程通知模块
2.优化文件上传
|
2014-07-22 16:49:32 +08:00 |
z9hang
|
41ea3a1baf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 16:00:11 +08:00 |
z9hang
|
dee09aad75
|
修复导航bug
|
2014-07-22 15:59:35 +08:00 |
sw
|
47ae398748
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 13:49:25 +08:00 |
sw
|
de17a84061
|
增加异常捕获,当作业未找到相应文件时,跳到文件未找到页面(不报500错误)
|
2014-07-22 13:48:30 +08:00 |
nwb
|
42c2f6c2ee
|
更改项目文档按作者排序
|
2014-07-22 13:47:05 +08:00 |
nwb
|
3ba8ba010d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-22 10:52:21 +08:00 |
sw
|
d9b9b2152f
|
增加教师功能用户打包下载所有作业的功能
|
2014-07-22 09:56:29 +08:00 |
nwb
|
68be9c25b8
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/contest.html.erb
|
2014-07-22 09:52:16 +08:00 |
sw
|
58c3e98a21
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-22 09:44:24 +08:00 |
sw
|
ab55043880
|
修复当作业附件列表为空时,点击打包下载会报500错的BUG
|
2014-07-22 09:42:41 +08:00 |
nwb
|
5954ba1788
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 09:32:54 +08:00 |
nwb
|
cf11cac0ad
|
项目文档权限判断优化
|
2014-07-22 09:32:46 +08:00 |
yanxd
|
edee2b2327
|
删掉welcome没用的方法
|
2014-07-22 09:17:21 +08:00 |
nwb
|
67dfd72845
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 09:15:28 +08:00 |
nwb
|
518edeac68
|
项目文档浏览BUG修改
|
2014-07-22 09:15:19 +08:00 |
z9hang
|
513fd32ec5
|
修复查看个人动态无权限bug
|
2014-07-22 09:11:37 +08:00 |
z9hang
|
221aef4a7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 08:53:24 +08:00 |
z9hang
|
3e79dd6e32
|
竞赛通知鼠标悬停
导航丢失问题
|
2014-07-22 08:53:14 +08:00 |
nwb
|
b49344107c
|
用户动态权限判定修改
|
2014-07-22 08:51:35 +08:00 |
nwb
|
79eac39dc2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 17:50:51 +08:00 |
sw
|
6e954d314f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 17:45:01 +08:00 |
nwb
|
774eed0dbf
|
优化公开资源的下载权限判断
|
2014-07-21 17:29:30 +08:00 |
sw
|
b1251db30c
|
1.修改竞赛作品时增加作品类别下拉框选择
2.修改竞赛作品时增加获取选择其他时作品类别
|
2014-07-21 17:23:45 +08:00 |
sw
|
c8aaa2776c
|
1.作品类别增加其他选项,当用户选择其他时,显示一编辑框用于用户输入其作品所属类别
2.添加竞赛支持自定义类别
|
2014-07-21 16:59:00 +08:00 |
yanxd
|
fb138d1593
|
remove user_activities path, 3path bug.
|
2014-07-21 16:41:11 +08:00 |
nwb
|
222959d1da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 16:19:54 +08:00 |
nwb
|
27fda1f938
|
竞赛首页修改
|
2014-07-21 16:19:45 +08:00 |
yanxd
|
472b61fefe
|
删除了不能通过的测试,修改user_activities。所有原路由测试可以通过。
|
2014-07-21 15:49:23 +08:00 |
nwb
|
aea41ba997
|
修改竞赛首页搜索功能
|
2014-07-21 15:45:00 +08:00 |
nwb
|
5adac1a32a
|
课程讨论区回复内容为空时提示
|
2014-07-21 15:15:10 +08:00 |
nwb
|
35ab3a2c7d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 13:53:45 +08:00 |
nwb
|
ec71e8eeeb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 13:37:48 +08:00 |
nwb
|
c7f80effb7
|
修正课程讨论区删除帖子BUG
|
2014-07-21 13:37:36 +08:00 |
z9hang
|
5e4571d6af
|
修复部分页面导航丢失问题
|
2014-07-21 11:14:17 +08:00 |
nwb
|
f20f0aaa45
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-19 11:11:58 +08:00 |
z9hang
|
4bd083b059
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/show.html.erb
|
2014-07-18 16:56:00 +08:00 |
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
2014-07-18 16:39:39 +08:00 |
nwb
|
b655f0c7b0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-18 13:50:30 +08:00 |
nwb
|
7898bc1dd7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 11:25:16 +08:00 |
nwb
|
046142f437
|
优化students_for_courses表相关逻辑
|
2014-07-18 11:25:04 +08:00 |
yanxd
|
df848ca756
|
print tag exception, course name valid test.
|
2014-07-18 11:08:36 +08:00 |
nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
2014-07-18 09:57:47 +08:00 |
nwb
|
ed00adb3ba
|
优化下载权限判断
|
2014-07-17 17:06:54 +08:00 |
nwb
|
f4d6696d2e
|
优化资源搜索界面
|
2014-07-17 16:06:10 +08:00 |
nwb
|
615b3ac2ac
|
课程界面调整
|
2014-07-17 14:32:07 +08:00 |
nwb
|
6a65b2a84b
|
去掉测试代码
|
2014-07-17 10:52:01 +08:00 |
nwb
|
0dc2466539
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-17 09:55:52 +08:00 |
nwb
|
b60a0ddf59
|
1.添加给gitlab项目新增用户及赋权限接口
2.添加给gitlab项目删除用户接口
|
2014-07-17 09:55:40 +08:00 |
yanxd
|
12fb6bf5ca
|
.
|
2014-07-17 09:52:56 +08:00 |
nwb
|
3d8571b59e
|
1.实现新增gitlab用户接口
2.实现删除gitlab用户接口
|
2014-07-16 16:50:28 +08:00 |
nwb
|
1f5d792783
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 15:52:52 +08:00 |
nwb
|
6dcc50e60b
|
添加gitlab创建项目(版本库)接口
|
2014-07-16 15:52:41 +08:00 |
z9hang
|
2cab9f7895
|
热门项目排序添加空值判断,默认按活跃度排序
|
2014-07-16 15:24:56 +08:00 |
z9hang
|
ab05bf6f36
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 15:16:20 +08:00 |
z9hang
|
494d3af9a4
|
修复贴吧分页问题
|
2014-07-16 15:16:10 +08:00 |
nwb
|
36ab954cf9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-16 15:05:57 +08:00 |
nwb
|
297fe9a3f4
|
添加gitlab远程登录接口
|
2014-07-16 15:05:16 +08:00 |
z9hang
|
d9e04bab0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 14:22:37 +08:00 |
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
2014-07-16 14:22:12 +08:00 |
sw
|
4825c5287e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 10:15:43 +08:00 |
nwb
|
13a3725b06
|
BUG修改
|
2014-07-16 09:28:12 +08:00 |
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-15 16:16:13 +08:00 |
z9hang
|
6a45a0287d
|
添加删除图片功能,修复用户修改资料界面form.quene undefine的js错误(导致加载中不消失的原因)
|
2014-07-15 16:13:50 +08:00 |
sw
|
121ffa0342
|
修改缺陷时增加跟踪者的删除和增加功能
|
2014-07-15 15:09:52 +08:00 |
sw
|
b142953a4b
|
1.创建项目增加功能:是否启动DTS测试,默认为不启用。根据用户选择,决定左侧DTS测试工具选项是否在该项目内显示
|
2014-07-15 10:28:49 +08:00 |
sw
|
61ba2c47ee
|
1.修改历史数据中作业为项目时作业显示列表未改变的问题
2.修改作业列表关联项目过长,增加省略号显示和鼠标移动到相应位置的气泡显示
|
2014-07-15 09:43:13 +08:00 |
sw
|
8f8fb79a63
|
1.软件创客搜索功能修改表单提交为在js中提交
2.增加判断搜索条件是不是为空
|
2014-07-14 16:29:59 +08:00 |
z9hang
|
cf339edb6c
|
添加首页定制的非空验证,长度验证
|
2014-07-14 16:12:58 +08:00 |
nwb
|
2a1a051362
|
课程资源文件密级BUG修正
|
2014-07-14 15:15:28 +08:00 |
sw
|
ef95835bc6
|
修复当前用户为超级管理员时,创建项目后,在个人信息的参与项目栏内无该项目的记录
|
2014-07-14 14:49:05 +08:00 |
nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-14 11:32:01 +08:00 |
nwb
|
0031f90c64
|
1.课程动态中的私有的资源、文档进行权限判断
2.项目动态中的私有的资源、文档进行权限判断
|
2014-07-14 11:31:24 +08:00 |
sw
|
59a5541e45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-11 14:52:15 +08:00 |
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-11 11:45:46 +08:00 |
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
2014-07-11 11:41:54 +08:00 |
nwb
|
1d4dad22ad
|
Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
ReadMe.txt
app/views/layouts/_base_footer.html.erb
|
2014-07-11 11:38:36 +08:00 |
nwb
|
6d698cb5d8
|
下载添加权限判断
|
2014-07-11 11:36:00 +08:00 |
nwb
|
bdaf59513b
|
Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
app/views/layouts/_base_footer.html.erb
|
2014-07-11 09:11:37 +08:00 |
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
2014-07-11 09:08:50 +08:00 |
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
2014-07-11 09:07:09 +08:00 |
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
2014-07-10 17:38:04 +08:00 |
sw
|
86adfaecce
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-10 16:59:59 +08:00 |
yanxd
|
056f86caad
|
can't download, html. after exception return;
|
2014-07-10 16:41:34 +08:00 |
sw
|
39434766e3
|
1.修复超级管理员无法访问课程作业列表的BUG
2.修改作业描述样式
|
2014-07-10 16:35:53 +08:00 |
yanxd
|
803e9cbdb5
|
globel issue#858, 中国高校--输入无效条件点击搜索,建议给出提示信息
|
2014-07-10 16:21:55 +08:00 |
yanxd
|
e573438e43
|
eager_load
|
2014-07-10 15:39:40 +08:00 |
yanxd
|
249ea19c0c
|
神坑,users和user_statuses表中,关注信息不同步,按照影响力排序还会有问题。以及users表中在us表没有对应条目,排序中是不会显示的
|
2014-07-10 15:27:24 +08:00 |
yanxd
|
91eb7751da
|
issue global 859. 搜索处理空格
|
2014-07-10 09:02:28 +08:00 |
z9hang
|
4d75fbfcb8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-09 16:02:36 +08:00 |
z9hang
|
9634046d11
|
权限管理机制优化
|
2014-07-09 16:02:15 +08:00 |
yanxd
|
0998438e67
|
bootstrap fine tuning.
|
2014-07-09 15:20:00 +08:00 |
yanxd
|
4259f63fbf
|
预览在issue和new里报错
|
2014-07-09 14:53:29 +08:00 |
z9hang
|
fd71435b30
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-09 14:40:11 +08:00 |
yanxd
|
38b3e86e62
|
ip=nil
|
2014-07-09 14:38:52 +08:00 |
z9hang
|
b87abf1f68
|
权限管理优化
|
2014-07-08 18:02:10 +08:00 |
z9hang
|
4c6fb2a266
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-08 14:29:34 +08:00 |
xianbo
|
25ee1d8672
|
for adjust test domain and give a setting reposwq
|
2014-07-08 10:59:20 +08:00 |
z9hang
|
0fa552c8d3
|
软件众包中点击我要参与报无权限问题
|
2014-07-08 09:34:41 +08:00 |
z9hang
|
b4bf320c2e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-08 09:12:28 +08:00 |
z9hang
|
5e3a763776
|
添加引用项目权限、修改引用判断
|
2014-07-08 09:12:16 +08:00 |
yanxd
|
ab03962e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-07 16:53:00 +08:00 |
yanxd
|
aca63146e9
|
搜索文件归属,课程相关逻辑修改,查询把过滤去掉了。暂时没想有什么过滤的好办法
|
2014-07-07 16:52:39 +08:00 |
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-07 16:27:49 +08:00 |
nwb
|
b4ee106ce9
|
竞赛搜索项为空时给出提示
|
2014-07-07 14:31:21 +08:00 |
z9hang
|
f5b69be967
|
新建贴吧描述为空不能新建、搜索空内容添加提示
|
2014-07-05 14:43:15 +08:00 |
z9hang
|
5c93442c79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:44:21 +08:00 |
z9hang
|
01da0852e3
|
新建贴吧错误提示修改
|
2014-07-05 11:44:05 +08:00 |
sw
|
6365d01051
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:21:27 +08:00 |
sw
|
f1b8b7caed
|
t
|
2014-07-05 11:20:59 +08:00 |
z9hang
|
470f40db82
|
去除绝对网址
|
2014-07-05 11:00:01 +08:00 |
nwb
|
efbffa7436
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-05 09:34:34 +08:00 |
z9hang
|
c709545809
|
提交后点击版本库才刷新项目积分问题(尚需测试)
|
2014-07-04 16:55:59 +08:00 |
yanxd
|
8ccc39ae71
|
首页更多报错
|
2014-07-04 14:43:57 +08:00 |
nwb
|
b6ebbab830
|
项目版本库名称限定优化
|
2014-07-04 14:19:34 +08:00 |
nwb
|
164d4f9e78
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-04 13:39:34 +08:00 |
yanxd
|
36c90f1dfd
|
取不到学校,再拿id直接空指针
|
2014-07-04 11:30:41 +08:00 |
nwb
|
3a7065bb2d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-04 11:12:27 +08:00 |
z9hang
|
d525220aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 10:10:41 +08:00 |
z9hang
|
2dd249a105
|
修正发帖不填主题报错问题,修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个
|
2014-07-04 10:10:20 +08:00 |
nwb
|
dc0180988f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 09:10:36 +08:00 |
nwb
|
d001b4416a
|
1.优化课程首页
2.优化课程首页搜索逻辑
|
2014-07-04 09:10:17 +08:00 |
sw
|
2bdb0e20e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/course.html.erb
|
2014-07-03 18:14:44 +08:00 |
sw
|
3e185c3a4b
|
修改学校链接
|
2014-07-03 18:11:10 +08:00 |
nwb
|
1a666900c0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 17:30:45 +08:00 |
nwb
|
98ba57b819
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 17:28:20 +08:00 |
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
2014-07-03 17:28:13 +08:00 |
yanxd
|
271af6ead5
|
Merge branch 'szzh' into develop
|
2014-07-03 17:23:29 +08:00 |
yanxd
|
0e2b7ba362
|
tag search fix
|
2014-07-03 17:22:48 +08:00 |
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-03 15:41:15 +08:00 |
nwb
|
ae8093c400
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 15:26:26 +08:00 |
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
2014-07-03 15:24:06 +08:00 |
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 10:09:25 +08:00 |
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
2014-07-03 09:07:09 +08:00 |
z9hang
|
050a780b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 17:07:10 +08:00 |
z9hang
|
6f5d6c382b
|
给用户留言的回复若为查看计入新留言数
|
2014-07-02 17:06:34 +08:00 |
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
2014-07-02 14:58:52 +08:00 |
nwb
|
fb0597ab4a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 09:11:56 +08:00 |
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
2014-07-02 09:11:45 +08:00 |
yanxd
|
e1d9d6ab45
|
tag查询崩溃
|
2014-07-01 18:20:30 +08:00 |
z9hang
|
a7fa444f9e
|
修正项目个人得分问题:统计时只计算项目成员,user_grade表user_id和project_id联合不重复验证,user_grade分数部位负验证
|
2014-07-01 15:19:08 +08:00 |
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
2014-07-01 11:53:55 +08:00 |
sw
|
bb86ef4612
|
修复获取作业列表时课程老师参数获取不正确的问题
|
2014-07-01 09:23:49 +08:00 |
sw
|
bc434a82a4
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
2014-07-01 09:23:16 +08:00 |