 huang
|
e2fc88e3d1
|
课程讨论区样式混乱的问题
|
10 years ago |
 ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
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
|
0ba724776e
|
项目版本库左侧添加提交次数统计
|
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 |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
10 years ago |
 cxt
|
65563e6503
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
99cda66d00
|
编程作业：每次提交了测试集后，页面都会跳到作业页面的最底端，还得手动翻到页面最顶端，再点“发送”
|
10 years ago |
|
ouyangxuhua
|
6b44b93f0e
|
在通知详情页面，也有发送按钮
|
10 years ago |
|
cxt
|
5672b029fe
|
导入作业加提示语
|
10 years ago |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
10 years ago |
|
cxt
|
247924af26
|
动态内容显示不全
|
10 years ago |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
10 years ago |
|
huang
|
7de48f143e
|
issue状态修改
|
10 years ago |
|
cxt
|
f15847371c
|
附件显示过长
|
10 years ago |
|
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
10 years ago |
|
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
10 years ago |
|
huang
|
c7522067e6
|
修改base界面
|
10 years ago |
|
huang
|
01016c67a9
|
issue属性局部刷新
|
10 years ago |
 Tim
|
c7edf0d73b
|
弹框样式修改
|
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
|
f3b5f4e5f7
|
修改浏览器tab页通过不同的模块展示不同内容
|
10 years ago |
|
huang
|
0db69e1ebf
|
解决课程导语时间和课程创建动态时间一致的问题
|
10 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
10 years ago |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
10 years ago |
|
huang
|
c5d935108e
|
完成课程按tag搜索推荐
|
10 years ago |
|
huang
|
18c3c23d2c
|
课程推荐
|
10 years ago |
|
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
10 years ago |
|
cxt
|
945ed84276
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 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
|
10 years ago |
|
ouyangxuhua
|
18e79ba9b3
|
未登陆情况下，可以看到组织文章列表及首页全部内容
|
10 years ago |
|
Tim
|
a3c30ee965
|
issue上传附件样式修改
|
10 years ago |
|
ouyangxuhua
|
e70e1beb5d
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
7acfc22ee1
|
未登陆情况下，访问组织栏目增加margin-top:10px,已使样式正常
|
10 years ago |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
10 years ago |
|
ouyangxuhua
|
d0c2eabddd
|
未登陆情况下，也能下载组织下的文件
|
10 years ago |
|
cxt
|
e293805488
|
点击在线问卷时若未登录则直接跳到登录页面
|
10 years ago |
|
huang
|
610b54b27c
|
课程导语放置课程动态之后
|
10 years ago |
|
cxt
|
8e9c4bab6b
|
赞增加tip
|
10 years ago |
|
cxt
|
6e582fa631
|
老师评阅作品时可以不写评语，只有学生匿评的时候才强制写评语
|
10 years ago |
|
huang
|
5862c16c68
|
完成精品课程推荐
过滤掉私有课程
过滤掉已删除的课程
|
10 years ago |
|
huang
|
b93b86b9a0
|
创建课程发送board
|
10 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
|
10 years ago |
|
cxt
|
b4521d3582
|
课程/项目首页的更多默认收起
|
10 years ago |
|
cxt
|
c5935a6a46
|
博客动态添加点赞
|
10 years ago |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
10 years ago |
|
cxt
|
9cabb0248a
|
已点过赞的动态显示”已赞“
|
10 years ago |
|
ouyangxuhua
|
5e102d24dd
|
解决个人博客报500的问题
|
10 years ago |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
10 years ago |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
10 years ago |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
10 years ago |
|
ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
10 years ago |
|
huang
|
8b815f95bb
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
b2746d0953
|
课程讨论区总数计入回复数
|
10 years ago |
|
huang
|
f52e74da61
|
修改issues总数读取方式
|
10 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
|
10 years ago |
|
huang
|
86516df88a
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
huang
|
c936304314
|
课程默认收起
|
10 years ago |
|
ouyangxuhua
|
b9359b1cee
|
显示url申请
|
10 years ago |
|
huang
|
b6ae14a1ce
|
课程更多字体12
|
10 years ago |
|
huang
|
81b32ea643
|
点击铃铛弹出新tab页
|
10 years ago |
|
huang
|
157502d450
|
精品课程
|
10 years ago |
|
cxt
|
902cfdcbe9
|
课程/项目的创建动态不需要显示更新时间
|
10 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
|
10 years ago |
|
ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
10 years ago |
|
ouyangxuhua
|
def640cd31
|
Merge branch 'dev_hjq' into develop
|
10 years ago |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
10 years ago |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
10 years ago |
|
huang
|
9bbb1e0f90
|
修改fork时候项目ID问题
|
10 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
|
10 years ago |
|
ouyangxuhua
|
1c62edbed4
|
项目设为私有title更新
|
10 years ago |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
10 years ago |
|
cxt
|
894c97304c
|
冲突
|
10 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
|
10 years ago |
|
cxt
|
57cfe49602
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
cef9fd96cd
|
组织帖子的动态点赞
|
10 years ago |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
276b07df8a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 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
处理冲突
|
10 years ago |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
10 years ago |
|
cxt
|
7b4b575240
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
eb63ac59f2
|
作品提交不成功
|
10 years ago |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
10 years ago |
|
huang
|
e9b54ad012
|
删除附件的时候减掉得分
|
10 years ago |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
01e8730b25
|
issue回复添加到积分统计
|
10 years ago |
|
huang
|
286418b63c
|
修改课程讨论区500问题
|
10 years ago |
|
cxt
|
26631e2199
|
关联项目的提交次数
|
10 years ago |
|
cxt
|
0ffce929f4
|
项目讨论区的动态点赞
|
10 years ago |
|
huang
|
6daa04b413
|
登录页面提示修改
|
10 years ago |
|
ouyangxuhua
|
93570249c0
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
ouyangxuhua
|
a21465343c
|
组织栏目编辑状态样式更新
|
10 years ago |
|
huang
|
f3402e4fa4
|
项目得分新计算
|
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 |
|
huang
|
5fe4e9e813
|
创建项目的时候创建项目得分记录
|
10 years ago |
|
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
10 years ago |
|
cxt
|
c63af51001
|
项目动态数更新
|
10 years ago |
|
huang
|
e808f0bc61
|
提交新迁移
|
10 years ago |
|
cxt
|
27617044a1
|
课程项目报500
|
10 years ago |
|
ouyangxuhua
|
324513fc94
|
组织栏目子目录功能实现
|
10 years ago |
|
cxt
|
bf6f46174e
|
课程讨论区回复的点赞
|
10 years ago |
|
cxt
|
093574ebef
|
首页课程讨论区动态的点赞
|
10 years ago |
|
cxt
|
0d2101bc30
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
5c1ff1f6f7
|
关联项目时不显示已删除的项目
|
10 years ago |
|
Tim
|
893e5dc7f3
|
针对课程370的精品课程样式设计
|
10 years ago |
guange
|
d935532f8d
|
课程讨论区at功能
|
10 years ago |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
10 years ago |
|
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性，使用局部刷新
|
10 years ago |
|
cxt
|
53a45908e9
|
关联项目的提交次数
|
10 years ago |
|
cxt
|
efb5d05551
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
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
|
8f989a962d
|
修改项目总分统计
|
10 years ago |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
10 years ago |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
10 years ago |
|
huang
|
7697dadbea
|
版本库统计次数刷新版本库的时候自动更新
|
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 |
|
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 |
|
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 |
|
huang
|
a92d33300b
|
里程碑 添加 “已解决”，区分已解决和已关闭
|
10 years ago |
|
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
10 years ago |
|
huang
|
f7f03b2094
|
0
|
10 years ago |
|
huang
|
8639609832
|
切换分支--暂时待处理
|
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 |
|
guange
|
22d8fc9abd
|
作业附件乱码优化
|
10 years ago |
|
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
10 years ago |
|
huang
|
0e68266f49
|
版本库显示调整
|
10 years ago |
|
cxt
|
1a042fd822
|
组织首页的加载更多动态重复加载
|
10 years ago |
|
cxt
|
6f12ba883d
|
学生作品列表的tag显示不对
|
10 years ago |
|
huang
|
4111cb53dc
|
解决fork部分项目404问题
|
10 years ago |
|
cxt
|
c8760445ab
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
a5cc1390f2
|
学生匿评打分时必须填写评语
|
10 years ago |
 houxiang
