 huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
9 years ago |
 cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
guange
|
1767e1200d
|
school不用Base64解码，两边都是utf8
|
9 years ago |
|
cxt
|
55a98d8d6e
|
作业二级回复的消息通知
|
9 years ago |
|
huang
|
855b33c4a5
|
Merge branch 'develop' into hjq_beidou
|
9 years ago |
|
huang
|
13cc5ceaa6
|
model中添加获取二级域名的方法
|
9 years ago |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
9 years ago |
|
guange
|
80be46dc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
guange
|
4b4a48b0c4
|
sso rsa解码这块处理,因为php只能处理117个字节,所以要拆分开
|
9 years ago |
|
huang
|
ff20b50aa2
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
5e56e11982
|
暂时禁掉作业的模板消息和消息通知
|
9 years ago |
|
guange
|
f217b3f510
|
去除用户名域名
|
9 years ago |
|
huang
|
fbcae050ad
|
项目500问题
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
huang
|
3853d5b7ad
|
右三模式定制
|
9 years ago |
|
huang
|
1673ae451b
|
名师榜新增一个后就不能再新增
|
9 years ago |
|
cxt
|
ca5f03f2ea
|
作业回复的消息通知，评阅作品的消息通知修改
|
9 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
|
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
9 years ago |
|
cxt
|
9ec488684b
|
分享申请的消息更改
|
9 years ago |
|
cxt
|
83f7de597a
|
暂时屏蔽通知的微信消息和消息通知
|
9 years ago |
|
huang
|
99d9a28828
|
名师榜sql查询
|
9 years ago |
|
huang
|
6474444cc7
|
用户连接 id变成用户名
|
9 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
cd0603f01b
|
模式二里面的链接问题
|
9 years ago |
|
cxt
|
c6c3625029
|
题目申请说明内容较长时，会导致被申请者收不到消息
|
9 years ago |
|
huang
|
a5be092c16
|
二级目录帖子列表中添加编辑功能
|
9 years ago |
|
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
9 years ago |
|
guange
|
88fd2cbfb6
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
9 years ago |
|
guange
|
dfdd301f2f
|
sso同步登录功能完成
|
9 years ago |
|
cxt
|
5f50ad046c
|
留言报500
|
9 years ago |
|
cxt
|
d845b14992
|
讨论区的模板消息
|
9 years ago |
|
cxt
|
121aca7505
|
缺陷模板消息
|
9 years ago |
|
guange
|
e8adcf8cc7
|
添加sso model
|
9 years ago |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
9 years ago |
|
cxt
|
c49627913b
|
更改评分设置中的教师优先，评分未更新
|
9 years ago |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
9 years ago |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
9 years ago |
|
huang
|
2b4f16e5f1
|
二级目录新界面的帖子列表页面
|
9 years ago |
|
huang
|
d8480ea3c6
|
二级目录内容页面
|
9 years ago |
|
huang
|
1685449381
|
二级目录框架及结构
|
9 years ago |
|
huang
|
9fbf713709
|
完成组织二级域名
|
9 years ago |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
guange
|
2c23b88998
|
boards#index性能优化
|
9 years ago |
|
huang
|
a985f6fee1
|
新建帖子/回帖不发送消息
|
9 years ago |
|
huang
|
17b5832df0
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
c4bd78e442
|
讨论区代码还原及优化
|
9 years ago |
|
huang
|
e23262225a
|
版本库名不能是全数字
|
9 years ago |
|
cxt
|
06f15735fe
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
aed3818273
|
点击模板消息跳到微信详情页面
|
9 years ago |
|
cxt
|
ef987d6bf7
|
模板消息中有html标签
|
9 years ago |
 yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
