 cxt
|
5672b029fe
|
导入作业加提示语
|
10 years ago |
 ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
10 years ago |
|
cxt
|
247924af26
|
动态内容显示不全
|
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
|
01016c67a9
|
issue属性局部刷新
|
10 years ago |
 Tim
|
c7edf0d73b
|
弹框样式修改
|
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 |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
10 years ago |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
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 |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
10 years ago |
|
cxt
|
8e9c4bab6b
|
赞增加tip
|
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
|
c5935a6a46
|
博客动态添加点赞
|
10 years ago |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
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 |
|
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 |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
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 |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 years ago |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
10 years ago |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
26631e2199
|
关联项目的提交次数
|
10 years ago |
|
cxt
|
0ffce929f4
|
项目讨论区的动态点赞
|
10 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
10 years ago |
|
cxt
|
bf6f46174e
|
课程讨论区回复的点赞
|
10 years ago |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
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 |
|
cxt
|
e04926f2e7
|
关联项目的提交次数
|
10 years ago |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
cxt
|
96a28fe5b5
|
博客动态添加更新时间
|
10 years ago |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
10 years ago |
|
ouyangxuhua
|
2f5ada2d7b
|
博客设为首页后，显示在个人主页处
|
10 years ago |
|
huang
|
525d1544c2
|
代码样式
|
10 years ago |
|
cxt
|
a3a16b5591
|
问题跟踪、作业列表页面“展开更多”改为“点击展开更多”
|
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 |
|
ouyangxuhua
|
0ac99571de
|
样式调整
|
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
|
0ab500986a
|
发送搜索功能
|
10 years ago |
|
ouyangxuhua
|
d574521b48
|
样式更新
|
10 years ago |
|
ouyangxuhua
|
7f465d1766
|
修改bug
|
10 years ago |
|
huang
|
dc90976497
|
项目资源库添加 “发送”功能
|
10 years ago |
|
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页
|
10 years ago |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
10 years ago |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
10 years ago |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
10 years ago |
|
ouyangxuhua
|
9e286ef8a5
|
对于当前用户，鼠标经过该用户头像显示详细信息时，有编辑资料按钮
|
10 years ago |
|
ouyangxuhua
|
178f9e167c
|
1.申请子域名时，对子域名进行规范，仅能输入字母、数字和下划线；
2.博客主页，添加取消主页按钮；
3.私信只能发送者和接收者能看到
|
10 years ago |
|
cxt
|
5e0ee0426a
|
作业动态的附件放在扣分上面
|
10 years ago |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
10 years ago |
|
cxt
|
1263e4cac0
|
关联项目的样式修改
|
10 years ago |
|
ouyangxuhua
|
80668d6a47
|
增加以下功能：
鼠标经过用户头像时，显示用户的详细信息，并且可以添加/取消关注，可以私信/留言。
|
10 years ago |
|
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
10 years ago |
|
Tim
|
e9d986b311
|
课程关联项目样式调整
|
10 years ago |
|
cxt
|
cf125159f2
|
关联项目增加提交次数
|
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 |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
10 years ago |
|
huang
|
be218baa52
|
添加迁移：项目讨论区数据重复问题
|
10 years ago |
|
cxt
|
0a2d2a539f
|
关联项目的组长名字加个title
|
10 years ago |
|
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
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
|
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
|
7e76a32480
|
项目/课程讨论区的动态增加设置菜单
|
10 years ago |
|
lizanle
|
2c7ef034cb
|
资源库更改
|
10 years ago |
|
cxt
|
2c5a4f8a13
|
发布和编辑作业时的启用匿评改为禁用匿评，默认不选中
|
10 years ago |
|
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
a85a3339bb
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
10 years ago |
|
lizanle
|
fd4d2910d0
|
课程发送资源 以及 项目发送资源
|
10 years ago |
|
lizanle
|
1d0e6e1c5c
|
课程发送资源 以及 项目发送资源
|
10 years ago |
|
huang
|
743950d264
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
lizanle
|
659f322ca2
|
send resource to org
|
10 years ago |
|
lizanle
|
c425106d0b
|
目标地址样式修改
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
41cd038758
|
讨论区帖子添加锁定
|
10 years ago |
|
cxt
|
000f40ad42
|
作业动态的截止时间根据作业当前所处状态来确定是提交截止时间还是匿评截止时间
|
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 |
