 nwb
|
69e366d841
|
迁移课程作业数据
|
11 years ago |
|
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
11 years ago |
|
nwb
|
fb36a0d5ba
|
1.课程control添加create方法
2.课程model添加部分新列及相关逻辑
|
11 years ago |
 yanxd
|
8fb82bbdc4
|
register Mod
|
11 years ago |
|
nwb
|
4404222437
|
0604
|
11 years ago |
|
nwb
|
c43bf84e42
|
课程所包含的子功能模块(enabled_modules)相关逻辑修改
|
11 years ago |
|
yanxd
|
51bfb6cae8
|
user model save bug
|
11 years ago |
|
nwb
|
d87b52bedd
|
课程成员迁移
|
11 years ago |
 wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
11 years ago |
|
wanglinchun
|
a3fb48a4bb
|
0603
|
11 years ago |
|
yanxd
|
510b1c4233
|
merge gem
|
11 years ago |
|
yanxd
|
37232cd5b2
|
把所有user_extensions的逻辑移到了user中，业务代码还没有修改,下一步是user_score和projectxxx,先测测效果
|
11 years ago |
|
nwb
|
cd10dd5433
|
课程权限判断变更，从项目权限分离
|
11 years ago |
|
wanglinchun
|
81a45fe977
|
dfs
|
11 years ago |
|
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
11 years ago |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
11 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
11 years ago |
 z9hang
|
4747375499
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
|
z9hang
|
45d17db8b6
|
实现给教师发课程留言邮件时根据教师设置判断是否发送邮件
|
11 years ago |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
 fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
11 years ago |
|
z9hang
|
866ae3a38d
|
发送邮件部分代码优化
|
11 years ago |
|
nwb
|
ea3b80fdc6
|
添加CourseStatus表和model
|
11 years ago |
|
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
11 years ago |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
11 years ago |
|
z9hang
|
2d77975221
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/courses_helper.rb
app/views/bids/_homework_list.html.erb
config/locales/en.yml
|
11 years ago |
 sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
daecf1a53b
|
老师收到课程留言区的直接留言及对老师的回复的邮件提醒
|
11 years ago |
|
z9hang
|
31804b3d45
|
发邮件
|
11 years ago |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
11 years ago |
|
fanqiang
|
4c3e2376f0
|
修改帖子页面
|
11 years ago |
yanxd
|
a9b88b8e66
|
issues#show words typo
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
11 years ago |
|
yanxd
|
213939b474
|
realname
|
11 years ago |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
11 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
11 years ago |
|
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
11 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
11 years ago |
|
yanxd
|
f44b930037
|
233
|
11 years ago |
|
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
11 years ago |
|
fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
yanxd
|
19aba25625
|
course revert search project
|
11 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
11 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
11 years ago |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构， 不再是一对一的匹配帖子，而是添加了一个中间表
|
11 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
11 years ago |
|
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
11 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
11 years ago |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
11 years ago |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
11 years ago |
|
t430
|
00b866f06a
|
Merge branch 'develop'
|
11 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
029eb1a195
|
作业回复
|
11 years ago |
|
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
11 years ago |
|
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
11 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
11 years ago |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
11 years ago |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
11 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
11 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
11 years ago |
|
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中，可以直接关联到竞赛中
|
11 years ago |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
11 years ago |
|
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
11 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
11 years ago |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
11 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
11 years ago |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
11 years ago |
|
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
11 years ago |
 kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
