nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
2014-05-15 16:59:15 +08:00 |
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
2014-05-15 14:32:23 +08:00 |
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-15 11:26:45 +08:00 |
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
2014-05-15 10:50:46 +08:00 |
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
nwb
|
6f0e621f3c
|
添加项目成员界面,显示用户的account
|
2014-05-14 16:06:29 +08:00 |
nwb
|
9c24102e65
|
清理部分不需要的文件
|
2014-05-14 08:50:28 +08:00 |
nwb
|
b237f578f4
|
提交缺陷发送邮件,问题编号修改
|
2014-05-13 17:57:06 +08:00 |
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
2014-05-13 15:49:14 +08:00 |
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-12 18:46:53 +08:00 |
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
2014-05-12 18:46:39 +08:00 |
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
2014-05-12 16:01:13 +08:00 |
yanxd
|
19e851d65a
|
路由注册验证ajax,课程边栏的单位
|
2014-05-12 08:10:08 +08:00 |
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-10 14:27:48 +08:00 |
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
2014-05-09 17:13:23 +08:00 |
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能,添加新参数
3.修改文件上传界面
|
2014-05-09 15:45:21 +08:00 |
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
2014-05-08 18:15:58 +08:00 |
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
2014-05-08 18:03:48 +08:00 |
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-08 18:00:58 +08:00 |
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
2014-05-08 15:27:16 +08:00 |
kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-08 14:26:27 +08:00 |
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
2014-05-08 14:18:42 +08:00 |
fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
2014-05-05 15:33:24 +08:00 |
wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
2014-05-05 10:05:10 +08:00 |
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
2014-05-05 09:11:59 +08:00 |
fanqiang
|
dbef2f958a
|
osp_id validate
|
2014-05-05 08:10:22 +08:00 |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
2014-04-28 20:37:12 +08:00 |
fanqiang
|
87c70909be
|
可以在开源社区添加帖子,并且添加了帖子的URL,即帖子来源
|
2014-04-28 09:13:57 +08:00 |
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-04-25 11:22:33 +08:00 |
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
2014-04-25 10:26:50 +08:00 |
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性,将integer改为string
|
2014-04-24 19:45:10 +08:00 |
yanxd
|
653fe6c1ea
|
所有发邮件都新开线程
|
2014-04-24 18:25:57 +08:00 |
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
2014-04-23 17:18:53 +08:00 |
wanglinchun
|
3608cecca5
|
增加应用软件包的后缀格式
|
2014-04-23 16:30:23 +08:00 |
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
2014-04-22 14:53:25 +08:00 |
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
2014-04-22 10:59:50 +08:00 |
yanxd
|
0791c35df1
|
赞踩关联关系
|
2014-04-22 08:56:49 +08:00 |
fanqiang
|
28b10ed3fd
|
修改了搜索功能,并能对搜索进行过滤
|
2014-04-22 08:21:35 +08:00 |
yanxd
|
daf7e8d200
|
user added rater
|
2014-04-21 16:03:55 +08:00 |
yanxd
|
e802424e2a
|
merge jrating
|
2014-04-21 15:43:00 +08:00 |
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
baiyu
|
f0b497e455
|
user score merge
|
2014-04-21 11:15:41 +08:00 |
baiyu
|
36cd91401f
|
user score
|
2014-04-21 11:13:45 +08:00 |
fanqiang
|
a611ed4848
|
修改了按标签搜索,并改了一些样式
|
2014-04-19 11:03:54 +08:00 |
wanglinchun
|
76ccfe8ac4
|
fix
|
2014-04-18 16:35:48 +08:00 |
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
2014-04-18 16:03:52 +08:00 |
wanglinchun
|
8f6d9fc6a5
|
0418
|
2014-04-18 10:46:29 +08:00 |
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
2014-04-17 17:36:41 +08:00 |
wanglinchun
|
589a21204c
|
应用下载功能实现
|
2014-04-14 15:54:10 +08:00 |
yanxd
|
4f5eff09c8
|
发帖内容验证不通过不会丢失信息了,加上了所有验证
|
2014-04-14 10:15:18 +08:00 |