 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 |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
2014-04-14 09:50:36 +08:00 |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
2014-04-11 17:16:22 +08:00 |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
2014-04-11 16:40:09 +08:00 |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
2014-04-11 10:53:51 +08:00 |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
2014-04-11 09:00:00 +08:00 |
|
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
2014-04-10 08:33:30 +08:00 |
|
yanxd
|
7a31b3f4ea
|
去掉项目描述长度验证
|
2014-04-09 16:31:27 +08:00 |
|
yanxd
|
383d62a353
|
修改错误处理文字显示
|
2014-04-09 11:15:34 +08:00 |
|
nieguanghui
|
bad170fdb2
|
应用上传附件功能
|
2014-04-09 09:25:24 +08:00 |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
2014-04-08 14:53:11 +08:00 |
|
fanqiang
|
6fdb037b6b
|
开源项目基本框架完成
|
2014-04-08 09:02:12 +08:00 |
|
fanqiang
|
d381423c0e
|
添加了版主功能
|
2014-04-06 22:12:16 +08:00 |
|
fanqiang
|
89b668be82
|
添加申请版主功能，目前已经可以写入数据库
|
2014-04-06 16:34:23 +08:00 |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
2014-04-04 17:54:20 +08:00 |
xianbo
|
b1fc33a697
|
add by nyan
|
2014-04-04 16:59:50 +08:00 |
|
wanglinchun
|
2a278e0a2d
|
all
|
2014-04-03 22:38:18 +08:00 |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
2014-04-03 20:47:09 +08:00 |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
|
fanqiang
|
e8de48dd24
|
修改osp的show界面，建立框架
|
2014-04-03 14:41:04 +08:00 |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-02 14:44:10 +08:00 |
|
xianbo
|
233901577f
|
fix
|
2014-04-01 19:55:35 +08:00 |
|
fanqiang
|
cfa5532598
|
建立了open source project部分的框架，并且建立了相应的帖子
|
2014-04-01 08:51:43 +08:00 |
|
xianbo
|
06b2c25f3d
|
fix
|
2014-03-31 19:26:07 +08:00 |
|
fanqiang
|
d935152ed7
|
initial crawl
|
2014-03-29 10:57:36 +08:00 |
|
yanxd
|
c38a8e4f6a
|
socialForge#324
|
2014-03-28 18:12:48 +08:00 |
|
yanxd
|
378e8cbefd
|
socailForge#329
|
2014-03-28 18:12:44 +08:00 |
|
yanxd
|
a8d1608603
|
nil
|
2014-03-25 14:40:47 +08:00 |
|
yanxd
|
ce4f49b635
|
counter cache for issue
|
2014-03-25 09:27:43 +08:00 |
|
yanxd
|
6ba25556b7
|
issues id new world
|
2014-03-25 09:10:28 +08:00 |
|
yanxd
|
163cdc8cf7
|
issues to_param
|
2014-03-24 16:46:24 +08:00 |
|
yanxd
|
2e3b44c830
|
id-name(position|count)
|
2014-03-24 11:11:13 +08:00 |
|
yanxd
|
3b13183dbb
|
resort
|
2014-03-24 08:31:59 +08:00 |
|
yanxd
|
404568be89
|
留言url显示，以及留言分页的url处理
|
2014-03-22 09:27:29 +08:00 |
|
Wen
|
30eb2d79f2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-21 13:55:12 +08:00 |
|
yanxd
|
52fe99d71c
|
fixed 谭 domain bug in development environment.
|
2014-03-21 09:28:59 +08:00 |
|
Wen
|
337885503e
|
school表done
建立了school和course的一对多关联
|
2014-03-20 16:19:16 +08:00 |
|
yanxd
|
6877ff7e8d
|
解决设置跳转404.bug
|
2014-03-20 14:17:48 +08:00 |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
2014-03-19 17:32:32 +08:00 |
|
yanxd
|
af3b32fa89
|
帖子内容可以为空
|
2014-03-14 21:25:59 +08:00 |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
2014-03-13 22:06:49 +08:00 |
|
yanxd
|
ce1e6c49f1
|
改留言
|
2014-03-07 16:49:45 +08:00 |
|
yanxd
|
e9373991d2
|
maoxian
|
2014-03-05 11:17:16 +08:00 |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
2014-03-01 10:14:01 +08:00 |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
2014-02-24 10:40:45 +08:00 |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
2014-02-22 09:47:59 +08:00 |
|
yanxd
|
fd426936bb
|
修复时间格式错误引发的列表错误
|
2014-02-15 16:34:09 +08:00 |
|
yanxd
|
0ed2e19268
|
项目列表
|
2014-01-24 10:55:25 +08:00 |
|
Wen
|
d22e1056fb
|
xxxxx
|
2014-01-22 21:05:57 +08:00 |
|
yanxd
|
b269502de2
|
怕看不懂，定义几个常量
|
2014-01-20 20:56:37 +08:00 |
|
yanxd
|
099fffab51
|
Merge branch 'bigchange' into develop
|
2014-01-17 08:23:15 +08:00 |
|
baiyu
|
13fdbde1cf
|
个人分数
|
2014-01-16 10:34:39 +08:00 |
|
yanxd
|
95e77464ad
|
downloads desc
|
2014-01-13 21:02:45 +08:00 |
|
yanxd
|
fd25c5ed30
|
...
|
2014-01-13 20:26:40 +08:00 |
|
yanxd
|
f91d94fd4c
|
fetch stores/index instance_object
|
2014-01-13 16:24:13 +08:00 |
|
baiyu
|
db1874fa07
|
评分
|
2014-01-09 10:58:05 +08:00 |
|
yanxd
|
eafbb20807
|
匿名用户禁止回复
|
2014-01-06 21:11:20 +08:00 |
|
yanxd
|
90a37a5f4e
|
竞赛众包的留言修改
|
2014-01-02 17:29:46 +08:00 |
|
yanxd
|
8618ad3ede
|
add access methods for delete
|
2013-12-30 20:16:56 +08:00 |
|
yanxd
|
1d962b98d3
|
model project leave message
|
2013-12-29 19:35:52 +08:00 |
|
yanxd
|
8cb3756bbc
|
首页帖子数量
|
2013-12-28 13:33:04 +08:00 |
|
yanxd
|
1b389586ad
|
留言回复人错误
|
2013-12-28 12:16:08 +08:00 |
|
yanxd
|
997c546083
|
remove html char
|
2013-12-28 10:48:22 +08:00 |
|
yanxd
|
8bc5b2ebf5
|
改了论坛回复不会触发修改update字段的问题
|
2013-12-27 15:04:05 +08:00 |
|
yanxd
|
fea1cdff53
|
首页时间排序，可能会引起其他调用event_datetime的问题。待观察
|
2013-12-27 13:54:57 +08:00 |
|
yanxd
|
8a1316cf8f
|
删除留言操作
|
2013-12-26 19:28:18 +08:00 |
|
wanglinchun
|
d48d17bece
|
留言邮件问题
|
2013-12-26 15:24:03 +08:00 |
|
yanxd
|
7b895e5cde
|
Merge branch 'wordh' into develop
Conflicts:
app/views/layouts/base_users.html.erb
|
2013-12-26 11:36:09 +08:00 |
|
wanglinchun
|
6d1f395caf
|
mutil thread
|
2013-12-26 11:35:07 +08:00 |
|
wanglinchun
|
a3ef595099
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/models/journals_for_message_observer.rb
|
2013-12-26 11:31:30 +08:00 |
|
wanglinchun
|
3707af3810
|
mail
|
2013-12-26 11:30:31 +08:00 |
|
yanxd
|
a01123c5bf
|
d
|
2013-12-26 08:43:16 +08:00 |
|
yanxd
|
605d7ec565
|
ajax message fix
|
2013-12-26 08:39:43 +08:00 |
|
yanxd
|
f05d2131bd
|
组织留言数据方法
|
2013-12-25 15:40:34 +08:00 |
|
yanxd
|
6f0e3501b8
|
fix bug.
|
2013-12-25 09:25:22 +08:00 |
|
yanxd
|
ff317e48e9
|
words jourformessage design ing...
|
2013-12-25 09:17:15 +08:00 |
|
yanxd
|
deaae6998c
|
Merge remote-tracking branch 'origin/develop' into wordh
|
2013-12-24 16:47:57 +08:00 |
|
nieguanghui
|
f3ce918699
|
留言修改
|
2013-12-24 16:42:56 +08:00 |
|
yanxd
|
5e5689d945
|
闭合素有标签
|
2013-12-24 11:19:20 +08:00 |
|
wanglinchun
|
79571e8651
|
留言发邮件通知改进
|
2013-12-23 22:36:32 +08:00 |
|
yanxd
|
cda9543849
|
帖子回复数量超过一页，首页动态点击过去无法跳转到相应页面定位，锚点失效
|
2013-12-23 09:28:28 +08:00 |
|
yanxd
|
99686ec269
|
留言不能是空字符
|
2013-12-21 10:15:41 +08:00 |
|
wanglinchun
|
775f07a89d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-20 22:04:49 +08:00 |
|
wanglinchun
|
e16fea9387
|
fix:项目提交留言出错
|
2013-12-20 22:04:13 +08:00 |
|
yanxd
|
7226186316
|
to login using validate with email.
|
2013-12-20 10:30:41 +08:00 |
|
yanxd
|
60be338848
|
作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
|
2013-12-19 15:59:10 +08:00 |
|
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
2013-12-17 16:59:07 +08:00 |
|
yanxd
|
3484632ce8
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-13 20:02:20 +08:00 |
|
yanxd
|
b703c65033
|
关注取消关注位置漂移
个人主页学号的隐藏
|
2013-12-13 20:01:27 +08:00 |
|
wanglinchun
|
10177618f0
|
message send email
|
2013-12-13 11:31:12 +08:00 |
|
yanxd
|
dcc47ae989
|
amigo
|
2013-12-12 17:18:55 +08:00 |
|
yanxd
|
5cae2010c1
|
download access
|
2013-12-12 09:23:08 +08:00 |
|
yanxd
|
0bc2b8f2b3
|
项目论坛丢失了的编辑功能
贴吧的置顶锁定功能，目前只针对管理员开放
贴吧列表搜索功能重构
增加1/2帖子显示数目
取出楼主，防止输入帖子id让回复作为主贴显示
首页取新帖子
帖子下载内容随意删除功能
|
2013-12-11 08:52:55 +08:00 |
|
yanxd
|
e5010d118b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-09 18:31:52 +08:00 |
|
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
2013-12-09 18:31:08 +08:00 |
 huangjingquan