11 years ago |
|
fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
11 years ago |
|
wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
11 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
|
11 years ago |
|
fanqiang
|
dbef2f958a
|
osp_id validate
|
11 years ago |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
11 years ago |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
11 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性，将integer改为string
|
11 years ago |
|
yanxd
|
653fe6c1ea
|
所有发邮件都新开线程
|
11 years ago |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
wanglinchun
|
3608cecca5
|
增加应用软件包的后缀格式
|
11 years ago |
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
11 years ago |
|
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
11 years ago |
|
yanxd
|
0791c35df1
|
赞踩关联关系
|
11 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
11 years ago |
|
yanxd
|
daf7e8d200
|
user added rater
|
11 years ago |
|
yanxd
|
e802424e2a
|
merge jrating
|
11 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
11 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
11 years ago |
|
baiyu
|
36cd91401f
|
user score
|
11 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 |
|
yanxd
|
fea1cdff53
|
首页时间排序，可能会引起其他调用event_datetime的问题。待观察
|
12 years ago |
|
yanxd
|
8a1316cf8f
|
删除留言操作
|
12 years ago |
|
wanglinchun
|
d48d17bece
|
留言邮件问题
|
12 years ago |
|
yanxd
|
7b895e5cde
|
Merge branch 'wordh' into develop
Conflicts:
app/views/layouts/base_users.html.erb
|
12 years ago |
|
wanglinchun
|
6d1f395caf
|
mutil thread
|
12 years ago |
|
wanglinchun
|
a3ef595099
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/models/journals_for_message_observer.rb
|
12 years ago |
|
wanglinchun
|
3707af3810
|
mail
|
12 years ago |
|
yanxd
|
a01123c5bf
|
d
|
12 years ago |
|
yanxd
|
605d7ec565
|
ajax message fix
|
12 years ago |
|
yanxd
|
f05d2131bd
|
组织留言数据方法
|
12 years ago |
|
yanxd
|
6f0e3501b8
|
fix bug.
|
12 years ago |
|
yanxd
|
ff317e48e9
|
words jourformessage design ing...
|
12 years ago |
|
yanxd
|
deaae6998c
|
Merge remote-tracking branch 'origin/develop' into wordh
|
12 years ago |
|
nieguanghui
|
f3ce918699
|
留言修改
|
12 years ago |
|
yanxd
|
5e5689d945
|
闭合素有标签
|
12 years ago |
|
wanglinchun
|
79571e8651
|
留言发邮件通知改进
|
12 years ago |
|
yanxd
|
cda9543849
|
帖子回复数量超过一页，首页动态点击过去无法跳转到相应页面定位，锚点失效
|
12 years ago |
|
yanxd
|
99686ec269
|
留言不能是空字符
|
12 years ago |
|
wanglinchun
|
775f07a89d
|
Merge remote-tracking branch 'origin/develop' into develop
|
12 years ago |
|
wanglinchun
|
e16fea9387
|
fix:项目提交留言出错
|
12 years ago |
|
yanxd
|
7226186316
|
to login using validate with email.
|
12 years ago |
|
yanxd
|
60be338848
|
作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
|
12 years ago |
|
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
12 years ago |
|
yanxd
|
3484632ce8
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
b703c65033
|
关注取消关注位置漂移
个人主页学号的隐藏
|
12 years ago |
|
wanglinchun
|
10177618f0
|
message send email
|
12 years ago |
|
yanxd
|
dcc47ae989
|
amigo
|
12 years ago |
|
yanxd
|
5cae2010c1
|
download access
|
12 years ago |
|
yanxd
|
0bc2b8f2b3
|
项目论坛丢失了的编辑功能
贴吧的置顶锁定功能，目前只针对管理员开放
贴吧列表搜索功能重构
增加1/2帖子显示数目
取出楼主，防止输入帖子id让回复作为主贴显示
首页取新帖子
帖子下载内容随意删除功能
|
12 years ago |
|
yanxd
|
e5010d118b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
12 years ago |
 huangjingquan
