 ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
10 years ago |
 alan
|
2f5ce553e2
|
refactor user find
|
10 years ago |
|
alan
|
0998ca3974
|
Merge branch 'develop' into FX-alan-search-404
|
10 years ago |
|
alan
|
ce6d63ccaf
|
重构user.find
|
10 years ago |
 cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
a845da5c17
|
点赞有延迟
|
10 years ago |
guange
|
45c51ef8db
|
merge
|
10 years ago |
|
guange
|
24a278d7d6
|
加上atall
|
10 years ago |
 luoquan
|
1900a824e8
|
0
|
10 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
10 years ago |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
10 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
10 years ago |
 huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
10 years ago |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
10 years ago |
|
huang
|
f381784a3c
|
数据迁移
|
10 years ago |
|
huang
|
9beaa62d6d
|
课程活跃度
|
10 years ago |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
10 years ago |
|
guange
|
15d5fe127e
|
merge
|
10 years ago |
|
guange
|
a83cb2a1fa
|
merge
|
10 years ago |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
 newuser
|
d2bd4706d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
09c8e57f1c
|
复制课程时可复制资源和作业
|
10 years ago |
|
ouyangxuhua
|
991613d760
|
在转发表forwards记录发送帖子、通知
|
10 years ago |
|
ouyangxuhua
|
11231d0ff9
|
1.解决组织配置报500的错误；2.增加转发表
|
10 years ago |
|
huang
|
90208e166f
|
项目统计数小于0情况判断
|
10 years ago |
|
huang
|
44f192e5a6
|
解决资源总数为负数的问题
|
10 years ago |
|
huang
|
2156b6db76
|
issue回复 Forge自动更新排序靠前
|
10 years ago |
|
huang
|
1234bc0aef
|
课程导语从帖子中获取
|
10 years ago |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
10 years ago |
|
guange
|
7f8f3fa152
|
被rubymine坑了，这两个文件没加进去
|
10 years ago |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
71778ba948
|
拷贝课程图标
|
10 years ago |
|
cxt
|
ee73191a19
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
82fb50ccd2
|
课程学生列表的作业积分不一致
|
10 years ago |
|
ouyangxuhua
|
125f00689b
|
把组织未读消息加入铃铛消息提醒中
|
10 years ago |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
10 years ago |
|
cxt
|
b5cf138f43
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/student_work/_programing_work_show.html.erb
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突
|
10 years ago |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
10 years ago |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
10 years ago |
|
huang
|
655cc0d2db
|
issue截止时间邮件通知
|
10 years ago |
|
ouyangxuhua
|
26f8500671
|
博客回复后，该博客的更新时间为当前时间
|
10 years ago |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
d4c3cb8777
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
huang
|
e871c6823f
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
59aa1e9c6f
|
issue截止修改
|
10 years ago |
|
ouyangxuhua
|
a15f7fa97b
|
系统管理员增加组织管理员的权限
|
10 years ago |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
10 years ago |
|
huang
|
56e804b423
|
issue邮件name问题
|
10 years ago |
|
huang
|
ff475fb00b
|
Merge branch 'szzh' into develop
|
10 years ago |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
10 years ago |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
10 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
0db69e1ebf
|
解决课程导语时间和课程创建动态时间一致的问题
|
10 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
10 years ago |
|
huang
|
18c3c23d2c
|
课程推荐
|
10 years ago |
|
guange
|
f39631169d
|
认证后回复消息
|
10 years ago |
|
guange
|
349f511c12
|
开发环境不要弄9200报错
|
10 years ago |
|
guange
|
571196ad2d
|
wechat model完善
|
10 years ago |
|
guange
|
08e193ea3c
|
添加微信用户表
|
10 years ago |
|
huang
|
610b54b27c
|
课程导语放置课程动态之后
|
10 years ago |
|
huang
|
b93b86b9a0
|
创建课程发送board
|
10 years ago |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
10 years ago |
|
cxt
|
902cfdcbe9
|
课程/项目的创建动态不需要显示更新时间
|
10 years ago |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
10 years ago |
|
huang
|
e9b54ad012
|
删除附件的时候减掉得分
|
10 years ago |
|
huang
|
01e8730b25
|
issue回复添加到积分统计
|
10 years ago |
|
huang
|
286418b63c
|
修改课程讨论区500问题
|
10 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
huang
|
20a657508d
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/forge_activity.rb
db/schema.rb
|
10 years ago |
|
huang
|
49d456bf21
|
修改数据统计信息
|
10 years ago |
|
huang
|
a68392fd24
|
issue统计数据更新
提交次数加入新表
|
10 years ago |
|
cxt
|
c63af51001
|
项目动态数更新
|
10 years ago |
|
huang
|
e808f0bc61
|
提交新迁移
|
10 years ago |
|
cxt
|
27617044a1
|
课程项目报500
|
10 years ago |
|
huang
|
4b26e77478
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/models/issue.rb
app/models/message.rb
app/models/news.rb
处理冲突
|
10 years ago |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
10 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
10 years ago |
|
huang
|
165d5f50c8
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/files_controller.rb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
a0ceb9b11c
|
添加缺陷回复统计
项目版本库提交次数统计
|
10 years ago |
|
huang
|
5519ef78e2
|
项目新闻、项目讨论区区分project和course
|
10 years ago |
|
huang
|
64088f5a21
|
项目数据存入数据库（统计数据直接从数据库获取）
|
10 years ago |
|
cxt
|
f320af53dc
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
10 years ago |
|
cxt
|
96a28fe5b5
|
博客动态添加更新时间
|
10 years ago |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
10 years ago |
|
huang
|
8758235364
|
issue创建和删除的时候，issues_count+1
|
10 years ago |
|
huang
|
1239a8b5af
|
统计数据迁移
|
10 years ago |
|
guange
|
e80149c6c8
|
@7008找不到的问题
|
10 years ago |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
10 years ago |
|
huang
|
fd2197a73d
|
项目资源库历史数据迁移
搜索功能添加Version类型判断
|
10 years ago |
|
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
10 years ago |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
10 years ago |
|
huang
|
be218baa52
|
添加迁移：项目讨论区数据重复问题
|
10 years ago |
|
huang
|
3394af7ad5
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
0541294c33
|
为解决完：
1、user_message_system附件显示问题
2、issue回复添加附件问题
|
10 years ago |
|
ouyangxuhua
|
527897bff0
|
新建组织后，增加默认栏目
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
|
lizanle
|
c3b7662cac
|
issue按更新时间排序
|
10 years ago |
|
ouyangxuhua
|
f0111ad79d
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
 Tim
