Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
xianbo
|
233901577f
|
fix
|
11 years ago |
 fanqiang
|
cfa5532598
|
建立了open source project部分的框架，并且建立了相应的帖子
|
11 years ago |
|
xianbo
|
06b2c25f3d
|
fix
|
11 years ago |
|
fanqiang
|
d935152ed7
|
initial crawl
|
11 years ago |
yanxd
|
c38a8e4f6a
|
socialForge#324
|
11 years ago |
|
yanxd
|
378e8cbefd
|
socailForge#329
|
11 years ago |
|
yanxd
|
a8d1608603
|
nil
|
11 years ago |
|
yanxd
|
ce4f49b635
|
counter cache for issue
|
11 years ago |
|
yanxd
|
6ba25556b7
|
issues id new world
|
11 years ago |
|
yanxd
|
163cdc8cf7
|
issues to_param
|
11 years ago |
|
yanxd
|
2e3b44c830
|
id-name(position|count)
|
11 years ago |
|
yanxd
|
3b13183dbb
|
resort
|
11 years ago |
|
yanxd
|
404568be89
|
留言url显示，以及留言分页的url处理
|
11 years ago |
|
Wen
|
30eb2d79f2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
52fe99d71c
|
fixed 谭 domain bug in development environment.
|
11 years ago |
|
Wen
|
337885503e
|
school表done
建立了school和course的一对多关联
|
11 years ago |
|
yanxd
|
6877ff7e8d
|
解决设置跳转404.bug
|
11 years ago |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
11 years ago |
|
yanxd
|
af3b32fa89
|
帖子内容可以为空
|
11 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
11 years ago |
|
yanxd
|
ce1e6c49f1
|
改留言
|
11 years ago |
|
yanxd
|
e9373991d2
|
maoxian
|
11 years ago |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
11 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
11 years ago |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
11 years ago |
|
yanxd
|
fd426936bb
|
修复时间格式错误引发的列表错误
|
11 years ago |
|
yanxd
|
0ed2e19268
|
项目列表
|
11 years ago |
|
Wen
|
d22e1056fb
|
xxxxx
|
11 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 |