|
0c5c07a5a3
|
对留言在动态里面的显示进行了修改！
|
12 years ago |
|
huangjingquan
|
f99e5dcc64
|
修改了之前留言回复双重显示的问
|
12 years ago |
|
yanxd
|
c272783f1c
|
工具栏边距调整，讨论区的修改删除功能，项目竞赛边框顶出页面的问题。
|
12 years ago |
|
yanxd
|
d29154cc24
|
hot memo merged board/topic.
|
12 years ago |
|
yanxd
|
31a4ecc8e8
|
welcome activity, eventtypes: Forum=>Memo, Memo=>Reply.
|
12 years ago |
|
huangjingquan
|
096f0eed03
|
添加了留言结果在用户动态里面显示
|
12 years ago |
|
yanxd
|
6cede3d2be
|
计算评论数量，修复按照时间查找bug,etc...
|
12 years ago |
|
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容，点击之后定位到帖子。
|
12 years ago |
|
yanxd
|
cc9dca4012
|
主题帖子数量不算在回复数之中
|
12 years ago |
|
yanxd
|
8f707f3987
|
修复帖子统计问题
|
12 years ago |
|
huangjingquan
|
6dc692bb6a
|
修改了主页、论坛显示
|
12 years ago |
|
yanxd
|
16c218ccae
|
隐藏搜索栏 and something...
|
12 years ago |
|
yanxd
|
5d02d0adc1
|
封装memo
|
12 years ago |
|
yanxd
|
cdbc26e8df
|
Merge branch 'forum' into develop
|
12 years ago |
|
yanxd
|
f0b6c33217
|
修改一些删除权限问题
|
12 years ago |
|
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
12 years ago |
|
fanqiang
|
4f00b12016
|
添加了论坛加tag功能
|
12 years ago |
|
fanqiang
|
d77fed5d34
|
不好说啊，赶紧结束吧~~~~~~~~~~~~~
|
12 years ago |
|
yanxd
|
4a51f08009
|
memos unfinish.
|
12 years ago |
|
fanqiang
|
c50c77a7ca
|
frame
|
12 years ago |
|
yanxd
|
48650a2a91
|
init forum. again.
|
12 years ago |
|
yanxd
|
c03f17e3b4
|
Revert "小改怡情，大改伤身，强改灰飞烟灭"
This reverts commit 4a4d1159f8.
|
12 years ago |
|
fanqiang
|
4a4d1159f8
|
小改怡情，大改伤身，强改灰飞烟灭
|
12 years ago |
|
baiyu
|
1944cb5bcf
|
1、修改了个人主页里关注列表的项目和课程的显示错误
2、修改了竞赛里里竞赛参与者的项目和课程的显示错误
|
12 years ago |
|
fanqiang
|
16f70437d1
|
forum init.
|
12 years ago |
|
yanxd
|
0381179536
|
自动添加讨论区当项目课程创建的时候，学生是否能回复需要在全线报表里配置.
|
12 years ago |
|
baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
12 years ago |
|
yanxd
|
0ddd259fea
|
refactor: access controller move to filter.
|
12 years ago |
|
yanxd
|
98ccc97b27
|
add hidden repository function
|
12 years ago |
|
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式，解决课程列表文件链接错误
|
12 years ago |
|
nieguanghui
|
dd6563cf8c
|
优化用户搜索
|
12 years ago |
|
fanqiang
|
9996386fe4
|
增加课程留言与项目反馈功能，修改了点击课程作业时tab页显示问题
|
12 years ago |
|
xianbo
|
10a14d5e82
|
add the link to thieris homepage
|
12 years ago |
|
huangjingquan
|
09eb16ad9a
|
修改了项目和课程里面成员配置显示错误
|
12 years ago |
|
huangjingquan
|
477e299e24
|
修改了用户主页课程列表显示
去掉了作业和关注需求，将关注需求统计显示
|
12 years ago |
|
xianbo
|
5dfac1d8e3
|
add modify about homework and modify the show of toll bar
|
12 years ago |
|
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
12 years ago |
|
nieguanghui
|
39580a04a2
|
修复项目列表成员显示bug
|
12 years ago |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
12 years ago |
|
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
12 years ago |
|
baiyu
|
0206d3f2c3
|
需求里面添加了用户和项目与需求的联系
|
12 years ago |
|
nieguanghui
|
17a4f14f2a
|
修复课程和项目搜索bug
|
12 years ago |
|
xianbo
|
0238001721
|
modify destroy project and user can't destroy biding_project
|
12 years ago |
|
fanqiang
|
2fbf025c2f
|
调整需求的评价，隐藏个人账户的首选项内容
|
12 years ago |
|
xianbo
|
d7f7ff5fa9
|
delete homework
|
12 years ago |
|
xianbo
|
677bc4060b
|
fix bug about delete project
|
12 years ago |
|
xianbo
|
3b6f0e3d34
|
modify delete project and user and define a course is a public
|
12 years ago |
 huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
