 cxt
|
244e133803
|
关联项目的对齐
|
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
|
be218baa52
|
添加迁移：项目讨论区数据重复问题
|
10 years ago |
|
cxt
|
0a2d2a539f
|
关联项目的组长名字加个title
|
10 years ago |
|
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
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 |
 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 |
|
huang
|
ce740170ca
|
Merge branch 'hjq_new_course' into szzh
Conflicts:
public/stylesheets/public.css
处理冲突
|
10 years ago |
|
huang
|
cd36a6874e
|
修改issue动态错位
|
10 years ago |
|
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
10 years ago |
|
cxt
|
b8d8cece02
|
关联项目的样式修改
|
10 years ago |
|
cxt
|
ce5f0eb855
|
关联项目的样式修改
|
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 |
|
cxt
|
24542105f4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
ouyangxuhua
|
9e0b88c186
|
项目讨论区样式改成方块样式
|
10 years ago |
|
Tim
|
c405950469
|
课程关联项目列表显示调整
|
10 years ago |
|
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
10 years ago |
|
cxt
|
65022f03cb
|
作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新
|
10 years ago |
|
cxt
|
e7db03f271
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
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 |
|
cxt
|
6a563d4256
|
匿评结束后不可修改作业的截止日期，作业发布后不可修改作业的发布日期
|
10 years ago |
|
lizanle
|
a1d0bf43ee
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
009dc089f0
|
资源库重命名修改
|
10 years ago |
|
huang
|
ea51b24a4e
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
63f9601c15
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
7ce8e330c3
|
课程留言动态的显示
|
10 years ago |
|
huang
|
a080306f75
|
解决课程动态中，点击按钮，提交多次的问题
|
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 |
|
lizanle
|
70f93741d6
|
issue图标问题
|
10 years ago |
|
cxt
|
ca77af9221
|
作业动态添加扣分规则
|
10 years ago |
