 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
 cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
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
|
82b8cb77fd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
76b95fbf93
|
课程和项目的课程简介默认可显示20行
|
10 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
 huang
|
41cd038758
|
讨论区帖子添加锁定
|
10 years ago |
|
huang
|
5060ec26bb
|
项目讨论区
|
10 years ago |
guange
|
fd746c25f3
|
文件下载改为base64传输
|
10 years ago |
|
guange
|
22d8fc9abd
|
作业附件乱码优化
|
10 years ago |
|
cxt
|
e86f9f9aeb
|
去掉通知页面的字符限制
|
10 years ago |
|
huang
|
ea51b24a4e
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
d0e139650f
|
issue回复的at出错
|
10 years ago |
|
huang
|
a080306f75
|
解决课程动态中，点击按钮，提交多次的问题
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
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 |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
10 years ago |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
10 years ago |
|
lizanle
|
4bc68081ee
|
editor修改
|
10 years ago |
|
lizanle
|
8d58b045f1
|
文件链接却弹出图片框 bug
|
10 years ago |
|
lizanle
|
b13ae8f599
|
issue
|
10 years ago |
|
lizanle
|
68aceaa7df
|
issue下载
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
10 years ago |
|
cxt
|
af0e592d8a
|
匿评日期的设置
|
10 years ago |
|
cxt
|
d7b690e53a
|
匿评设置时匿评关闭日期可以等于匿评开启日期
|
10 years ago |
|
cxt
|
dfd0c95f2a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
lizanle
|
d1423ebc7e
|
ke高度小修改。
|
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
|
f880ccd749
|
分组作业
|
10 years ago |
|
huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
10 years ago |
|
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
10 years ago |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
cxt
|
ae218fa86c
|
发布作业时添加分组作业
|
10 years ago |
|
lizanle
|
8f4c915c57
|
博客的非空验证bug
|
10 years ago |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
10 years ago |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
10 years ago |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
10 years ago |
|
ouyangxuhua
|
b231b44e81
|
1.项目和课程中，添加翻页提醒；
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
|
10 years ago |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
10 years ago |
|
lizanle
|
7c1e9f0042
|
MathJax这些资源不能少。少了会在一些浏览器上出bug
|
10 years ago |