12 years ago |
|
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
12 years ago |
 william
|
61e4021625
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/controllers/bids_controller.rb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
config/routes.rb
lib/redmine.rb
|
12 years ago |
|
william
|
7d919fd3c3
|
Merge branch 'liuping' into develop
Conflicts:
app/helpers/bids_helper.rb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
db/schema.rb
|
12 years ago |
|
xianbo
|
806fae7b19
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
app/controllers/account_controller.rb
app/controllers/my_controller.rb
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/helpers/projects_helper.rb
app/helpers/users_helper.rb
app/models/project.rb
app/models/user.rb
app/models/user_extensions.rb
app/views/account/register.html.erb
app/views/bids/_bid_show.html.erb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
app/views/files/index.html.erb
app/views/layouts/base_bids.html.erb
app/views/layouts/base_users.html.erb
app/views/my/account.html.erb
app/views/users/watch_bids.html.erb
config/locales/en.yml
config/locales/zh.yml
config/routes.rb
db/schema.rb
lib/redmine.rb
public/stylesheets/application.css
|
12 years ago |
|
william
|
dcbaf1c02b
|
增加需求结束方法。
|
12 years ago |
baiyu
|
4fb040bc61
|
modify register bug
|
12 years ago |
|
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
12 years ago |
|
huangjingquan
|
3536883248
|
课程合并
|
12 years ago |
|
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
12 years ago |
|
fanqiang
|
50894d8950
|
将新闻添加进活动
|
12 years ago |
|
huangjingquan
|
11370329dd
|
修改了部分功能
|
12 years ago |
|
baiyu
|
2768c935be
|
1、增加了“我的状态”
|
12 years ago |
|
fanqiang
|
131c5ba31b
|
修改留言功能
|
12 years ago |
|
fanqiang
|
805ad6600b
|
添加了提交作业
|
12 years ago |
|
huangjingquan
|
7aa5eef2e4
|
fds
|
12 years ago |
|
fanqiang
|
602e3dc3fa
|
修改个人主页
|
12 years ago |
|
huangjingquan
|
261c3fc337
|
new version
|
12 years ago |
|
baiyu
|
a2cc191a4e
|
1、增加“我的账号”里的了工作单位
2、增加了“注册”里的“身份”
|
12 years ago |
|
nieguanghui
|
68145ef5f7
|
优化排序显示，修改搜索页面显示
|
12 years ago |
|
xianbo
|
7dbcc1520c
|
course add data
|
12 years ago |
|
xianbo
|
1e7d127998
|
new course table
|
12 years ago |
 zhangyang