|
240a859f2d
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
houxiang
|
21461fb583
|
修正了以前的方法调用 by 侯翔
|
10 years ago |
|
huang
|
471e5f5370
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
houxiang
|
3e57237969
|
修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔
|
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
|
c29ab5dc6d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
1a549eda46
|
版本库显示问题
|
10 years ago |
|
huang
|
c381ce177f
|
解决通知太长不能发的问题
|
10 years ago |
|
huang
|
ab1397d982
|
恢复版本
|
10 years ago |
|
huang
|
73f0d70e23
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
huang
|
3de4c7129a
|
版本库读取错误问题
|
10 years ago |
|
lizanle
|
31cbf3fbce
|
onchange函数去掉
|
10 years ago |
|
lizanle
|
60381fded5
|
表单长度对齐
|
10 years ago |
|
lizanle
|
4630576146
|
issue的创建成功不需要提示sucess
|
10 years ago |
|
lizanle
|
480775f2b9
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
538c64329f
|
issue的修改
|
10 years ago |
|
cxt
|
84f6ec0978
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
65022f03cb
|
作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新
|
10 years ago |
|
huang
|
4092401e68
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
d2ba950044
|
绝对成
|
10 years ago |
|
huang
|
5941d41b19
|
测试
|
10 years ago |
|
cxt
|
c073e56b79
|
学生匿评必须添加评语
|
10 years ago |
|
huang
|
747493993b
|
上线测试
|
10 years ago |
|
cxt
|
e7db03f271
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
459e1f332b
|
编辑分组作品时如果不修改分组成员则不能提交
|
10 years ago |
|
guange
|
e9a45012f8
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
08cd3808ad
|
ke引用错误
|
10 years ago |
|
huang
|
e673540323
|
还原提交次数
|
10 years ago |
|
cxt
|
6a563d4256
|
匿评结束后不可修改作业的截止日期，作业发布后不可修改作业的发布日期
|
10 years ago |
|
huang
|
4dda355d2e
|
测试版
|
10 years ago |
|
lizanle
|
a657a5b98d
|
课程留言 重复提交问题
|
10 years ago |
|
cxt
|
902570173d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
lizanle
|
a1d0bf43ee
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
009dc089f0
|
资源库重命名修改
|
10 years ago |
|
ouyangxuhua
|
714dfdc2d5
|
解决组织资源栏目点击上传资源没反应的问题
|
10 years ago |
|
cxt
|
8769d6af4f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
108448cf4d
|
课程讨论区的加载更多
|
10 years ago |
|
guange
|
e02b865fa6
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
ea51b24a4e
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
57b1c0c7d8
|
at是否开启加入到配置
|
10 years ago |
|
guange
|
f4d861c727
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
d0e139650f
|
issue回复的at出错
|
10 years ago |
|
cxt
|
63f9601c15
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
guange
|
c38191eb42
|
问题回复at
|
10 years ago |
|
cxt
|
7ce8e330c3
|
课程留言动态的显示
|
10 years ago |
|
huang
|
a080306f75
|
解决课程动态中，点击按钮，提交多次的问题
|
10 years ago |
|
lizanle
|
0ed7d84914
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
084844941f
|
个人单位修改。
聚焦就搜索所有的学校
|
10 years ago |
|
cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
10 years ago |
|
cxt
|
ba4c93e4c4
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
a7c006c59f
|
课程讨论区的展开更多不可用
|
10 years ago |
|
huang
|
8a53978d23
|
项目得分更新
|
10 years ago |
|
lizanle
|
eb02a3d34a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
70f93741d6
|
issue图标问题
|
10 years ago |
|
ouyangxuhua
|
b3b5bc7ffd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
85bc9ce43d
|
解决组织模块的一些bug
|
10 years ago |
|
cxt
|
c230ff5bed
|
普通作业提交报500
|
10 years ago |
|
cxt
|
ca77af9221
|
作业动态添加扣分规则
|
10 years ago |
|
cxt
|
b65e84d166
|
未答测验的学生在测验截止时间到了后算作零分
|
10 years ago |
|
lizanle
|
e867358bc1
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
06734d86ca
|
attachment_acts页面变量错误
|
10 years ago |
|
guange
|
8c967e6559
|
格式改进
|
10 years ago |
|
guange
|
e8cf5d1042
|
at消息html代码问题
|
10 years ago |
|
guange
|
39ad191dd0
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
b4016faeb6
|
编辑框消失
|
10 years ago |
|
lizanle
|
47b20d3639
|
journal不应该算入ForgeActivity
|
10 years ago |
|
cxt
|
2faddd7d75
|
分组设置中的基于项目实施默认勾选
|
10 years ago |
|
lizanle
|
f3f64b8655
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5d47afdc43
|
issue 删除回复的权限问题
|
10 years ago |
|
huang
|
b34b1181b7
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
4ca177970b
|
fork点击提示
|
10 years ago |
|
lizanle
|
38c3422b83
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
0659015ada
|
issue 多了一个提交按钮和时间显示
|
10 years ago |
|
guange
|
d703f75c98
|
merge
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
huang
|
5259831224
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
huang
|
b87943ff1d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
guange
|
b69f5f0da3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
c98e9fc639
|
查看作业代码着色
|
10 years ago |
|
houxiang
|
fc2eae4c62
|
add something by hx
|
10 years ago |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
3b25616f0c
|
编辑作品时可编辑分组成员
|
10 years ago |
|
cxt
|
c7f321475a
|
多选题错判
|
10 years ago |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
10 years ago |
|
guange
|
716604903b
|
修复讨论区at错误
|
10 years ago |
|
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
10 years ago |
|
guange
|
923cb3c84f
|
中文报错
|
10 years ago |
|
lizanle
|
1809a93770
|
editor修改
|
10 years ago |
|
cxt
|
a2ebaa0729
|
分组作业提交作品时如果关联了项目则从项目成员中添加分组成员
|
10 years ago |
|
lizanle
|
505d1b5546
|
editor修改
|
10 years ago |
|
lizanle
|
4bc68081ee
|
editor修改
|
10 years ago |
|
guange
|
fc63dfcb7b
|
消息通知
|
10 years ago |
|
ouyangxuhua
|
de229c0f1c
|
组织资源栏目的文件可以被引用至当前组织下的资源栏目
|
10 years ago |
|
huang
|
2d2329a1e0
|
代码定位问题
|
10 years ago |
|
lizanle
|
b02cb6fdd4
|
issue的修改如果更改issue的类型，那么就会有问题。需要重新新建editor
|
10 years ago |
|
lizanle
|
31c57b78bf
|
issue的修改如果更改issue的类型，那么就会有问题。需要重新新建editor
|
10 years ago |
|
cxt
|
89d3d3821c
|
分组作业的导入
|
10 years ago |
|
lizanle
|
c183574a5e
|
博客回复
|
10 years ago |
|
cxt
|
51e082a551
|
编辑和新建作品时的样式和提示信息调整
|
10 years ago |
|
cxt
|
fa0f9c6751
|
分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置
|
10 years ago |
|
ouyangxuhua
|
acb604883d
|
项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。
|
10 years ago |
|
cxt
|
ff579afd45
|
作业动态中添加分组人数
|
10 years ago |
|
lizanle
|
0a3c5f6acc
|
issues如果标题为空需要弹框报错
|
10 years ago |
|
cxt
|
a8c8dc3cc6
|
关联项目的提示信息修改
|
10 years ago |
|
lizanle
|
71f6a637e0
|
帖子按时间倒排
|
10 years ago |
|
lizanle
|
ffd8d55aa6
|
memo更新时间
|
10 years ago |
|
huang
|
bb23049f55
|
版本库提交次数封装
提交页面样式修改
|
10 years ago |
|
lizanle
|
66f88cdf5a
|
issue 文件
|
10 years ago |
|
lizanle
|
a0035a4c1e
|
issue 查询
|
10 years ago |
|
guange
|
c0de5d55de
|
加入了issue的at消息提醒
|
10 years ago |
|
cxt
|
ab96bf8e5e
|
作品列表中未参与匿评的作品显示“未参与”
|
10 years ago |
|
lizanle
|
b13ae8f599
|
issue
|
10 years ago |
|
cxt
|
dc0f004021
|
关联项目的提示信息
|
10 years ago |
|
ouyangxuhua
|
0fef18312d
|
鼠标经过资源栏目TAG时，变成手型
|
10 years ago |
|
lizanle
|
2aa241bffa
|
issue
|
10 years ago |
|
cxt
|
5cf88a287b
|
分组作业提示语的修改
|
10 years ago |
|
ouyangxuhua
|
977100e92e
|
双击资源栏目标签可编辑，编辑标签后更新标签
|
10 years ago |
|
huang
|
85d277da0d
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
98d0e6d411
|
版本库“提交明细”
|
10 years ago |
|
lizanle
|
02a9f08fe6
|
表单长度对齐
|
10 years ago |
|
huang
|
ac8aa9e0a6
|
解决作业留言和课程留言导致的bug
|
10 years ago |
|
huang
|
41bb37d6d4
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
解决冲突
|
10 years ago |
|
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
10 years ago |
|
lizanle
|
47a9be132a
|
详情和编辑页面
|
10 years ago |
|
ouyangxuhua
|
8d7a84285b
|
资源栏目在搜索结果中，更新相应的tag数量
|
10 years ago |
|
ouyangxuhua
|
704954583b
|
资源栏目新增Tag后，更新相应的tag数量
|
10 years ago |
|
lizanle
|
8d1003770a
|
在本页面重复修改的时候，由于edit页面没有更新，导致issue更新触发乐观锁。lock_version比数据库记录存在的lock_version更低，所以回滚。
|
10 years ago |
|
cxt
|
097d0653ba
|
注释掉给未答题的学生0分的代码
|
10 years ago |
|
cxt
|
481b7b96eb
|
正式版报500
|
10 years ago |
|
lizanle
|
68aceaa7df
|
issue下载
|
10 years ago |
|
cxt
|
fa4a2eb0dd
|
未答题的学生测验分数为0
|
10 years ago |
|
lizanle
|
b7ae8d866f
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
10 years ago |
|
lizanle
|
ef2f142f62
|
论坛资源允许下载
|
10 years ago |
|
cxt
|
f7a932d7b9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
dc45321454
|
组织文章二级回复代码被覆盖，恢复代码
|
10 years ago |
|
cxt
|
44ce4fe592
|
多次点击留言不会重复提交
|
10 years ago |
|
cxt
|
45726576cf
|
学生测验列表的点击
|
10 years ago |
|
ouyangxuhua
|
af157a9c63
|
组织资源栏目增加标签功能
|
10 years ago |
|
cxt
|
086cfa3867
|
学生列表不可点击
|
10 years ago |
|
guange
|
4ce9eb428e
|
at样式问题
|
10 years ago |
|
cxt
|
90c7822c38
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
72c475e8a2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
d6c2b95858
|
学生测验列表的提示信息
|
10 years ago |
|
cxt
|
0215e5e38c
|
若测验已截止且学生已提交则在测验列表后面显示“已答”
|
10 years ago |
|
cxt
|
0deffdba33
|
在线测验学生答题时可点击保存也可点击提交
|
10 years ago |
|
Tim
|
b687c42de3
|
Merge branch 'dev_zanle' of https://git.trustie.net/jacknudt/trustieforge into dev_zanle
|
10 years ago |
|
Tim
|
b761121f9f
|
"指派给"颜色更换
|
10 years ago |
|
guange
|
da5709e3f0
|
.
|
10 years ago |
|
cxt
|
0b25f36a7f
|
在线测验再次编辑时默认隐藏头部编辑块
|
10 years ago |
|
ouyangxuhua
|
d9df926c2b
|
组织添加项目/组织弹窗，点击取消后，关闭弹窗。
|
10 years ago |
|
cxt
|
1f4454d908
|
课程左侧的在线测验统计数
|
10 years ago |
|
ouyangxuhua
|
3efb36a28e
|
在组织非资源栏目页面中，添加资源后跳转至资源栏目页面。
|
10 years ago |
|
guange
|
8d797c5c0b
|
项目动态添加at
|
10 years ago |
|
huang
|
ea1849e51f
|
去掉邮件token值
|
10 years ago |
|
lizanle
|
88c2db47b7
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
d1315e35b5
|
merge
|
10 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
10 years ago |
|
cxt
|
2b5bf9540d
|
关闭了匿评再补交作品，给学生的提示信息中“当前作业已开启匿评...”改为“当前作业已关闭匿评...”
|
10 years ago |
|
cxt
|
438ae82980
|
非课程学生不能关联项目
|
10 years ago |
|
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
10 years ago |
|
cxt
|
85b11010d2
|
在线测验报500、 学生看不到已截止的测验、测验列表的样式调整
|
10 years ago |
|
lizanle
|
f3013ca3e7
|
修改了搜索的提示描述
|
10 years ago |
|
lizanle
|
c5f903146d
|
博客资源下载问题
|
10 years ago |
|
lizanle
|
9aebafee09
|
课程添加更新时间
|
10 years ago |
|
lizanle
|
14912078ee
|
博客资源允许下载
|
10 years ago |
|
ouyangxuhua
|
b72cc82e4d
|
组织资源栏目添加文件标签功能
|
10 years ago |
|
lizanle
|
85e2eab8c3
|
发送资源
|
10 years ago |
|
huang
|
5ca8d4cd66
|
修改http链接自动换域名
|
10 years ago |
|
lizanle
|
c004b05991
|
资源库搜索 sql注入
|
10 years ago |
|
lizanle
|
f6867068f5
|
项目 帖子 更新时间
资源 下载次数
用户 最后登陆时间
|
10 years ago |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
10 years ago |
|
lizanle
|
9b86ec3044
|
更新时间
|
10 years ago |
|
cxt
|
eb8e9f32a3
|
作品列表的私有项目不可点击
|
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
|
dfd0c95f2a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
616679e9c1
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
42f0fc62e9
|
分组成员不能修改作品
|
10 years ago |
|
cxt
|
1d2b6165ef
|
分组作业报500
|
10 years ago |
|
huang
|
6b9a612594
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
0ac4821f14
|
修改密码导航栏错误
|
10 years ago |
|
lizanle
|
df1d1a4685
|
论坛上传资源没有保存成功
|
10 years ago |
|
cxt
|
1674391e4b
|
若删除追加的附件，则“追加附件”字样及“追加时间”也应删除
|
10 years ago |
|
ouyangxuhua
|
c2d21b5a6b
|
隐藏组织栏目资源列表
|
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
|
be590497b9
|
组织文章设为首页后，跳转至首页
|
10 years ago |
|
cxt
|
6c9a139450
|
编辑分组作业的作品报500
|
10 years ago |
|
cxt
|
ac77f0d40a
|
点击学号、班级也要弹出答题详情页面
|
10 years ago |
|
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型，可以添加文件、删除文件、显示文件等
|
10 years ago |
|
cxt
|
d4bde8e73c
|
调整学生作品列表的样式
|
10 years ago |
|
lizanle
|
b178fb7f0a
|
消息提醒 病句
|
10 years ago |
|
huang
|
b981f3dcea
|
修复项目删除403问题
课程回复的时候不显示删除按钮
|
10 years ago |
|
lizanle
|
abc0598ed2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
03318aac97
|
登录名不可修改要变成灰色
|
10 years ago |
|
cxt
|
c6470bc69b
|
提交作品选择分组成员时若某一个学生已加入到其他分组则不可选择
|
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 |
|
lizanle
|
ec79ed04ee
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
b6607f7418
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
f2b8335912
|
移出成员时，删除项目后没有关联删除而引起的400问题
|
10 years ago |
|
huang
|
fed989753a
|
修复林处账号不能查看消息的问题
|
10 years ago |
|
huang
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
10 years ago |
|
huang
|
9c472b9358
|
课程成员列表乱的问题
|
10 years ago |
|
huang
|
35c918cb40
|
Merge branch 'hjq_new_course' into develop
|
10 years ago |
|
huang
|
fbd1b2f541
|
用户留言重复提交问题
|
10 years ago |
|
huang
|
01b21ceda1
|
项目留言重复提交问题
|
10 years ago |
|
huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
10 years ago |
|
cxt
|
ba5d72b315
|
管理员查看在线测验的权限
|
10 years ago |
|
huang
|
670df76c70
|
注释掉项目邀请加入功能
|
10 years ago |
|
huang
|
9710731a2c
|
课程配置添加登录名
|
10 years ago |
|
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
10 years ago |
|
huang
|
a9510f4869
|
Merge branch 'dev_hjq' into develop
|
10 years ago |
|
huang
|
4f7f4acb1f
|
课程删除
|
10 years ago |
|
ouyangxuhua
|
aab9594ac9
|
1.解决英文版下，组织成员列表编辑成员显示错误；
2.解决在组织文章详情页面，删除文章报错的问题
|
10 years ago |
|
houxiang
|
87be2dd7fe
|
modify the repositories_controller.rb conflict
|
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 |
|
houxiang
|
e9cfe007bb
|
modify by hx
|
10 years ago |
|
huang
|
dbadbf8621
|
修改密码gitlab同步
|
10 years ago |
|
ouyangxuhua
|
0a85fbf613
|
1.配置栏目列表，增加类型一列；
2.暂时隐藏类型为“资源”的栏目的链接
|
10 years ago |
|
huang
|
74fe2607f3
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
1e652faec7
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
huang
|
4e0b442309
|
修改邮箱的时候同步到gitlab
|
10 years ago |
|
lizanle
|
7f866a0b3a
|
课程被删除后不能被搜索
|
10 years ago |
|
ouyangxuhua
|
2f7260cba2
|
1.在栏目表中增加field_type(类型)字段；
2.在组织配置-》栏目，增加栏目类型。
|
10 years ago |
|
huang
|
db582fd639
|
修改不同分支之间的显示最新提交状态
|
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 |
|
cxt
|
f2f81d5243
|
作品列表的代码缩进
|
10 years ago |
|
ouyangxuhua
|
333c0e41a0
|
1.栏目增加新建帖子功能；
2.点击某栏目，显示相应的动态；
3.编辑栏目里的文章后，返回相应的栏目动态。
|
10 years ago |
|
cxt
|
53f9141cf1
|
分组作业动态
|
10 years ago |
|
lizanle
|
6c02115f3f
|
不允许修改登录名
|
10 years ago |
|
guange
|
3476731b83
|
将at js data整合到文件中
|
10 years ago |
|
lizanle
|
c1d82d6348
|
输入框 和 ke对齐
|
10 years ago |
|
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
cxt
|
c26778b41c
|
分组作业关联项目
|
10 years ago |
|
huang
|
ac9f13c842
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
Conflicts:
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
916d99be82
|
课程删除功能
|
10 years ago |
|
houxiang
|
56cb83ffba
|
版本库首页没有统计commit_count，具体的详情页在开始统计
|
10 years ago |
|
lizanle
|
92bc3361fe
|
匿评失败消息改变
|
10 years ago |
|
ouyangxuhua
|
1881e18742
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
bb7bcf46a9
|
1.设置首页后，跳转至组织首页
|
10 years ago |
|
huang
|
42f5b86d95
|
添加字段删除课程
|
10 years ago |
|
huang
|
7c34122ff6
|
fork的时候如果用户没有同步，则自动同步
|
10 years ago |
|
huang
|
068c305c06
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
Conflicts:
app/views/courses/member.html.erb
app/views/courses/settings.html.erb
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
lizanle
|
5fcbde2ff1
|
资源库监听回车键
|
10 years ago |
|
ouyangxuhua
|
8b14e7c549
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
ouyangxuhua
|
5198f4dde4
|
Merge branch 'dev_hjq' into develop
|
10 years ago |
|
ouyangxuhua
|
9d6b4783df
|
删除组织配置栏目的组织首页项
|
10 years ago |
|
ouyangxuhua
|
a8b7d1b81f
|
回复项目里的message,不增加项目动态及组织动态
|
10 years ago |
|
huang
|
91fa3f6fab
|
解决项目样式冲突问题
|
10 years ago |
|
lizanle
|
ee661bb6d4
|
input光光标到最后的折中解决方案
|
10 years ago |
|
ouyangxuhua
|
e45ce0fb95
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
lizanle
|
9e01f02a66
|
作业题目统一改为作业标题
作业匿评截止消息改造
|
10 years ago |
|
ouyangxuhua
|
76db95aa03
|
1.组织页面中，退出后刷新组织页面；
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
|
10 years ago |
|
lizanle
|
ad2d9fa374
|
添加对帖子的全文搜索
|
10 years ago |
|
cxt
|
cb7ad682cf
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
cxt
|
c8f4149206
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
8e999ed9f0
|
作业动态的回复删除功能只在鼠标进入时显示
|
10 years ago |
|
huang
|
5eb249515c
|
版本库显示样式
|
10 years ago |
|
guange
|
57d05d147e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
71a5504017
|
去除at功能,合并
|
10 years ago |
|
huang
|
9ff41c214b
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
9f30c7a44e
|
如果用户没有登陆，不能在组织页面中，增加项目或课程。
|
10 years ago |
|
ouyangxuhua
|
7057a4cfea
|
组织页首增加退出功能
|
10 years ago |
|
lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
10 years ago |