|
63b7330cd8
|
邮件提交标题中统计数
|
10 years ago |
|
Tim
|
b380b515c6
|
修改邮件标题统计
|
10 years ago |
|
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
b132e8483c
|
个人资源库搜索不到组织资源
|
10 years ago |
|
ouyangxuhua
|
68a6f3f7f2
|
1.组织管理员有删除帖子的权限；2.删除帖子后更新org_activities表
|
10 years ago |
|
lizanle
|
a85a3339bb
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
10 years ago |
|
lizanle
|
c34127f21f
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
10 years ago |
|
lizanle
|
b7eda83def
|
历史资源功能
|
10 years ago |
|
ouyangxuhua
|
3deb5aff43
|
资源栏目权限问题
|
10 years ago |
|
ouyangxuhua
|
e9cedf0eb9
|
删除冗余的迁移文件
|
10 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
10 years ago |
|
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
10 years ago |
|
lizanle
|
90c63192e6
|
历史资源模型修改
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
ouyangxuhua
|
d77625e4e9
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
huang
|
900d7d62cb
|
邮件按天发送添加提示
|
10 years ago |
|
ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
10 years ago |
|
ouyangxuhua
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
10 years ago |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
10 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
10 years ago |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
10 years ago |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
10 years ago |
|
guange
|
1724ae430e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
bb94a41435
|
红点中包含at的消息
|
10 years ago |
|
huang
|
1a549eda46
|
版本库显示问题
|
10 years ago |
|
huang
|
c381ce177f
|
解决通知太长不能发的问题
|
10 years ago |
|
huang
|
ab1397d982
|
恢复版本
|
10 years ago |
|
huang
|
3de4c7129a
|
版本库读取错误问题
|
10 years ago |
|
guange
|
8c967e6559
|
格式改进
|
10 years ago |
|
guange
|
e8cf5d1042
|
at消息html代码问题
|
10 years ago |
|
lizanle
|
47b20d3639
|
journal不应该算入ForgeActivity
|
10 years ago |
|
guange
|
d703f75c98
|
merge
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
guange
|
923cb3c84f
|
中文报错
|
10 years ago |
|
guange
|
fc63dfcb7b
|
消息通知
|
10 years ago |
|
guange
|
c0de5d55de
|
加入了issue的at消息提醒
|
10 years ago |
|
huang
|
85d277da0d
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
ac8aa9e0a6
|
解决作业留言和课程留言导致的bug
|
10 years ago |
|
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
10 years ago |
|
guange
|
4ce9eb428e
|
at样式问题
|
10 years ago |
|
huang
|
ea1849e51f
|
去掉邮件token值
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
d1315e35b5
|
merge
|
10 years ago |
|
guange
|
91b245ad2c
|
lastname为空时也可以加,可以省掉查询extensions的语句
|
10 years ago |
|
lizanle
|
7c114e1a13
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
f028992a18
|
帖子搜索
|
10 years ago |
|
cxt
|
7a0828a826
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
502310425b
|
匿评成绩为空
|
10 years ago |
|
huang
|
a791c39b4b
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
e5192c7b1a
|
记录学生作品的提交和编辑记录
|
10 years ago |
|
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型，可以添加文件、删除文件、显示文件等
|
10 years ago |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
a3715051b1
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
f880ccd749
|
分组作业
|
10 years ago |
|
huang
|
fbba933a46
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
ouyangxuhua
|
1e652faec7
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
lizanle
|
7f866a0b3a
|
课程被删除后不能被搜索
|
10 years ago |
|
huang
|
f2c1595d0d
|
1、同步没成功检测程序
2、注册验证修改
|
10 years ago |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
10 years ago |
|
ouyangxuhua
|
78fb8b6254
|
1.编辑或者删除栏目的帖子返回对应页面
|
10 years ago |
|
lizanle
|
2fbad38522
|
优化排序参数
用于排序的字段最好不要分词
不然就是多值字段的排序会浪费大量的内存
|
10 years ago |
|
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
huang
|
916d99be82
|
课程删除功能
|
10 years ago |
|
ouyangxuhua
|
a8b7d1b81f
|
回复项目里的message,不增加项目动态及组织动态
|
10 years ago |
|
lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
10 years ago |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
guange
|
af31946586
|
issue列表开启AT功能
|
10 years ago |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
ouyangxuhua
|
2855c0e409
|
修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等
|
10 years ago |
|
lizanle
|
6553559929
|
发送消息
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
9c4c90e066
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
ouyangxuhua
|
cf41b13f3a
|
增加组织表和组织课程表的关联删除
|
10 years ago |
|
lizanle
|
1103a114a0
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2bca65025
|
分片默认为5
|
10 years ago |
|
guange
|
52a0da83c4
|
匿名用户留言问题.
|
10 years ago |
|
ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能；
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
|
10 years ago |
|
huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
10 years ago |
|
lizanle
|
96b704e191
|
所有者的更新时间随着被拥有者的改变而改天
譬如course 里边这么写：has_many :boards
boards里边这么写就ok:belongs_to :course,:touch=>true
|
10 years ago |
|
lizanle
|
34ac56e0a0
|
attachment index_document
|
10 years ago |
|
lizanle
|
e728dd55eb
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
lizanle
|
96290ad975
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
