 ouyangxuhua
|
527897bff0
|
新建组织后，增加默认栏目
|
10 years ago |
|
ouyangxuhua
|
692f13d1de
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
defba80427
|
栏目配置中，“设为显示”改成“设为可见"
|
10 years ago |
 lizanle
|
a82fef3ea2
|
资源库新上传资源不能被删除
|
10 years ago |
|
lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
 cxt
|
9b974b6170
|
Merge branch 'cxt_course' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
7e76a32480
|
项目/课程讨论区的动态增加设置菜单
|
10 years ago |
|
lizanle
|
c3b7662cac
|
issue按更新时间排序
|
10 years ago |
|
ouyangxuhua
|
358510a2e6
|
解决组织配置资源栏目中，增加/删除栏目不能更新的问题
|
10 years ago |
|
lizanle
|
fccbbe6e2b
|
不允许重复发送。但是发送过程不会给予提示。如果课程或者项目或者组织已经有了该资源，那么该资源的更新时间会变化
|
10 years ago |
|
ouyangxuhua
|
373e40f4fd
|
未登陆情况下，不能发布帖子
|
10 years ago |
|
ouyangxuhua
|
22be66f85c
|
课程/项目帖子中，用户在登陆情况下即可发送帖子
|
10 years ago |
|
ouyangxuhua
|
f0111ad79d
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
10 years ago |
|
lizanle
|
57ef7a2d4a
|
发送资源默认为私有的。
|
10 years ago |
|
lizanle
|
2c7ef034cb
|
资源库更改
|
10 years ago |
 Tim
|
63b7330cd8
|
邮件提交标题中统计数
|
10 years ago |
|
cxt
|
2c5a4f8a13
|
发布和编辑作业时的启用匿评改为禁用匿评，默认不选中
|
10 years ago |
|
Tim
|
b380b515c6
|
修改邮件标题统计
|
10 years ago |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
10 years ago |
|
lizanle
|
20a03b2386
|
点击展开更多
|
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 |
|
Tim
|
e876cb09d9
|
自动出现的controller文件
|
10 years ago |
|
ouyangxuhua
|
2271befedd
|
修正组织部分页面的样式
|
10 years ago |
|
lizanle
|
b132e8483c
|
个人资源库搜索不到组织资源
|
10 years ago |
|
ouyangxuhua
|
68a6f3f7f2
|
1.组织管理员有删除帖子的权限；2.删除帖子后更新org_activities表
|
10 years ago |
|
ouyangxuhua
|
c2578698f5
|
1.组织管理员有权限访问帖子资源栏目
2.解决组织页面下的帖子样式的bug
|
10 years ago |
|
lizanle
|
a85a3339bb
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
10 years ago |
|
lizanle
|
c34127f21f
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
10 years ago |
|
ouyangxuhua
|
29c720a8a4
|
1.权限管理问题
|
10 years ago |
|
lizanle
|
0ef0045941
|
发送功能要添加copy_from
|
10 years ago |
|
ouyangxuhua
|
82b8cb77fd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
1448c4f90e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
lizanle
|
b7eda83def
|
历史资源功能
|
10 years ago |
|
ouyangxuhua
|
c2c4c032dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
3deb5aff43
|
资源栏目权限问题
|
10 years ago |
|
cxt
|
a74cba5190
|
编程作业的迟交扣分有问题
|
10 years ago |
|
ouyangxuhua
|
e9cedf0eb9
|
删除冗余的迁移文件
|
10 years ago |
|
ouyangxuhua
|
987b0dd9d2
|
message_id为空的动态不显示
|
10 years ago |
|
ouyangxuhua
|
c16f99774b
|
1.组织叶底样式错误问题修正
|
10 years ago |
|
Tim
|
d71e8376ae
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
077368f597
|
匿评增加系统评分显示，对应样式调整
|
10 years ago |
|
cxt
|
e948c94300
|
在线测验的填空题未断网时报网络异常
|
10 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
10 years ago |
|
cxt
|
9348cc9c24
|
编程作业匿评添加系统评分
|
10 years ago |
guange
|
aa951cd7b9
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
941d6d09d5
|
查看代码在firefox中显示不了的问题
|
10 years ago |
|
ouyangxuhua
|
d1ebc35e43
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
d1c7aad742
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
10 years ago |
|
lizanle
|
90c63192e6
|
历史资源模型修改
|
10 years ago |
 huang