|
4d82cad51d
|
move 2013.8.29
|
12 years ago |
|
fanqiang
|
b4b4956ab7
|
添加留言删除前身份确认，修改活动列表中问题部分的显示，添加了项目信息
|
12 years ago |
|
nieguanghui
|
fa27d3bf32
|
增加项目和用户的排序功能
|
12 years ago |
|
william
|
0c22d409fc
|
添加写project_status和user_status两表的方法，
在关注中写这2个表，
重构了tag的过滤方法，
拿掉了user_extension.rb.
|
12 years ago |
|
fanqiang
|
c7beefa556
|
修改用户活动页面，添加了过滤功能。修改留言中引用和删除功能的显示问题
|
12 years ago |
|
baiyu
|
72b37a915a
|
添加留言提醒
|
12 years ago |
|
baiyu
|
074e8adfdd
|
修改需求页面的一些细节，修改了更新问题的权限，现在更新问题的角色包括超级管理员，管理员，问题创建者，问题指派人员
|
12 years ago |
Administrator
|
83ff8a31c1
|
test
|
12 years ago |
|
baiyu
|
96dfe0a6da
|
修改需求列表
|
12 years ago |
|
baiyu
|
1290a008fc
|
修改新建需求界面
|
12 years ago |
|
william
|
d62ad9e863
|
给tag search结果添加了分页。
|
12 years ago |
|
baiyu
|
e7716912b5
|
增加了git使用说明文档
在主页增加了用户对系统的反馈
|
12 years ago |
|
Administrator
|
f08ab23492
|
修复版本库
|
12 years ago |
|
william
|
7850a2e6f0
|
修改user_extension
|
12 years ago |
|
fanqiang
|
7287e151d0
|
将issue加入活动中，添加读取活动数据的方法
|
12 years ago |
|
huangjingquan
|
48442e95f5
|
限制项目描述字数
|
12 years ago |
|
fanqiang
|
bb5e066d50
|
解决冲突
|
12 years ago |
|
nieguanghui
|
c00575ce84
|
修改新建项目显示，优化列表显示速度
|
12 years ago |
|
fanqiang
|
69e3dcee6c
|
修改用户活动，用户主页的其他部分添加分页
|
12 years ago |
|
william
|
cf9aa12727
|
1.重新定义了顶和踩得规则：
对于为评价的问题，同时显示顶和踩的数字，并且数字的“+”“-”标成黑色；
对于评价的问题，如果评价是顶，则只显示所有顶的次数；反之，亦然；
2.在问题列表中也添加了顶和踩的功能；
3.对于问题列表的描述，在描述内容前添加了“描述：”，
所以为空的情况下，该处显示占位依然存在，使列表显示格式统一
|
12 years ago |
|
fanqiang
|
238b9a416f
|
修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈
|
12 years ago |
|
fanqiang
|
f3c0f9cde9
|
解决冲突
|
12 years ago |
|
nieguanghui
|
8b3e4617e4
|
解决用户主页500错误
|
12 years ago |
|
nieguanghui
|
a8d2c5789c
|
修正数据库表不存在错误
|
12 years ago |
|
fanqiang
|
b2af215ee1
|
修改新建需求时提示错误信息功能
|
12 years ago |
|
william
|
80e74e4dd7
|
修改了一些赞的bug，添加了显示所有tag的功能。
|
12 years ago |
|
william
|
9cc86f3cd8
|
移除seems_ratabale插件。
|
12 years ago |
|
william
|
0b5ea87f11
|
加入了对赞功能模块，同时预留了踩功能，但暂时不使用。
|
12 years ago |
|
fanqiang
|
4835cab6e4
|
添加了用户查找反馈的功能，可以查看对用户评论的引用和对用户需求的评论。解决了留言问题
|
12 years ago |
|
nieguanghui
|
df93c78490
|
增加项目，需求搜索，
|
12 years ago |
|
huangjingquan
|
d4494b3803
|
修改了任务分工上几条
|
12 years ago |
|
fanqiang
|
bb5052cf30
|
修改了用户活动，可以查看关注好友的活动，并且将需求加入到活动中
修复了一些需求中的BUG
|
12 years ago |
|
fanqiang
|
7949e1166c
|
添加备注
|
12 years ago |
|
fanqiang
|
8c80e56019
|
修改了需求列表的结构，添加了分页，并且修改了新建需求的BUG，
|
12 years ago |
 kaizheng
|
3d8aa620a5
|
添加分享按钮
|
12 years ago |
|
fanqiang
|
ee0d8ecb95
|
删除多余的model tag.rb
|
12 years ago |
|
fanqiang
|
1781d3ba8d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/layouts/base_bids.html.erb
|
12 years ago |
|
william
|
ff0e1df0a2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
william
|
4c5ba2b6df
|
Tagģ顣
|
12 years ago |
|
kaizheng
|
e635237acd
|
添加app\controllers\shares_controller.rb及相关文件用来作为api演示的小例子，Client.html放在根目录下作为演示客户端
|
12 years ago |
|
huangjingquan
|
70b211e355
|
first commit
|
12 years ago |