9 years ago |
|
huang
|
b1f47fe120
|
历史版本不能删除问题
|
9 years ago |
|
huang
|
a907089bd0
|
附件历史版本可以删除
|
9 years ago |
|
huang
|
7259d607dc
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
8064fe6c46
|
讨论区新建帖子代码优化
|
9 years ago |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
9 years ago |
|
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
96accf1e7a
|
未发布的作业不应进行作业的积分统计
|
9 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
9 years ago |
|
cxt
|
76cfa83666
|
微信模板消息接口
|
9 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
062af3c57a
|
作业积分出现负分
|
9 years ago |
|
cxt
|
5a3b68816a
|
冲突
|
9 years ago |
|
cxt
|
e420be8ee9
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
9 years ago |
|
cxt
|
2898805aa7
|
回复的模板消息
|
9 years ago |
|
cxt
|
275895f805
|
模板消息的重构
|
9 years ago |
|
guange
|
beec2b3246
|
merge
|
9 years ago |
|
huang
|
a2a3d6b6b9
|
Merge remote-tracking branch 'remotes/origin/weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
9 years ago |
|
cxt
|
c041f742c1
|
缺陷和留言的回复
|
9 years ago |
|
guange
|
2d41d0a2f6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
007fee95bd
|
作业和留言回复的模板消息
|
9 years ago |
|
cxt
|
3f365e75b5
|
讨论区的模板消息
|
9 years ago |
|
guange
|
96dfeead0f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
281fcf315f
|
点击模板消息页面为空
|
9 years ago |
|
huang
|
f951d22d56
|
发布博客500问题
|
9 years ago |
|
guange
|
3ff19364dc
|
merge
|
9 years ago |
|
cxt
|
845b1cdab8
|
模板
|
9 years ago |
|
cxt
|
440ba27fa4
|
回复
|
9 years ago |
|
guange
|
3ba7372523
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
guange
|
612b79410b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
b627513bae
|
中文问题
|
9 years ago |
|
cxt
|
d6daa906b6
|
回复
|
9 years ago |
|
huang
|
9fa50e0452
|
编码问题
|
9 years ago |
|
guange
|
ce611bc725
|
merge
|
9 years ago |
|
guange
|
e9ab2a482b
|
key3修改
|
9 years ago |
|
cxt
|
4df5f3114d
|
模板消息
|
9 years ago |
|
cxt
|
c870b92489
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
a3097c2752
|
truncate函数
|
9 years ago |
|
guange
|
6baf0b46f7
|
模板消息修改
|
9 years ago |
|
guange
|
f62b393d7d
|
模板消息修改
|
9 years ago |
|
guange
|
5cc0ac04e6
|
模板消息修改
|
9 years ago |
|
guange
|
aa9cb4e579
|
merge
|
9 years ago |
|
cxt
|
88c39512b9
|
journal的修改
|
9 years ago |
 Yiang Gan
|
af2bd66847
|
回复api
|
9 years ago |
|
huang
|
10371e8bdd
|
添加附件图片功能
|
9 years ago |
|
Yiang Gan
|
536394663a
|
微信消息模板
|
9 years ago |
 ouyangxuhua
|
0f4d2e40fb
|
添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整
|
10 years ago |
 alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
10 years ago |
|
ouyangxuhua
|
589f939bbd
|
消息类型“学生再次提交作业”中的链接，应该打开学生作品
|
10 years ago |
|
ouyangxuhua
|
3fc988757c
|
组织、项目、课程等在配置中添加成员时，对特殊字符'_'、‘/’添加转义，使能够搜索
|
10 years ago |
|
huang
|
f1ffd3852f
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
huang
|
185ad829cd
|
项目访问速度优化
|
10 years ago |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
7967066b05
|
附件添加动态发送方式改变
|
10 years ago |
|
guange
|
6ae4cd0767
|
merge
|
10 years ago |
|
guange
|
59923dfb03
|
merge
|
10 years ago |
|
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
10 years ago |
|
huang
|
8a8c9bf7c3
|
注释修改
|
10 years ago |
|
huang
|
79767f4bae
|
用户行为记录
|
10 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
10 years ago |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
huang
|
03597b85ff
|
解决项目被淹没问题
|
10 years ago |
|
huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
10 years ago |
|
alan
|
0ac12f3400
|
Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop
|
10 years ago |
|
alan
|
5343759f2f
|
Merge branch 'FX-alan-search-404' into alan_develop
|
10 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
10 years ago |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
10 years ago |
|
alan
|
3eaa4b08a3
|
解决删除用户报500错误
|
10 years ago |
|
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 |
