nwb
|
6dcc50e60b
|
添加gitlab创建项目(版本库)接口
|
2014-07-16 15:52:41 +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 |
yanxd
|
386aa1adc3
|
.
|
2014-07-16 14:35:54 +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 |
nwb
|
62af03debd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 10:36:32 +08:00 |
nwb
|
ca7ad03a05
|
1.优化课程动态信息
2.优化项目动态信息
|
2014-07-16 10:36:22 +08:00 |
sw
|
4825c5287e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 10:15:43 +08:00 |
z9hang
|
fbc4cd1cf1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile.lock
|
2014-07-16 09:54:03 +08:00 |
nwb
|
3254c4a237
|
修正二级菜单名称显示问题
|
2014-07-16 09:45:39 +08:00 |
z9hang
|
3cda9294fd
|
注释未能安装的gem
|
2014-07-16 09:40:18 +08:00 |
nwb
|
13a3725b06
|
BUG修改
|
2014-07-16 09:28:12 +08:00 |
sw
|
f8d3d60b27
|
tttttttt
|
2014-07-16 08:53:14 +08:00 |
sw
|
62e24eda1c
|
ttt
|
2014-07-15 17:53:07 +08:00 |
sw
|
e303009917
|
格式化代码
|
2014-07-15 17:49:28 +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 |
yanxd
|
37d0560b70
|
test test
|
2014-07-15 10:27:24 +08:00 |
sw
|
bff1319c5e
|
去除课程数据兼容代码
|
2014-07-15 09:53:03 +08:00 |
sw
|
61ba2c47ee
|
1.修改历史数据中作业为项目时作业显示列表未改变的问题
2.修改作业列表关联项目过长,增加省略号显示和鼠标移动到相应位置的气泡显示
|
2014-07-15 09:43:13 +08:00 |
nwb
|
ba3d1755d4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-14 16:51:34 +08:00 |
nwb
|
e6b80de3b5
|
rmagick调整为仅test需要安装
|
2014-07-14 16:51:18 +08:00 |
yanxd
|
ec2384f110
|
自动化测试框架
|
2014-07-14 16:36:56 +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 |
yanxd
|
14f1ad63d2
|
自动化测试环境
|
2014-07-14 16:11:38 +08:00 |
sw
|
90e28518f2
|
增加学校列表查询时,如查询条件为空,增加提示
|
2014-07-14 15:45:38 +08:00 |
nwb
|
1da147684a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-14 15:15:56 +08:00 |
nwb
|
2a1a051362
|
课程资源文件密级BUG修正
|
2014-07-14 15:15:28 +08:00 |
sw
|
ef95835bc6
|
修复当前用户为超级管理员时,创建项目后,在个人信息的参与项目栏内无该项目的记录
|
2014-07-14 14:49:05 +08:00 |
sw
|
31245f6fb2
|
修复软件创客列表中某些用户的用户名显示不为超链接(未激活账户)
|
2014-07-14 13:55:22 +08:00 |
sw
|
b704a44dfb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-14 13:54:14 +08:00 |
sw
|
7a9b5156c9
|
修复软件创客列表当用户姓名比较长时,用户姓名会被个人得分覆盖掉的BUG
|
2014-07-14 11:46:52 +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 |
z9hang
|
3aab1b172c
|
修正执行数据迁移时的‘page_type=’ undefine错误
|
2014-07-14 11:28:29 +08:00 |
nwb
|
87b623bc51
|
1.文档添加密级设置
2.新建文档、修改文档视图修改
|
2014-07-14 10:44:07 +08:00 |
yanxd
|
fd5747f4dc
|
test 3-framework
|
2014-07-14 10:27:54 +08:00 |
z9hang
|
98ddd6940d
|
修正错误
|
2014-07-14 09:31:55 +08:00 |
z9hang
|
f44c715cfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-14 09:18:46 +08:00 |
z9hang
|
6b6fd2906f
|
竞赛列表。贴吧列表的非空判断
数据迁移报错问题修改
|
2014-07-14 09:18:31 +08:00 |
sw
|
59a5541e45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-11 14:52:15 +08:00 |
sw
|
9da70f9a20
|
调整项目列表样式
|
2014-07-11 14:51:33 +08:00 |
sw
|
9472a7eb5c
|
未登录时取消显示我的学校按钮
|
2014-07-11 13:41:05 +08:00 |
z9hang
|
e1c7aaa220
|
冲突编辑
|
2014-07-11 11:53:31 +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 |