 cxt
|
e04926f2e7
|
关联项目的提交次数
|
10 years ago |
 ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
ouyangxuhua
|
8ead573872
|
组织设置url
|
10 years ago |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
10 years ago |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
10 years ago |
|
cxt
|
96a28fe5b5
|
博客动态添加更新时间
|
10 years ago |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
10 years ago |
 huang
|
8758235364
|
issue创建和删除的时候，issues_count+1
|
10 years ago |
|
huang
|
83881766b2
|
提交总数接口获取修改
|
10 years ago |
|
huang
|
1239a8b5af
|
统计数据迁移
|
10 years ago |
|
ouyangxuhua
|
48f931deba
|
隐藏组织的课程/项目快捷菜单
|
10 years ago |
|
ouyangxuhua
|
2f5ada2d7b
|
博客设为首页后，显示在个人主页处
|
10 years ago |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
10 years ago |
|
huang
|
f3b732460c
|
添加项目统计字段
|
10 years ago |
|
cxt
|
a93539da5e
|
课程学期往前推一个学期
|
10 years ago |
|
huang
|
525d1544c2
|
代码样式
|
10 years ago |
|
cxt
|
a3a16b5591
|
问题跟踪、作业列表页面“展开更多”改为“点击展开更多”
|
10 years ago |
guange
|
e80149c6c8
|
@7008找不到的问题
|
10 years ago |
|
huang
|
28c3dca099
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
66c3cee3f8
|
课程关联组织列表
|
10 years ago |
|
huang
|
c719fd96a3
|
0
|
10 years ago |
|
cxt
|
bb0a03b309
|
若无任何个人留言，或者当前用户无权限看到任何个人留言，不要显示白框
|
10 years ago |
|
huang
|
8c10ce6fee
|
修改组织500问题
|
10 years ago |
|
cxt
|
a3370b693c
|
课程关联组织列表为空
|
10 years ago |
|
cxt
|
eab8cc7231
|
复制学期的默认图片
|
10 years ago |
|
huang
|
f9bc1efd7c
|
issue编辑的时候ajax刷新附件
|
10 years ago |
|
huang
|
3df542ff6a
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
cc135503c2
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
1264d5f6ca
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
9368e3875c
|
去掉关联项目的提交次数
|
10 years ago |
|
cxt
|
75e2eecc37
|
课程配置中点击开课学期或结束学期弹框中，“复制学期”入口要开通
|
10 years ago |
|
huang
|
64889fd14a
|
项目资源提供新分页
|
10 years ago |
|
ouyangxuhua
|
5d819625c0
|
快捷菜单上传文件使用最新的上传方式
|
10 years ago |
|
ouyangxuhua
|
0ac99571de
|
样式调整
|
10 years ago |
|
cxt
|
ef441d3bca
|
关联项目样式修改
|
10 years ago |
|
ouyangxuhua
|
3a62db6475
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
ouyangxuhua
|
ceeec3af12
|
修改一些bug
|
10 years ago |
|
cxt
|
5dbad5a672
|
已关联项目的样式修改
|
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
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
762ebb150b
|
解决课程资源重复分页问题
|
10 years ago |
|
cxt
|
90f6f07f19
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
0ab500986a
|
发送搜索功能
|
10 years ago |
|
cxt
|
f1e9718f56
|
隐藏复制学期的上传图片按钮
|
10 years ago |
|
ouyangxuhua
|
d574521b48
|
样式更新
|
10 years ago |
|
ouyangxuhua
|
09b8373e12
|
组织配置https改成http
|
10 years ago |
|
ouyangxuhua
|
7f465d1766
|
修改bug
|
10 years ago |
|
huang
|
dc90976497
|
项目资源库添加 “发送”功能
|
10 years ago |
|
huang
|
57af22e3af
|
项目资源库tag增、删、改ajax
|
10 years ago |
|
cxt
|
17aeff1587
|
复制学期时密码修改无效
|
10 years ago |
|
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页
|
10 years ago |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
10 years ago |
|
ouyangxuhua
|
c500fc13db
|
解决组织动态中，第二页重复显示第一页动态的问题
|
10 years ago |
|
cxt
|
c5a10c504e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
10 years ago |
|
huang
|
6a9ebb572b
|
资源库添加上传按钮
|
10 years ago |
|
huang
|
6a9dc43d03
|
版权修改、issue编辑
|
10 years ago |
|
ouyangxuhua
|
5eceb3d841
|
解决一些bug; 增加已设为首页标签
|
10 years ago |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
10 years ago |
|
huang
|
dd4d687559
|
修改项目资源附件统计功能
|
10 years ago |
|
huang
|
fd2197a73d
|
项目资源库历史数据迁移
搜索功能添加Version类型判断
|
10 years ago |
 Tim
