 cxt
|
c942c843b9
|
导入作业增加引用次数
|
9 years ago |
|
cxt
|
a613b58b46
|
编程作业弹框的高度设置
|
9 years ago |
 ouyangxuhua
|
c857fb734b
|
快捷回复中，设置回复框的高度和宽度
|
9 years ago |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
9 years ago |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
9 years ago |
|
ouyangxuhua
|
4b95ee95c0
|
组织帖子栏目讨论区中的帖子，在登陆情况下就能发送；在组织栏目中，对帖子栏目讨论区增加编辑、删除、发送选项。
|
9 years ago |
|
ouyangxuhua
|
38a87a04ba
|
1.为首页、铃铛增加tips;2.为组织、项目下的资源库的tag，增加“双击可编辑”的tips
|
9 years ago |
|
ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突
|
9 years ago |
guange
|
d2c6d9272c
|
输出结果匹配\r问题
|
9 years ago |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
9 years ago |
|
cxt
|
af7ca36c92
|
学生加入课程或退出课程
|
9 years ago |
|
ouyangxuhua
|
89a919163c
|
一旦组织私有，就disabled掉允许游客下载选项
|
9 years ago |
 Tim
|
76063b0911
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_project_info.html.erb
|
9 years ago |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
9 years ago |
|
Tim
|
821ade7985
|
作业列表优化，课程加入退出
|
9 years ago |
|
ouyangxuhua
|
f3dcd4ed09
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
63d1d3a8e7
|
项目动态中，只要是项目成员就显示编辑issue多属性界面
|
9 years ago |
|
ouyangxuhua
|
dda64245b3
|
解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。
|
9 years ago |
|
Tim
|
6a83a9b55c
|
问题跟踪样式更改
|
9 years ago |
|
cxt
|
b6e13340e5
|
个人留言的删除功能
|
9 years ago |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
9 years ago |
|
Tim
|
a2afec77e3
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
Conflicts:
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
9 years ago |
|
Tim
|
f099611d7a
|
问题跟踪样式更改
|
9 years ago |
|
cxt
|
12f55f039c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
4465e93dae
|
最近登录报500
|
9 years ago |
 huang
