yanxd
|
472b61fefe
|
删除了不能通过的测试,修改user_activities。所有原路由测试可以通过。
|
2014-07-21 15:49:23 +08:00 |
nwb
|
aea41ba997
|
修改竞赛首页搜索功能
|
2014-07-21 15:45:00 +08:00 |
sw
|
890bc7459d
|
修改项目列表页面当管理人员过多时,显示更多。点击更多按钮,跳转到该项目的成员列表页面
|
2014-07-21 15:31:15 +08:00 |
nwb
|
5adac1a32a
|
课程讨论区回复内容为空时提示
|
2014-07-21 15:15:10 +08:00 |
nwb
|
d8d8473811
|
优化课程列表成员数计算
|
2014-07-21 13:52:23 +08:00 |
nwb
|
3a249e7196
|
修正课程通知编辑BUG
|
2014-07-21 13:40:38 +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 |
z9hang
|
162a4cfa84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 16:53:02 +08:00 |
z9hang
|
0322258386
|
去掉一个参加竞赛中多出来的项目创建
|
2014-07-19 16:52:43 +08:00 |
z9hang
|
376ba1d793
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
2014-07-19 16:48:14 +08:00 |
sw
|
8db6b50a65
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/courses_helper.rb
|
2014-07-19 16:47:05 +08:00 |
sw
|
e24323147d
|
修复项目描述过长不会自动换行的BUG
|
2014-07-19 16:45:27 +08:00 |
z9hang
|
5c0e3e96cc
|
修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件
|
2014-07-19 16:41:29 +08:00 |
sw
|
ba66cde840
|
1.优化作业显示界面加载效率
2.修复获取作业的互评得分、综评得分、教师评分不准确的问题
|
2014-07-19 16:38:29 +08:00 |
nwb
|
bda9921fb0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 15:58:37 +08:00 |
nwb
|
49aa3a994e
|
学时不允许为空
|
2014-07-19 15:58:11 +08:00 |
sw
|
6186ff343e
|
去除无效的标签
|
2014-07-19 14:31:25 +08:00 |
sw
|
fdfba199f3
|
修复评奖位置不正确的问题
|
2014-07-19 13:22:23 +08:00 |
sw
|
93d8fd31a0
|
增加作品分类下拉框
|
2014-07-19 13:16:29 +08:00 |
sw
|
64f025fe70
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/show_attendingcontest.html.erb
|
2014-07-19 13:16:11 +08:00 |
sw
|
71ffdb9164
|
作品分类在下拉列表框中选择
|
2014-07-19 13:13:46 +08:00 |
nwb
|
206aeeccfb
|
优化2级菜单效果
|
2014-07-19 11:39:09 +08:00 |
sw
|
79c76d26c8
|
创建作品分类表,并插入部分数据
|
2014-07-19 11:35:43 +08:00 |
nwb
|
60fa473608
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 10:59:30 +08:00 |
nwb
|
6bced5106e
|
调整课程列表视图
|
2014-07-19 10:55:46 +08:00 |
sw
|
9fe4c9f8a2
|
修改竞赛作品列表显示样式与创建作品样式
|
2014-07-19 10:44:23 +08:00 |
z9hang
|
599a277af3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 10:36:24 +08:00 |
z9hang
|
74ff5d505d
|
修改加入竞赛创建项目链接域名不正确问题
|
2014-07-19 10:36:11 +08:00 |
nwb
|
e1edb46ba2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/course.rb
|
2014-07-19 09:42:46 +08:00 |
nwb
|
908254b911
|
项目、竞赛首页描述优化,鼠标悬停显示内容优化
|
2014-07-19 09:39:48 +08:00 |
yanxd
|
6af11fea68
|
course class period
|
2014-07-18 17:10:41 +08:00 |
z9hang
|
40d8ec6c6e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 16:58:25 +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 |
sw
|
6a42ce143b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 16:53:35 +08:00 |
z9hang
|
b44b488807
|
导航栏调整
|
2014-07-18 16:51:41 +08:00 |
nwb
|
0e0da39113
|
修改BUG
|
2014-07-18 16:44:40 +08:00 |
sw
|
9f02003bb9
|
用户课程列表增加自动换行
|
2014-07-18 16:42:18 +08:00 |
nwb
|
0e9a15aad5
|
短描述修改
|
2014-07-18 16:41:55 +08:00 |
sw
|
41983833d7
|
用户项目列表增加自动换行
|
2014-07-18 16:40:57 +08:00 |
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
2014-07-18 16:39:39 +08:00 |
sw
|
e0f5708038
|
修改错误
|
2014-07-18 16:21:20 +08:00 |
sw
|
999a252f7b
|
修改软件创客搜索结果显示样式
|
2014-07-18 15:47:48 +08:00 |
nwb
|
5087f90a26
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 15:33:56 +08:00 |
nwb
|
3b9245d143
|
隐藏新建竞赛作品时的作品类型
|
2014-07-18 15:33:47 +08:00 |
sw
|
0f3c2ff558
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 15:00:21 +08:00 |
nwb
|
bc50d5f469
|
允许上传空文件
|
2014-07-18 14:35:44 +08:00 |
sw
|
46c7a4bb9f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 14:15:52 +08:00 |
sw
|
4a04d47c3c
|
commit
|
2014-07-18 14:15:30 +08:00 |
nwb
|
29618d6a72
|
竞赛界面调整
|
2014-07-18 13:48:45 +08:00 |
nwb
|
c443de5873
|
去掉课程名称验证
|
2014-07-18 11:49:47 +08:00 |
nwb
|
5272a90227
|
修改人数显示
|
2014-07-18 11:35:05 +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 |
sw
|
5838b3e47d
|
不选择新闻时,取消"添加新闻"按钮的显示。不选择问题跟踪时,取消“新建问题”和“自定义查询”按钮的显示,不选择讨论区时,取消“发布新帖”按钮的显示
|
2014-07-18 10:54:22 +08:00 |
z9hang
|
057447f810
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 10:49:38 +08:00 |
nwb
|
a4d06fbb12
|
课程成员设置为只能使用单一权限
|
2014-07-18 10:29:49 +08:00 |
sw
|
6f858795ef
|
项目模块配置未选中wiki时,取消左侧项目工具集的WIKI显示
|
2014-07-18 10:24:49 +08:00 |
sw
|
bcaaa02bed
|
取消已完成课程在软件创客列表的显示
|
2014-07-18 10:01:54 +08:00 |
nwb
|
6968039c87
|
修改课程学生计算函数
|
2014-07-18 09:55:10 +08:00 |
z9hang
|
036f8a3870
|
user.trustie.net域名下的用户列表课程项目链接跳转域名不正确
|
2014-07-18 09:46:11 +08:00 |
nwb
|
28543e3288
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 09:21:21 +08:00 |
nwb
|
8eac756ac7
|
1.项目首页的描述更改,不再限制项目描述字数
2.竞赛首页的描述更改,不再限制竞赛描述字数
|
2014-07-18 09:21:09 +08:00 |
yanxd
|
164ec645ee
|
boards created frequently, css file file EOF.
|
2014-07-18 09:20:16 +08:00 |
z9hang
|
5b7fc4048a
|
user.trustie.net域名下课程主页导航栏多个课程实践菜单
页面跳转时域名不正确问题重新修正
|
2014-07-18 09:11:02 +08:00 |
z9hang
|
0f4933240b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-17 18:10:42 +08:00 |
z9hang
|
7c3a81735c
|
user。trustie.net域名下跳转到项目页面时主域名没变bug(尚需测试)
user.trustie.net域名下主导航栏多一个项目托管菜单问题
|
2014-07-17 18:10:32 +08:00 |
nwb
|
ed00adb3ba
|
优化下载权限判断
|
2014-07-17 17:06:54 +08:00 |
nwb
|
3b1b057f0a
|
课程描述自动换行
|
2014-07-17 16:56:45 +08:00 |
nwb
|
634ef8df5f
|
界面修改
|
2014-07-17 16:11:32 +08:00 |
nwb
|
f4d6696d2e
|
优化资源搜索界面
|
2014-07-17 16:06:10 +08:00 |
nwb
|
02b4029e8c
|
资源文件下载界面调整
|
2014-07-17 15:05:49 +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
|
63e855725f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-17 09:10:38 +08:00 |
nwb
|
a58a747cfa
|
屏蔽用户界面的关注需求功能
|
2014-07-17 09:10:29 +08:00 |
yanxd
|
4eee70a845
|
course new/created test
|
2014-07-16 17:46:17 +08:00 |
nwb
|
b34a8d6166
|
项目搜索优化
|
2014-07-16 17:25:47 +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
|
8d181c4e93
|
迁移文件出错问题
|
2014-07-16 15:32:27 +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 |
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 |
nwb
|
3254c4a237
|
修正二级菜单名称显示问题
|
2014-07-16 09:45:39 +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
|
bff1319c5e
|
去除课程数据兼容代码
|
2014-07-15 09:53:03 +08:00 |
sw
|
61ba2c47ee
|
1.修改历史数据中作业为项目时作业显示列表未改变的问题
2.修改作业列表关联项目过长,增加省略号显示和鼠标移动到相应位置的气泡显示
|
2014-07-15 09:43:13 +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 |
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 |
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
|
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
|
6d698cb5d8
|
下载添加权限判断
|
2014-07-11 11:36:00 +08:00 |
sw
|
4f2298fd22
|
修复个人动态首页中留言等动态显示有误的问题
|
2014-07-11 10:31:52 +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 |
sw
|
bed662c2e5
|
修复项目缺陷列表描述显示不正常的BUG
|
2014-07-10 17:42:40 +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 |
sw
|
51ef3fa5a1
|
修复主页课程介绍显示有误的BUG
|
2014-07-10 16:58:57 +08:00 |
sw
|
7bcb1cbe2e
|
修复个人主页中作业、项目介绍不正确的BUG
|
2014-07-10 16:57:04 +08:00 |
sw
|
47ad20421e
|
修复当课程描述中有特殊标签是,课程列表描述显示有误的BUG
|
2014-07-10 16:48:13 +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 |
sw
|
a5518363c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-10 11:31:44 +08:00 |
sw
|
65c137e617
|
修复进入课程作业报错的问题
|
2014-07-10 11:27:06 +08:00 |
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
2014-07-10 10:15:20 +08:00 |
yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
2014-07-10 10:05:45 +08:00 |
sw
|
76db0e61c3
|
调整页面样式
|
2014-07-10 09:21:24 +08:00 |
yanxd
|
91eb7751da
|
issue global 859. 搜索处理空格
|
2014-07-10 09:02:28 +08:00 |
Administrator
|
6082eca117
|
test
|
2014-07-10 08:56:52 +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 |
yanxd
|
449b87e38d
|
remove cnzz
|
2014-07-08 15:38:37 +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
|
4dbe149b42
|
删掉user里的扩展表信息,防止第一次迁移失败
|
2014-07-07 17:24:51 +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
|
8b2199e28c
|
新建竞赛时的日期判断优化
|
2014-07-07 15:01:10 +08:00 |
nwb
|
431b4541c3
|
新建竞赛时奖励设置为不能为空
|
2014-07-07 14:37:32 +08:00 |
nwb
|
b4ee106ce9
|
竞赛搜索项为空时给出提示
|
2014-07-07 14:31:21 +08:00 |
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
2014-07-07 13:41:44 +08:00 |
nwb
|
633c4278d8
|
修改课程列表视图
|
2014-07-07 10:12:07 +08:00 |
nwb
|
0471446ac8
|
新增、修改缺陷发送邮件的缺陷编写优化
|
2014-07-07 10:07:50 +08:00 |
nwb
|
beeb707347
|
用户未登陆时首页不提示“该学校未开设任何课程”
|
2014-07-07 09:37:45 +08:00 |
nwb
|
5f18b1a38c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 15:11:57 +08:00 |
z9hang
|
f5b69be967
|
新建贴吧描述为空不能新建、搜索空内容添加提示
|
2014-07-05 14:43:15 +08:00 |
nwb
|
fb8e97ff61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/show.html.erb
|
2014-07-05 13:51:41 +08:00 |
nwb
|
eb15edd5ff
|
1.添加文档
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
|
2014-07-05 13:31:32 +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 |
z9hang
|
011d161f8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 09:49:57 +08:00 |
yanxd
|
db28ecd883
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 09:40:11 +08:00 |
yanxd
|
2fa9a4855c
|
最后创建人信息的正确显示(+去掉了乱78糟的table套table)
div-class内标明activity-title等,内嵌css属性等没有问题再移动出html文件
|
2014-07-05 09:39:58 +08:00 |
nwb
|
c927bb6fd6
|
首页课程列表修改
|
2014-07-05 09:33:52 +08:00 |
z9hang
|
8c65e1ac03
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 16:56:26 +08:00 |
z9hang
|
c709545809
|
提交后点击版本库才刷新项目积分问题(尚需测试)
|
2014-07-04 16:55:59 +08:00 |
sw
|
8b389776a1
|
打开缺陷列表改为从新建窗口打开
|
2014-07-04 16:14:11 +08:00 |
sw
|
65c25feabb
|
修复项目的缺陷模块改版之后,新增缺陷界面找不到的问题
|
2014-07-04 16:00:18 +08:00 |
nwb
|
fd25f42e61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 15:41:38 +08:00 |
nwb
|
2395ee4b1d
|
留言发送邮件优化
|
2014-07-04 15:41:26 +08:00 |
sw
|
eac725a0f4
|
修改作业、用户、课程界面中相关学校的链接
|
2014-07-04 15:21:56 +08:00 |
sw
|
698870ddee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 14:48:06 +08:00 |
sw
|
71b17cd98e
|
1
|
2014-07-04 14:47:38 +08:00 |
yanxd
|
8ccc39ae71
|
首页更多报错
|
2014-07-04 14:43:57 +08:00 |
nwb
|
b6ebbab830
|
项目版本库名称限定优化
|
2014-07-04 14:19:34 +08:00 |
sw
|
62bcccedea
|
新建作业时给必填项添加*号
|
2014-07-04 14:04:31 +08:00 |
sw
|
bc9f1e5a01
|
1.修改软件创客中每个用户内容显示不一致的BUG
2.去掉用户项目列表最后一个项目后的逗号
|
2014-07-04 13:59:08 +08:00 |
nwb
|
b42605accd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 13:38:50 +08:00 |
nwb
|
864ef17941
|
清理课程状态表,修正同一课程出现多次的BUG
|
2014-07-04 13:38:34 +08:00 |