|
4f331d95c7
|
课程讨论区、项目讨论编辑的时候显示附件信息不一致问题
|
10 years ago |
|
lizanle
|
fd4d2910d0
|
课程发送资源 以及 项目发送资源
|
10 years ago |
|
huang
|
aa87ef6f1b
|
解决Chrome浏览器等比缩放后样式错乱问题
|
10 years ago |
|
lizanle
|
1d0e6e1c5c
|
课程发送资源 以及 项目发送资源
|
10 years ago |
|
huang
|
6b4b87ed09
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/organizations/_org_left_subfield_list.html.erb
处理冲突
|
10 years ago |
|
huang
|
743950d264
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
0763963ca4
|
格式
|
10 years ago |
|
ouyangxuhua
|
2cd48a1ca2
|
暂时隐藏帖子发送功能
|
10 years ago |
|
lizanle
|
659f322ca2
|
send resource to org
|
10 years ago |
|
lizanle
|
1103e7eab4
|
find org where type is Resource
|
10 years ago |
|
lizanle
|
c425106d0b
|
目标地址样式修改
|
10 years ago |
|
ouyangxuhua
|
d203285cc1
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/organizations/_org_left_subfield_list.html.erb
|
10 years ago |
|
ouyangxuhua
|
f9de793124
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
15cff47c92
|
1.转发帖子时，当组织没有资源栏目时，给出提示；
2.组织文章的附件显示在组织动态/组织文章列表中；
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
ouyangxuhua
|
0cf2279cf5
|
解决一下bug:
1.组织：引用资源至某栏目，若该组织只有一个栏目，且该资源已成功引用至该组织栏目，如图就不要再显示为“选入组织其他栏目”了
2.组织:只有管理员才能关联课程/项目
|
10 years ago |
|
huang
|
5618fe067a
|
项目分页，点击加载
|
10 years ago |
|
cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
5d2c760a8e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
605ec52f8a
|
测验答题失败时提示网络异常
|
10 years ago |
|
ouyangxuhua
|
dd88742b78
|
判断org.org_act_id是否为空
|
10 years ago |
|
ouyangxuhua
|
58edc150e6
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
2e41e9890a
|
将riserved改成reserved
|
10 years ago |
|
ouyangxuhua
|
77e0f0cd08
|
转发帖子新建帖子，并更新相关表
|
10 years ago |
|
huang
|
d6e765cf4a
|
修正讨论区删除跳转
|
10 years ago |
|
huang
|
41cd038758
|
讨论区帖子添加锁定
|
10 years ago |
|
cxt
|
179058f1aa
|
学生总成绩不能为负分
|
10 years ago |
|
huang
|
b6cf709696
|
解决讨论区冲突
|
10 years ago |
|
huang
|
c29e6f1b14
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/boards/_project_show.html.erb
app/views/boards/_project_show_detail.html.erb
解决冲突
|
10 years ago |
|
cxt
|
e6ebcb7ac6
|
作品列表页面的截止时间改为提交截止时间/匿评截止时间
|
10 years ago |
|
huang
|
5060ec26bb
|
项目讨论区
|
10 years ago |
|
cxt
|
000f40ad42
|
作业动态的截止时间根据作业当前所处状态来确定是提交截止时间还是匿评截止时间
|
10 years ago |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
10 years ago |
|
ouyangxuhua
|
0d98dba25c
|
解决项目新建帖子中，点击取消按钮没有反应的问题
|
10 years ago |
|
lizanle
|
6440434428
|
私有课程的资源不允许设置为公开
|
10 years ago |
|
ouyangxuhua
|
d77625e4e9
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
33ea55ecca
|
项目/课程帖子发送弹窗样式修改
|
10 years ago |
|
lizanle
|
174f7c1972
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
app/views/issues/_list.html.erb
|
10 years ago |
|
lizanle
|
5ce9a5109d
|
issue存在重复
|
10 years ago |
|
lizanle
|
e35d2daa0a
|
课程资源库
|
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 |
|
cxt
|
c821826bd8
|
附件描述-》追加理由
|
10 years ago |
|
ouyangxuhua
|
ad4816ca4a
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
|
10 years ago |
|
huang
|
af9bc9a124
|
解决版本库点击新增版本版本信息丢失
|
10 years ago |
|
huang
|
77722f0211
|
修改issue中ke高度
|
10 years ago |
|
ouyangxuhua
|
805d785140
|
解决点击转发项目/课程帖子没有反应的问题
|
10 years ago |
|
cxt
|
7bc030b789
|
组织模块：关联项目弹框的项目列表的高度要限制
|
10 years ago |
|
lizanle
|
3b08adfc68
|
课程资源页面修改。
|
10 years ago |
|
cxt
|
b991dc1edd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
8ea626ec40
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
ce740170ca
|
Merge branch 'hjq_new_course' into szzh
Conflicts:
public/stylesheets/public.css
处理冲突
|
10 years ago |
|
huang
|
cd36a6874e
|
修改issue动态错位
|
10 years ago |
|
guange
|
4cd4d7b6dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
e3b395960c
|
base64的+号要处理一下
|
10 years ago |
|
cxt
|
8ed01bf572
|
issue列表报500
|
10 years ago |
|
cxt
|
f63f38fb82
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
bca503f171
|
追加附件必须填写描述
|
10 years ago |
|
Tim
|
445d5dc379
|
组织下拉菜单修改
|
10 years ago |
|
huang
|
801651cba6
|
解决组织两个footer冲突问题
|
10 years ago |
|
huang
|
533be61cf7
|
添加底部样式
|
10 years ago |
|
huang
|
5d1b63d6fa
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
7412c1caf6
|
添加footer
|
10 years ago |
|
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
10 years ago |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
f4fc978b23
|
课程留言bug
|
10 years ago |
|
Tim
|
06b89c5108
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
|
10 years ago |
|
Tim
|
1a24505eac
|
footer新增图片，样式修改
|
10 years ago |
|
cxt
|
b8d8cece02
|
关联项目的样式修改
|
10 years ago |
|
cxt
|
aa653d558f
|
作品确认弹框的按钮样式调整
|
10 years ago |
|
cxt
|
0b42430e2d
|
课程通知动态无法回复
|
10 years ago |
|
cxt
|
ce5f0eb855
|
关联项目的样式修改
|
10 years ago |
|
huang
|
e7a109d28f
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
a92d33300b
|
里程碑 添加 “已解决”，区分已解决和已关闭
|
10 years ago |
|
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
10 years ago |
|
cxt
|
82fa0f0aaf
|
公开的课程不勾选“学生列表公开”，但非课程成员却可以通过url访问该课程学生列表
|
10 years ago |
|
ouyangxuhua
|
7d7d9b77b5
|
编辑项目帖子样式改成方块样式
|
10 years ago |
|
cxt
|
20efe4de41
|
去掉测验结果页面中填空题的标准答案
|
10 years ago |
|
cxt
|
61b5cf41d0
|
取消课程首页的开设单位超链接
|
10 years ago |
|
ouyangxuhua
|
c81f2f738a
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
app/controllers/org_document_comments_controller.rb
app/views/org_document_comments/_attachment.html.erb
|
10 years ago |
|
ouyangxuhua
|
59f42bb54f
|
1.将添加附加功能加入到组织列表中的新建组织文章；
2.解决编辑文章附件不能上传的问题。
|
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 |
|
Tim
|
eb7d0761cb
|
组织菜单栏修改成和个人首页相同
|
10 years ago |
|
cxt
|
24542105f4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
f26f71c07a
|
课程通知改成动态的模式
|
10 years ago |
|
ouyangxuhua
|
9e0b88c186
|
项目讨论区样式改成方块样式
|
10 years ago |
|
huang
|
055fac5e27
|
修改项目得分
|
10 years ago |
|
Tim
|
c405950469
|
课程关联项目列表显示调整
|
10 years ago |
|
huang
|
19f84b111b
|
邮件按天发送去掉token值
|
10 years ago |
|
ouyangxuhua
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
10 years ago |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
10 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
10 years ago |
|
lizanle
|
e8bf93e4ad
|
文件上传button的路径去掉project参数。
|
10 years ago |
|
lizanle
|
7688546e7a
|
论坛编辑的时候上传文件后没有显示
|
10 years ago |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
10 years ago |
|
lizanle
|
bececd1547
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
2eca28a10d
|
LastName 姓
FirstName 名
|
10 years ago |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
10 years ago |