|
125479f671
|
课程复制样式调整
|
10 years ago |
|
cxt
|
2aea4da310
|
导出的测验成绩列表添加”班级“
|
10 years ago |
|
ouyangxuhua
|
9e286ef8a5
|
对于当前用户，鼠标经过该用户头像显示详细信息时，有编辑资料按钮
|
10 years ago |
|
cxt
|
2d73933f4f
|
已经删除了的课程还显示在新建作业的发布课程列表中
|
10 years ago |
|
guange
|
067f3be598
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
178f9e167c
|
1.申请子域名时，对子域名进行规范，仅能输入字母、数字和下划线；
2.博客主页，添加取消主页按钮；
3.私信只能发送者和接收者能看到
|
10 years ago |
|
guange
|
5ebfbc901a
|
at排序按照拼音来
|
10 years ago |
|
cxt
|
2de42afdae
|
开启匿评的提示信息修改
|
10 years ago |
|
cxt
|
5e0ee0426a
|
作业动态的附件放在扣分上面
|
10 years ago |
|
huang
|
e56382a899
|
tag云ajax更新后自动刷新
|
10 years ago |
|
cxt
|
05f822a5c2
|
导出在线测验成绩列表
|
10 years ago |
|
ouyangxuhua
|
539d971901
|
组织页面也增加项目/课程快捷菜单
|
10 years ago |
|
cxt
|
5b234580a8
|
学生作品列表打开报500
|
10 years ago |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
10 years ago |
|
cxt
|
1263e4cac0
|
关联项目的样式修改
|
10 years ago |
|
cxt
|
2b75c1e11a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
151c08ac5c
|
复制学期
|
10 years ago |
|
ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
10 years ago |
|
huang
|
8f7d5c8a35
|
项目资源库，上传资源类型，创建资源
|
10 years ago |
|
huang
|
972f2bfea8
|
完成项目资源库tag云的查询统计
|
10 years ago |
|
ouyangxuhua
|
80668d6a47
|
增加以下功能：
鼠标经过用户头像时，显示用户的详细信息，并且可以添加/取消关注，可以私信/留言。
|
10 years ago |
|
huang
|
d0a8b4bc18
|
项目资源云搜索
|
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 |
|
huang
|
b4617e431f
|
代码格式
|
10 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
10 years ago |
|
huang
|
9464495c19
|
资源搜索
资源公开私有ajax
|
10 years ago |
|
huang
|
c4718f992c
|
项目资源搜索
|
10 years ago |
|
Tim
|
e9d986b311
|
课程关联项目样式调整
|
10 years ago |
|
cxt
|
cf125159f2
|
关联项目增加提交次数
|
10 years ago |
|
Tim
|
17800e8cf2
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
d4d96e66fc
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
cxt
|
244e133803
|
关联项目的对齐
|
10 years ago |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
huang
|
7ee4ff69b3
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
fc55be78c6
|
博客列表展开/
|
10 years ago |
|
huang
|
738acad211
|
展开、收缩
|
10 years ago |
|
cxt
|
9ccca401f6
|
匿评时也显示系统测试情况
|
10 years ago |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
10 years ago |
|
huang
|
2efcb5b89a
|
课程讨论区添加展开、收缩
|
10 years ago |
|
huang
|
be218baa52
|
添加迁移：项目讨论区数据重复问题
|
10 years ago |
|
cxt
|
0a2d2a539f
|
关联项目的组长名字加个title
|
10 years ago |
|
huang
|
428eb018a3
|
隐藏注册中“组织一列”
|
10 years ago |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
10 years ago |
|
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
10 years ago |
|
huang
|
680e861620
|
项目资源搜索功能
|
10 years ago |
|
huang
|
81bb35ac49
|
项目资源库 资源列表
|
10 years ago |
|
huang
|
0d6ad9ffac
|
修改课程删除后可以显示的问题
|
10 years ago |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
10 years ago |
|
ouyangxuhua
|
abf6b5ff70
|
解决base_org上传资源按钮不能正常上传的问题
|
10 years ago |
|
ouyangxuhua
|
8dd34f91c3
|
课程/项目配置关联组织，仅关联用户的组织
|
10 years ago |
|
huang
|
b79a50ce2f
|
issue回复添加附件
|
10 years ago |
|
cxt
|
3ddbeae100
|
课程的“更多”模式的文字不用粗体
|
10 years ago |
|
ouyangxuhua
|
dae07d7e92
|
解决组织页面对齐的问题
|
10 years ago |
|
huang
|
9e87e63b82
|
系统消息去掉附件
|
10 years ago |
|
huang
|
3394af7ad5
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
cxt
|
7f751cfc63
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
11444f43f0
|
解决issue多附件，删除一个附件后，提交弹出白色框框的问题
|
10 years ago |
|
cxt
|
6b5341805e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
f0216cf604
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
3dac8d2944
|
课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限
|
10 years ago |
|
huang
|
0541294c33
|
为解决完：
1、user_message_system附件显示问题
2、issue回复添加附件问题
|
10 years ago |
 lizanle
|
87b8e4dafc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b06bd51347
|
项目资源库更新资源公开私有属性的时候 需要区分 项目课程
|
10 years ago |
|
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
|
9fd6f3b89f
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
|
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 |
