 yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
12 years ago |
 nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
12 years ago |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
12 years ago |
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
12 years ago |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
12 years ago |
|
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
12 years ago |
 kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
12 years ago |
 fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
12 years ago |
 wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
12 years ago |
|
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
|
12 years ago |
|
fanqiang
|
dbef2f958a
|
osp_id validate
|
12 years ago |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
12 years ago |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
12 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性，将integer改为string
|
12 years ago |
|
yanxd
|
653fe6c1ea
|
所有发邮件都新开线程
|
12 years ago |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
12 years ago |
|
wanglinchun
|
3608cecca5
|
增加应用软件包的后缀格式
|
12 years ago |
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
12 years ago |
|
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
12 years ago |
|
yanxd
|
0791c35df1
|
赞踩关联关系
|
12 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
12 years ago |
|
yanxd
|
daf7e8d200
|
user added rater
|
12 years ago |
|
yanxd
|
e802424e2a
|
merge jrating
|
12 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
12 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
12 years ago |
|
baiyu
|
36cd91401f
|
user score
|
12 years ago |
|
fanqiang
|
a611ed4848
|
修改了按标签搜索，并改了一些样式
|
12 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
12 years ago |
|
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
|
12 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
12 years ago |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
12 years ago |
|
wanglinchun
|
589a21204c
|
应用下载功能实现
|
12 years ago |
|
yanxd
|
4f5eff09c8
|
发帖内容验证不通过不会丢失信息了，加上了所有验证
|
12 years ago |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
12 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
12 years ago |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
12 years ago |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
12 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
12 years ago |
|
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
12 years ago |
|
yanxd
|
7a31b3f4ea
|
去掉项目描述长度验证
|
12 years ago |
|
yanxd
|
383d62a353
|
修改错误处理文字显示
|
12 years ago |
|
nieguanghui
|
bad170fdb2
|
应用上传附件功能
|
12 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
12 years ago |
|
fanqiang
|
6fdb037b6b
|
开源项目基本框架完成
|
12 years ago |
|
fanqiang
|
d381423c0e
|
添加了版主功能
|
12 years ago |
|
fanqiang
|
89b668be82
|
添加申请版主功能，目前已经可以写入数据库
|
12 years ago |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
12 years ago |
xianbo
|
b1fc33a697
|
add by nyan
|
12 years ago |
|
wanglinchun
|
2a278e0a2d
|
all
|
12 years ago |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
fanqiang
|
e8de48dd24
|
修改osp的show界面，建立框架
|
12 years ago |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
233901577f
|
fix
|
12 years ago |
|
fanqiang
|
cfa5532598
|
建立了open source project部分的框架，并且建立了相应的帖子
|
12 years ago |
|
xianbo
|
06b2c25f3d
|
fix
|
12 years ago |
|
fanqiang
|
d935152ed7
|
initial crawl
|
12 years ago |
|
yanxd
|
c38a8e4f6a
|
socialForge#324
|
12 years ago |
|
yanxd
|
378e8cbefd
|
socailForge#329
|
12 years ago |
|
yanxd
|
a8d1608603
|
nil
|
12 years ago |
|
yanxd
|
ce4f49b635
|
counter cache for issue
|
12 years ago |
|
yanxd
|
6ba25556b7
|
issues id new world
|
12 years ago |
|
yanxd
|
163cdc8cf7
|
issues to_param
|
12 years ago |
|
yanxd
|
2e3b44c830
|
id-name(position|count)
|
12 years ago |
|
yanxd
|
3b13183dbb
|
resort
|
12 years ago |
|
yanxd
|
404568be89
|
留言url显示，以及留言分页的url处理
|
12 years ago |
|
Wen
|
30eb2d79f2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
52fe99d71c
|
fixed 谭 domain bug in development environment.
|
12 years ago |
|
Wen
|
337885503e
|
school表done
建立了school和course的一对多关联
|
12 years ago |
|
yanxd
|
6877ff7e8d
|
解决设置跳转404.bug
|
12 years ago |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
12 years ago |
|
yanxd
|
af3b32fa89
|
帖子内容可以为空
|
12 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
12 years ago |
|
yanxd
|
ce1e6c49f1
|
改留言
|
12 years ago |
|
yanxd
|
e9373991d2
|
maoxian
|
12 years ago |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
12 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
12 years ago |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
12 years ago |
|
yanxd
|
fd426936bb
|
修复时间格式错误引发的列表错误
|
12 years ago |
|
yanxd
|
0ed2e19268
|
项目列表
|
12 years ago |
|
Wen
|
d22e1056fb
|
xxxxx
|
12 years ago |
|
yanxd
|
b269502de2
|
怕看不懂，定义几个常量
|
12 years ago |
|
yanxd
|
099fffab51
|
Merge branch 'bigchange' into develop
|
12 years ago |
|
baiyu
|
13fdbde1cf
|
个人分数
|
12 years ago |
|
yanxd
|
95e77464ad
|
downloads desc
|
12 years ago |
|
yanxd
|
fd25c5ed30
|
...
|
12 years ago |
|
yanxd
|
f91d94fd4c
|
fetch stores/index instance_object
|
12 years ago |
|
baiyu
|
db1874fa07
|
评分
|
12 years ago |
|
yanxd
|
eafbb20807
|
匿名用户禁止回复
|
12 years ago |
|
yanxd
|
90a37a5f4e
|
竞赛众包的留言修改
|
12 years ago |
|
yanxd
|
8618ad3ede
|
add access methods for delete
|
12 years ago |
|
yanxd
|
1d962b98d3
|
model project leave message
|
12 years ago |
|
yanxd
|
8cb3756bbc
|
首页帖子数量
|
12 years ago |
|
yanxd
|
1b389586ad
|
留言回复人错误
|
12 years ago |
|
yanxd
|
997c546083
|
remove html char
|
12 years ago |
|
yanxd
|
8bc5b2ebf5
|
改了论坛回复不会触发修改update字段的问题
|
12 years ago |