|
0c5c07a5a3
|
对留言在动态里面的显示进行了修改！
|
2013-12-09 17:10:10 +08:00 |
|
huangjingquan
|
f99e5dcc64
|
修改了之前留言回复双重显示的问
|
2013-12-09 16:01:50 +08:00 |
|
yanxd
|
c272783f1c
|
工具栏边距调整，讨论区的修改删除功能，项目竞赛边框顶出页面的问题。
|
2013-12-07 10:15:55 +08:00 |
|
yanxd
|
d29154cc24
|
hot memo merged board/topic.
|
2013-12-06 11:19:15 +08:00 |
|
yanxd
|
31a4ecc8e8
|
welcome activity, eventtypes: Forum=>Memo, Memo=>Reply.
|
2013-12-05 08:52:41 +08:00 |
|
huangjingquan
|
096f0eed03
|
添加了留言结果在用户动态里面显示
|
2013-12-04 21:24:52 +08:00 |
|
yanxd
|
6cede3d2be
|
计算评论数量，修复按照时间查找bug,etc...
|
2013-12-04 16:46:16 +08:00 |
|
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容，点击之后定位到帖子。
|
2013-12-04 15:31:18 +08:00 |
|
yanxd
|
cc9dca4012
|
主题帖子数量不算在回复数之中
|
2013-11-28 15:51:38 +08:00 |
|
yanxd
|
8f707f3987
|
修复帖子统计问题
|
2013-11-28 15:29:19 +08:00 |
|
huangjingquan
|
6dc692bb6a
|
修改了主页、论坛显示
|
2013-11-27 16:40:47 +08:00 |
|
yanxd
|
16c218ccae
|
隐藏搜索栏 and something...
|
2013-11-27 14:52:36 +08:00 |
|
yanxd
|
5d02d0adc1
|
封装memo
|
2013-11-27 10:16:35 +08:00 |
|
yanxd
|
cdbc26e8df
|
Merge branch 'forum' into develop
|
2013-11-26 17:32:28 +08:00 |
|
yanxd
|
f0b6c33217
|
修改一些删除权限问题
|
2013-11-26 16:55:46 +08:00 |
|
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
2013-11-26 16:32:08 +08:00 |
|
fanqiang
|
4f00b12016
|
添加了论坛加tag功能
|
2013-11-24 20:45:04 +08:00 |
|
fanqiang
|
d77fed5d34
|
不好说啊，赶紧结束吧~~~~~~~~~~~~~
|
2013-11-24 20:02:53 +08:00 |
|
yanxd
|
4a51f08009
|
memos unfinish.
|
2013-11-23 20:02:15 +08:00 |