|
154417378e
|
精品课程默认推荐
|
9 years ago |
|
cxt
|
d386b2ff84
|
留言页面的“展开更多”
|
9 years ago |
|
cxt
|
435f81a422
|
关联项目的更新时间
|
9 years ago |
|
cxt
|
bbdced9bc1
|
留言页面的样式修改
|
9 years ago |
|
cxt
|
4530e7896a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
8a2a1d2bc9
|
Merge branch 'szzh' into develop
|
9 years ago |
|
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
9 years ago |
|
huang
|
b3caa01540
|
修改课程作业链接
|
9 years ago |
|
huang
|
655cc0d2db
|
issue截止时间邮件通知
|
9 years ago |
|
cxt
|
3de8687440
|
留言页面的动态内容不生成链接，留言回复的样式更改
|
9 years ago |
|
huang
|
29c49fbb0c
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
f2d93c0b72
|
修改issue编辑权限
|
9 years ago |
|
ouyangxuhua
|
4b183c2928
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
afad062b80
|
设置资源栏目、项目资源、课程资源的title,不显示Files
|
9 years ago |
|
huang
|
007afa8c4f
|
issue在动态中回复自动刷新
|
9 years ago |
|
cxt
|
c4a264f8a6
|
提交作品时的附件显示
|
9 years ago |
|
huang
|
16cb4add09
|
issue局部刷新属性问题
|
9 years ago |
|
cxt
|
6ae7da99be
|
帖子、博客、通知、文章详情页面的单词折行
|
9 years ago |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
cxt
|
a96d8ce5a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
9 years ago |
|
cxt
|
0b2184c3d9
|
组织栏目的通知附件显示
|
9 years ago |
|
ouyangxuhua
|
d4c3cb8777
|
Merge branch 'develop' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
0a9ecac3db
|
帖子栏目讨论区链接问题修复
|
9 years ago |
|
cxt
|
e09f795171
|
附件的显示
|
9 years ago |
|
ouyangxuhua
|
b5bfa6d824
|
1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。
|
9 years ago |
|
ouyangxuhua
|
b6219c149a
|
解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除；
|
9 years ago |
|
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
9 years ago |
|
ouyangxuhua
|
b5159d54c8
|
博客按更新时间排序
|
9 years ago |
|
huang
|
edd198e91f
|
issue刷新
|
9 years ago |
|
cxt
|
f7be78efc7
|
关联项目的更新时间包含项目的提交时间
|
9 years ago |
|
ouyangxuhua
|
d7b17b455d
|
Merge branch 'szzh' into develop
|
9 years ago |
|
cxt
|
6789693fc7
|
已评分作品超过5个时，作业优秀作品排行显示“更多”
|
9 years ago |
|
huang
|
4f7d4bb4aa
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
9 years ago |
|
huang
|
e871c6823f
|
Merge branch 'develop' into hjq_new_course
|
9 years ago |
|
huang
|
59aa1e9c6f
|
issue截止修改
|
9 years ago |
|
cxt
|
fea4f79dc8
|
组织帖子栏目的通知增加点赞tip
|
9 years ago |
|
ouyangxuhua
|
8ef3018adc
|
issue局部刷新使用update,方式是put
|
9 years ago |
|
huang
|
42cc8bc69e
|
issue属性刷新
|
9 years ago |
|
huang
|
448a412abf
|
issue详情页面在 user动态、project动态中修改
|
9 years ago |
|
ouyangxuhua
|
594ce8a304
|
修改几个bug
|
9 years ago |
|
huang
|
e2fc88e3d1
|
课程讨论区样式混乱的问题
|
9 years ago |
|
ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
9 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
|
9 years ago |
|
huang
|
0ba724776e
|
项目版本库左侧添加提交次数统计
|
9 years ago |
|
huang
|
ff475fb00b
|
Merge branch 'szzh' into develop
|
9 years ago |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
9 years ago |
|
cxt
|
65563e6503
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
cxt
|
99cda66d00
|
编程作业：每次提交了测试集后，页面都会跳到作业页面的最底端，还得手动翻到页面最顶端，再点“发送”
|
9 years ago |
|
ouyangxuhua
|
6b44b93f0e
|
在通知详情页面，也有发送按钮
|
9 years ago |
|
cxt
|
5672b029fe
|
导入作业加提示语
|
9 years ago |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
9 years ago |
|
cxt
|
247924af26
|
动态内容显示不全
|
9 years ago |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
9 years ago |
|
cxt
|
f15847371c
|
附件显示过长
|
9 years ago |
|
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
9 years ago |
|
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
9 years ago |
|
huang
|
c7522067e6
|
修改base界面
|
9 years ago |
|
huang
|
01016c67a9
|
issue属性局部刷新
|
9 years ago |
|
Tim
|
c7edf0d73b
|
弹框样式修改
|
9 years ago |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
9 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
9 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
9 years ago |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
9 years ago |
|
huang
|
18c3c23d2c
|
课程推荐
|
9 years ago |
|
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
9 years ago |
|
cxt
|
945ed84276
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
b64fc1771d
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
ouyangxuhua
|
18e79ba9b3
|
未登陆情况下，可以看到组织文章列表及首页全部内容
|
9 years ago |
|
Tim
|
a3c30ee965
|
issue上传附件样式修改
|
9 years ago |
|
ouyangxuhua
|
e70e1beb5d
|
Merge branch 'szzh' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
7acfc22ee1
|
未登陆情况下，访问组织栏目增加margin-top:10px,已使样式正常
|
9 years ago |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
9 years ago |
|
cxt
|
8e9c4bab6b
|
赞增加tip
|
9 years ago |
|
cxt
|
6e582fa631
|
老师评阅作品时可以不写评语，只有学生匿评的时候才强制写评语
|
9 years ago |
|
huang
|
b93b86b9a0
|
创建课程发送board
|
9 years ago |
|
cxt
|
7f7d0ac6f7
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
cxt
|
b4521d3582
|
课程/项目首页的更多默认收起
|
9 years ago |
|
cxt
|
c5935a6a46
|
博客动态添加点赞
|
9 years ago |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
9 years ago |
|
cxt
|
9cabb0248a
|
已点过赞的动态显示”已赞“
|
9 years ago |
|
ouyangxuhua
|
5e102d24dd
|
解决个人博客报500的问题
|
9 years ago |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
9 years ago |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
9 years ago |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
9 years ago |
|
ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
9 years ago |
|
huang
|
8b815f95bb
|
Merge branch 'develop' into hjq_new_course
|
9 years ago |
|
huang
|
b2746d0953
|
课程讨论区总数计入回复数
|
9 years ago |
|
huang
|
f52e74da61
|
修改issues总数读取方式
|
9 years ago |
|
huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
huang
|
c936304314
|
课程默认收起
|
9 years ago |
|
ouyangxuhua
|
b9359b1cee
|
显示url申请
|
9 years ago |
|
huang
|
b6ae14a1ce
|
课程更多字体12
|
9 years ago |
|
huang
|
81b32ea643
|
点击铃铛弹出新tab页
|
9 years ago |
|
huang
|
157502d450
|
精品课程
|
9 years ago |
|
cxt
|
902cfdcbe9
|
课程/项目的创建动态不需要显示更新时间
|
9 years ago |
|
cxt
|
c49a290d56
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
9 years ago |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
9 years ago |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
9 years ago |
|
ouyangxuhua
|
5097f19ec8
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/layouts/_user_projects.html.erb
app/views/projects/set_public_or_private.js.erb
|
9 years ago |
|
ouyangxuhua
|
1c62edbed4
|
项目设为私有title更新
|
9 years ago |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
9 years ago |
|
cxt
|
894c97304c
|
冲突
|
9 years ago |
|
cxt
|
25cc959576
|
Merge branch 'szzh' into develop
Conflicts:
app/views/layouts/_user_courses.html.erb
app/views/org_subfields/show.html.erb
app/views/organizations/_subfield_list.html.erb
app/views/users/_resource_share_for_orgs.html.erb
|
9 years ago |
|
cxt
|
cef9fd96cd
|
组织帖子的动态点赞
|
9 years ago |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
9 years ago |
|
ouyangxuhua
|
276b07df8a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
9 years ago |
|
huang
|
09d2796ca7
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
处理冲突
|
9 years ago |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
9 years ago |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
9 years ago |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
26631e2199
|
关联项目的提交次数
|
9 years ago |
|
cxt
|
0ffce929f4
|
项目讨论区的动态点赞
|
9 years ago |
|
huang
|
6daa04b413
|
登录页面提示修改
|
9 years ago |
|
ouyangxuhua
|
93570249c0
|
Merge branch 'dev_hjq' into szzh
|
9 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
9 years ago |
|
ouyangxuhua
|
a21465343c
|
组织栏目编辑状态样式更新
|
9 years ago |
|
huang
|
f3402e4fa4
|
项目得分新计算
|
9 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
9 years ago |
|
huang
|
49d456bf21
|
修改数据统计信息
|
9 years ago |
|
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
9 years ago |
|
ouyangxuhua
|
324513fc94
|
组织栏目子目录功能实现
|
9 years ago |
|
cxt
|
bf6f46174e
|
课程讨论区回复的点赞
|
9 years ago |
|
cxt
|
093574ebef
|
首页课程讨论区动态的点赞
|
9 years ago |
|
Tim
|
893e5dc7f3
|
针对课程370的精品课程样式设计
|
9 years ago |
|
guange
|
d935532f8d
|
课程讨论区at功能
|
9 years ago |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
9 years ago |
|
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性，使用局部刷新
|
9 years ago |
|
cxt
|
53a45908e9
|
关联项目的提交次数
|
9 years ago |
|
cxt
|
efb5d05551
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
9 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
处理冲突
|
9 years ago |
|
huang
|
8f989a962d
|
修改项目总分统计
|
9 years ago |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
9 years ago |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
9 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
|
64088f5a21
|
项目数据存入数据库（统计数据直接从数据库获取）
|
10 years ago |
|
cxt
|
e04926f2e7
|
关联项目的提交次数
|
10 years ago |
|
Tim
|
46217fb85d
|
切换分支后新出现文件
|
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 |
|
ouyangxuhua
|
48f931deba
|
隐藏组织的课程/项目快捷菜单
|
10 years ago |
|
ouyangxuhua
|
2f5ada2d7b
|
博客设为首页后，显示在个人主页处
|
10 years ago |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
10 years ago |
|
huang
|
f3b732460c
|
添加项目统计字段
|
10 years ago |
|
huang
|
525d1544c2
|
代码样式
|
10 years ago |
|
cxt
|
a3a16b5591
|
问题跟踪、作业列表页面“展开更多”改为“点击展开更多”
|
10 years ago |
|
huang
|
28c3dca099
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
bb0a03b309
|
若无任何个人留言，或者当前用户无权限看到任何个人留言，不要显示白框
|
10 years ago |
|
huang
|
8c10ce6fee
|
修改组织500问题
|
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 |
|
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 |
|
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 |
|
Tim
|
125479f671
|
课程复制样式调整
|
10 years ago |
|
ouyangxuhua
|
9e286ef8a5
|
对于当前用户，鼠标经过该用户头像显示详细信息时，有编辑资料按钮
|
10 years ago |
|
ouyangxuhua
|
178f9e167c
|
1.申请子域名时，对子域名进行规范，仅能输入字母、数字和下划线；
2.博客主页，添加取消主页按钮；
3.私信只能发送者和接收者能看到
|
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 |
|
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
|
470f45becd
|
课程讨论区（未完）
|
10 years ago |
|
ouyangxuhua
|
abf6b5ff70
|
解决base_org上传资源按钮不能正常上传的问题
|
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
|
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
|
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 |
|
ouyangxuhua
|
358510a2e6
|
解决组织配置资源栏目中，增加/删除栏目不能更新的问题
|
10 years ago |
|
ouyangxuhua
|
373e40f4fd
|
未登陆情况下，不能发布帖子
|
10 years ago |
|
ouyangxuhua
|
22be66f85c
|
课程/项目帖子中，用户在登陆情况下即可发送帖子
|
10 years ago |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
10 years ago |
|
lizanle
|
2c7ef034cb
|
资源库更改
|
10 years ago |
|
cxt
|
2c5a4f8a13
|
发布和编辑作业时的启用匿评改为禁用匿评，默认不选中
|
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 |
|
ouyangxuhua
|
2271befedd
|
修正组织部分页面的样式
|
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 |
|
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 |
