 ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能；
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
|
10 years ago |
 huang
|
aa19f5f8d5
|
Merge branch 'gitlab_guange' into develop
Conflicts:
app/views/layouts/base_courses.html.erb
处理冲突
|
10 years ago |
|
huang
|
582a7c47a4
|
修改英雄版为0显示的问题
|
10 years ago |
 lizanle
|
7eb5d2a8fa
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
8bd9c0c7af
|
tip
|
10 years ago |
|
huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
10 years ago |
|
lizanle
|
29a8d1b9f5
|
tip
|
10 years ago |
|
lizanle
|
96b704e191
|
所有者的更新时间随着被拥有者的改变而改天
譬如course 里边这么写：has_many :boards
boards里边这么写就ok:belongs_to :course,:touch=>true
|
10 years ago |
|
lizanle
|
62399b6d72
|
资源课程搜索结果添加 标签
|
10 years ago |
|
lizanle
|
d266237590
|
kaminari分页添加上一页下一页
|
10 years ago |
|
lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
10 years ago |
|
lizanle
|
1c3bff0007
|
资源库的删除bug
和右键菜单的bug
和变背景色的bug
|
10 years ago |
|
huang
|
d67fc18988
|
英雄榜、贡献榜显示真实姓名
为零的时候不显示
|
10 years ago |
|
lizanle
|
34ac56e0a0
|
attachment index_document
|
10 years ago |
|
lizanle
|
e728dd55eb
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
lizanle
|
96290ad975
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
huang
|
ae9f1c704a
|
500问题
|
10 years ago |
|
huang
|
cb51545a31
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
aefab8abf3
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
 cxt
|
b616612032
|
测验取消按钮的还原功能暂时隐藏
|
10 years ago |
|
ouyangxuhua
|
00ac79bb34
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
879dee0cd6
|
关闭组织关联项目或课程弹窗，刷新整个页面。
|
10 years ago |
|
huang
|
a6d3ff2b14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
10 years ago |
|
lizanle
|
cb910b8d4a
|
系统消息添加logo
|
10 years ago |
|
ouyangxuhua
|
edea776b03
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
89d01679a7
|
组织中，重复的项目和组织不显示
|
10 years ago |
|
huang
|
ee7fb11acc
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
e3e0f4ab37
|
鼠标移动+号显示留言
|
10 years ago |
|
ouyangxuhua
|
3abc3f7af0
|
组织文章编辑，返回对应界面
|
10 years ago |
Gan Yi.ang
|
79656aa205
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
Gan Yi.ang
|
c3a27151ca
|
修复_revision
|
10 years ago |
|
cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
10 years ago |
|
lizanle
|
e710f443c2
|
全站搜索
|
10 years ago |
|
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
ouyangxuhua
|
25b66b5dbb
|
取消弹窗
|
10 years ago |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
10 years ago |
|
ouyangxuhua
|
365349878d
|
组织加入项目或者课程，刷新项目列表和课程列表；同时，弹窗给出关联成功的提示
|
10 years ago |
|
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
10 years ago |
|
Gan Yi.ang
|
ee85cc35ed
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
Gan Yi.ang
|
1115d54d9a
|
非trustie用户changesets_latest_coimmit
|
10 years ago |
|
ouyangxuhua
|
4aa827eb4a
|
组织页面中，点击项目收起项目列表，再点击展开列表；点击课程同样如此。
|
10 years ago |
 Tim
|
2d14b66336
|
作品列表样式调整
|
10 years ago |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
10 years ago |
|
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
10 years ago |
|
lizanle
|
7cb39d1754
|
全站搜索
|
10 years ago |
|
cxt
|
1f2675020b
|
学生答题未完成时可保存试卷
|
10 years ago |
 houxiang
|
ee746b2d64
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
need it
|
10 years ago |
|
houxiang
|
c6b5abba4e
|
hide the the count of project'repo
|
10 years ago |
|
lizanle
|
ee47187a61
|
全站搜索
|
10 years ago |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
10 years ago |
|
huang
|
8c83bbfff3
|
课程英雄榜数据
|
10 years ago |
|
huang
|
061a1f602a
|
效果实现
|
10 years ago |
|
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
10 years ago |
|
cxt
|
cc0ff6bbc0
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
dec5980443
|
截止时间一到立即提交试卷
|
10 years ago |
|
cxt
|
f8621cac76
|
未设置考试时长时，只要还未到截止时间就可以一直提交试卷。
|
10 years ago |
|
lizanle
|
dcd441a9db
|
全站搜索
|
10 years ago |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
10 years ago |
|
cxt
|
ed9cef486f
|
测验列表页面的按钮调整
|
10 years ago |
|
cxt
|
b690fa0b05
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
b602e1c85d
|
学生答题页面显示试卷截止时间
|
10 years ago |
|
Tim
|
5bdcdc607f
|
测验列表格式更改
|
10 years ago |
|
cxt
|
f1bb1bb8c2
|
测验列表的创建时间改成截止时间，每个测验名字前增加序号，显示发布状态
|
10 years ago |
|
cxt
|
cbdc6bb889
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
6b72b4bb17
|
非课程参与人员无法查看私有课程的测验列表
|
10 years ago |
|
Tim
|
09e0e5e93d
|
单选多选还原
|
10 years ago |
|
Tim
|
2a73751fd9
|
多选题样式调整
|
10 years ago |
|
Tim
|
2b6cae5418
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/exercise/_show_MC.html.erb
|
10 years ago |
|
Tim
|
a0c73a5a54
|
单选题样式调整
|
10 years ago |
|
cxt
|
6513c0afee
|
测验题目的删除按钮增加title
|
10 years ago |
|
cxt
|
6f4b6a6b67
|
填空题的候选答案不能为空，选择题和填空题至少得有一个选项或一个候选答案
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
|
cxt
|
2cd1c07028
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
c7cf34500c
|
老师若未设置测验的发布时间则提交后立即发布
|
10 years ago |
|
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
10 years ago |
|
Tim
|
bd7ee66e77
|
新建测验样式调整
|
10 years ago |
|
cxt
|
7fb78e4816
|
新建测验标题等内容时 点击取消应还原编辑框中的内容
|
10 years ago |
|
cxt
|
3e0609afe3
|
测验时长和题目分数增加数字验证
|
10 years ago |
|
cxt
|
1ae514ca48
|
测验的发布日期和测验时长做成可选的
|
10 years ago |
|
ouyangxuhua
|
2dc31637d8
|
项目和课程中加入组织时，如果已经加入了某组织，就不要重复加入。
|
10 years ago |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
10 years ago |
|
cxt
|
0e7cf4b122
|
学生作品页面的批次列表只显示已发布的作业
|
10 years ago |
|
cxt
|
e89cb99743
|
添加学生测验结果页面的批次链接
|
10 years ago |
|
cxt
|
ec00b86c15
|
学生多次新建作品时提醒学生不能重复提交
|
10 years ago |
|
Tim
|
64d4789150
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/user_organizations.html.erb
|
10 years ago |
|
Tim
|
269d2f992e
|
组织列表搜索框调整后注释
|
10 years ago |
|
ouyangxuhua
|
a3146c66ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
ccfbc1e0bd
|
1.组织翻页增加type参数；
2.删除组织表中冗余的项目动态和课程动态。
|
10 years ago |
|
cxt
|
b46561dac1
|
提交作业时若作品名称和作品描述为空，则不弹出作品校验弹框
|
10 years ago |
|
houxiang
|
ad891aea39
|
分支合并
|
10 years ago |
|
houxiang
|
6b481c8961
|
mute the fork function by hx
|
10 years ago |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
3af96c96e7
|
finalize the commit_counts problems by hx
|
10 years ago |
|
houxiang
|
c3bbf3490f
|
modify show
|
10 years ago |
|
houxiang
|
b3d36705d2
|
modify the commit_count by hx
|
10 years ago |
|
ouyangxuhua
|
68bb142278
|
解决组织bug:动态过滤，点击“展开更多”，有通知等其他动态
|
10 years ago |
|
huang
|
85a219f7e9
|
项目动态\清除
|
10 years ago |
|
huang
|
39455f9f8a
|
作业重复提交问题
|
10 years ago |
|
houxiang
|
56519389d2
|
add binarysearch for commit_count by hx
|
10 years ago |
|
ouyangxuhua
|
71e98c873d
|
组织回复框中，默认图片颜色为灰色，当焦点放在输入框时，图片颜色变亮。
|
10 years ago |
|
ouyangxuhua
|
1914639bc3
|
成功添加某成员后，在搜索框中输入的该成员关键字就要自动清空
|
10 years ago |
|
ouyangxuhua
|
65548cd8c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
d2a87127da
|
我的组织搜索功能显示
|
10 years ago |
|
huang
|
83c7e981af
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
dbe236032b
|
新建题目时必须先保存标题
|
10 years ago |
|
huang
|
3083f683b9
|
修改删除的时候顺序乱的问题
添加相应的参数
|
10 years ago |
|
huang
|
550d056630
|
删除某个题目后顺序排列
|
10 years ago |
|
cxt
|
89f8f5f383
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
b10fbcde8c
|
取消发布和发布测验
|
10 years ago |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
b9460efa08
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
cc19c345e1
|
提交
|
10 years ago |
|
huang
|
2435f06f44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
8b29002a0f
|
修改得分规则
|
10 years ago |
|
cxt
|
c36ec99ff6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
9ca336a70a
|
发布和取消发布
|
10 years ago |
|
huang
|
c0dfc17b19
|
修改状态更新
|
10 years ago |
|
huang
|
da55b00da7
|
删除插入问题
|
10 years ago |
|
huang
|
a3122a9a2c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
aa36c927d3
|
0
|
10 years ago |
|
cxt
|
c07e2fe2d2
|
发布试卷
|
10 years ago |
|
cxt
|
98297da226
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
c9ba57f64b
|
去掉关闭、导入等功能
|
10 years ago |
|
huang
|
bb726e3475
|
提交答案验证
|
10 years ago |
|
huang
|
d1e0e0fd30
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
97485ca221
|
修改show逻辑
提交问卷后学生页面显示
|
10 years ago |
|
cxt
|
da34083a2a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
332ace0f34
|
列表
|
10 years ago |
|
ouyangxuhua
|
6068867670
|
项目动态和组织动态删除后，删除相应的组织动态
|
10 years ago |
|
huang
|
431d1d886c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
8728557813
|
老师和学生统计数目区分
|
10 years ago |
|
cxt
|
d4d2adddb2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
|
10 years ago |
|
cxt
|
eee63b2495
|
提交前验证数据不为空
|
10 years ago |
|
huang
|
ed86e3ee5a
|
三种类型题目计算总分
|
10 years ago |
|
ouyangxuhua
|
a57260aae6
|
修改当“Message”回复对应的组织动态
|
10 years ago |
|
ouyangxuhua
|
5cfc8c2f8d
|
编辑文章后，或者回复文章后，更新组织动态的更新时间
|
10 years ago |
|
huang
|
74f6cb2e64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
db46e5e4af
|
问卷得分统计
|
10 years ago |
|
cxt
|
b0730dfb81
|
测验
|
10 years ago |
|
ouyangxuhua
|
d77d4a421b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
dcbdea9bb5
|
1.修复文章详细列表删除后，页面报错的问题；
2.文章详情页面中，文章回复显示中回复人丢失问题修复
|
10 years ago |
|
cxt
|
9f6fc79df0
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
863d7ed4b5
|
单选和填空
|
10 years ago |
|
Tim
|
1aa7599771
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
10 years ago |
|
huang
|
cb3f0d1c97
|
按类型分类，序号递增
|
10 years ago |
|
huang
|
07ee819370
|
学生多选答题
|
10 years ago |
|
huang
|
302dfaf933
|
新建万卷初始showresult
|
10 years ago |
|
huang
|
469e71e77d
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
13af6e64b2
|
修改允许学生查看参数
|
10 years ago |
|
cxt
|
99945d5bb5
|
学生答题界面的修改
|
10 years ago |
|
ouyangxuhua
|
e01a7c2627
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
b10ff36c51
|
1.组织文章和成员访问权限控制；
2.修改编辑文章不能提交的问题。
|
10 years ago |
|
huang
|
e9998edbc2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
4204521e14
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
acaac93da1
|
tijiao
|
10 years ago |
|
huang
|
3deebf2006
|
show
|
10 years ago |
|
ouyangxuhua
|
faa99a5df4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
40a44c3568
|
增加文章二级回复功能
|
10 years ago |
|
huang
|
21694daa59
|
多选顺序按小到大排序
|
10 years ago |
|
cxt
|
d583ca1d70
|
样式调整
|
10 years ago |
|
huang
|
08c7eb8d40
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
81e2827277
|
解决参数为空的bug
|
10 years ago |
|
cxt
|
20f7560b07
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
9aee23507c
|
学生答题页面、答题结果页面、老师的试卷页面
|
10 years ago |
|
huang
|
b71e6a9b9a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
20a80fe6eb
|
修改JS
|
10 years ago |
|
huang
|
74343a4929
|
发布问卷、取消问卷
|
10 years ago |
|
cxt
|
602373812f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
d91a6c03b1
|
编辑
|
10 years ago |
|
huang
|
87e7a51278
|
删除
|
10 years ago |
|
huang
|
7ab0f4764a
|
主管题插入删除更新
|
10 years ago |
|
cxt
|
27c88fda4f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/exercise/_edit_single.html.erb
|
10 years ago |
|
cxt
|
2c1b03079b
|
学生测验界面
|
10 years ago |
|
huang
|
02f6b636cd
|
完成更新功能
|
10 years ago |
|
huang
|
f3614999da
|
gi
|
10 years ago |
|
huang
|
841ebb7846
|
简单题更新，未完
|
10 years ago |
|
lizanle
|
34a2c2c90d
|
课程创建属性添加 是否允许学生上传资源
|
10 years ago |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
houxiang
|
fdedcbfa81
|
增加了注释
|
10 years ago |
 Gan Yi.ang
|
f6bfd7824d
|
优化查看commits那个页面
|
10 years ago |
|
cxt
|
cf4717278f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
5e5c18725d
|
用户在新建题目时必须先保存其他正在编辑的题
|
10 years ago |
|
huang
|
a900c70e76
|
试题更新
|
10 years ago |
|
huang
|
d7020fad1f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
3929aa6dde
|
编辑
|
10 years ago |
|
huang
|
4c71d8a85e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
bc47382115
|
用户提交答卷后，给出得分
|
10 years ago |
|
cxt
|
4cd9f6a502
|
新建题目时分数自动获取同一类型题目的最后一个分数
|
10 years ago |
|
ouyangxuhua
|
0c891236a8
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/projects/settings/_join_org.html.erb
|
10 years ago |
|
ouyangxuhua
|
09659387e7
|
文章动态中，将组织改成组织文章
|
10 years ago |
|
ouyangxuhua
|
478a534c96
|
1.将课程动态加入组织动态的过滤条件中；
2.创建文章成功后，给出信息提醒
|
10 years ago |
|
Gan Yi.ang
|
ea47a8085a
|
修复新建版本库无响应
|
10 years ago |
|
cxt
|
c7476b3f86
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
a173e924d0
|
插入题目
|
10 years ago |
|
huang
|
037d998f23
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
2296a2f50c
|
添加学生提交作业
老师发布作业功能
|
10 years ago |
|
cxt
|
398a7da533
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
368fc339c0
|
样式调整
|
10 years ago |
|
huang
|
8cf22767f9
|
新建问答题
|
10 years ago |
|
huang
|
8e4b2bd7d4
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
1606e9ddab
|
0
|
10 years ago |
|
cxt
|
28f7390595
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
3d3d50f1ea
|
编辑
|
10 years ago |
|
ouyangxuhua
|
8e359c3d94
|
隐藏我的组织的搜索功能
|
10 years ago |
|
huang
|
1d5ae6d561
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
ac95e1584c
|
问卷删除功能
|
10 years ago |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
10 years ago |
|
cxt
|
d83e2e36ae
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
d407610740
|
填空题
|
10 years ago |
|
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
10 years ago |
|
houxiang
|
fe3fbacdbc
|
modify commit count show
|
10 years ago |
|
huang
|
cd2d947cb2
|
多项选择标准答案
|
10 years ago |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
10 years ago |
|
cxt
|
f850a71b59
|
测验
|
10 years ago |
|
lizanle
|
193471adf1
|
学生自己上传的资源应允许自己删除
|
10 years ago |
|
huang
|
935b1f9f9e
|
大写小写问题
|
10 years ago |
|
huang
|
de17ffa605
|
区分答案大小写
|
10 years ago |
|
huang
|
3efae6bde2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
8965775004
|
show方法修改
|
10 years ago |
|
cxt
|
0405d4eee6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
249b15751d
|
新建多选题
|
10 years ago |
|
huang
|
7f5fa7fb6f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/helpers/exercise_helper.rb
解决冲突
|
10 years ago |
|
huang
|
25344ef0de
|
show方法
|
10 years ago |
|
huang
|
deb0f151c4
|
单选数字转换
|
10 years ago |
|
cxt
|
c5c16e25b6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
ouyangxuhua
|
b231b44e81
|
1.项目和课程中，添加翻页提醒；
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
|
10 years ago |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
10 years ago |
|
lizanle
|
60fda5e391
|
火狐MathJax显示公式错误，还是不能不用图形字体
|
10 years ago |
|
cxt
|
265fe08b2c
|
在线测验
|
10 years ago |
|
huang
|
282c7f5bd2
|
修改添加题目相关
|
10 years ago |
|
lizanle
|
d133acbf2a
|
论坛帖子显示更新时间
|
10 years ago |
|
lizanle
|
6a59e39ef1
|
允许学生上传资源
|
10 years ago |
|
lizanle
|
8e55c98ccf
|
MathJax不允许使用图片资源，不然图片太多了。有30000个左右
|
10 years ago |
|
huang
|
02db1b7e14
|
问卷添加标准答案
|
10 years ago |
|
huang
|
9cf5a92a44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
221a73309f
|
index页面删掉无效的测试
|
10 years ago |
|
cxt
|
452cf1c854
|
测验
|
10 years ago |
|
cxt
|
2c9c87c3c6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
|
10 years ago |
|
cxt
|
bb99a11c37
|
页面修改
|
10 years ago |
|
huang
|
d61ec92318
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
f316f43d6d
|
修改edit界面无法找到的问题
|
10 years ago |
|
cxt
|
7472d959f3
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
631418a012
|
单选题
|
10 years ago |
|
huang
|
3cdda2a60a
|
修改创建方式
|
10 years ago |
|
huang
|
9935cfea44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
99f4483a16
|
删除问卷（未完）
|
10 years ago |
|
cxt
|
f68ffc99ec
|
保存单选题
|
10 years ago |
|
cxt
|
b3e6bf40ff
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
cc08e5e32e
|
保存测验信息
|
10 years ago |
|
huang
|
4a0865ab76
|
添加和编辑题目
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
0eff2bcb74
|
课程添加允许学生发布资源的配置
|
10 years ago |
|
huang
|
0e94b4f33b
|
解决版本库不能新建问题
|
10 years ago |
|
lizanle
|
94831443a5
|
MathJax的js
|
10 years ago |
|
huang
|
651f6565be
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
处理冲突
|
10 years ago |
|
huang
|
23ca20692f
|
问卷部分方法
|
10 years ago |
|
cxt
|
034a92bb7b
|
新建测验页面
|
10 years ago |
|
huang
|
0316bf698f
|
exercise新增、update
|
10 years ago |
|
ouyangxuhua
|
8aeae831b8
|
项目配置中添加组织后，更新组织列表，而不是隐藏
|
10 years ago |
|
lizanle
|
7ad2e657eb
|
提示信息去掉感叹号
|
10 years ago |
|
lizanle
|
1961868e5e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
6af8bfef37
|
加入课程的相关系统提示加上logo
|
10 years ago |
|
ouyangxuhua
|
6f5cb8f142
|
增加组织动态的过滤功能，组织动态包括项目动态和组织的动态
|
10 years ago |
|
ouyangxuhua
|
fba461f94a
|
增加组织模块中项目讨论区的回复功能
|
10 years ago |
|
cxt
|
167d001b3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
5400b907e6
|
学生测验列表
|
10 years ago |
|
ouyangxuhua
|
bd6a1a9d49
|
增加组织动态中的项目问题的回复框
|
10 years ago |
|
ouyangxuhua
|
687c0c8306
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/org_document_comments/edit.html.erb
|
10 years ago |
|
ouyangxuhua
|
d220dbbc9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
10dedcb7be
|
增加组织成员加入时间
|
10 years ago |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
10 years ago |
|
cxt
|
10ac8eaa35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
c50bcf9331
|
对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中”
|
10 years ago |
|
houxiang
|
9350841d50
|
change by hx
|
10 years ago |
|
cxt
|
e22b4cbdeb
|
作业提交截止后，未提交作品的学生看到的作业动态将显示“补交作品”
|
10 years ago |
|
cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
ca8b62b8bd
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
huang
|
50dfe5ce8b
|
修正接口 项目owner为当前用户，同步gitlab端用户
|
10 years ago |
|
ouyangxuhua
|
f5460d1126
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
c9a7a94767
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
1e1c210939
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
b7f12b9cde
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
ouyangxuhua
|
38acb4230e
|
组织动态添加项目动态
|
10 years ago |
|
lizanle
|
0b2eedd3b4
|
成员的编辑权利错误
|
10 years ago |
|
huang
|
f32cae9012
|
fork fileter修正
|
10 years ago |
|
lizanle
|
79ba840b01
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
56613b6358
|
增加项目的显示
|
10 years ago |
|
ouyangxuhua
|
9bf8f6058f
|
动态和文章样式问题解决
|
10 years ago |
|
ouyangxuhua
|
c51491367f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f313509d99
|
组织id的位置显示组织名称
|
10 years ago |
|
lizanle
|
e1a88dedbb
|
首页回复 会变成组织
|
10 years ago |
|
lizanle
|
1edaed8bf1
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b88d5e59a1
|
回复的时候会多出一条一模一样的内容
|
10 years ago |
|
ouyangxuhua
|
bee355e747
|
修复编辑组织文章显示问题；
动态中，首页不冗余显示。
|
10 years ago |
|
huang
|
ddbc9003c2
|
每个用户不能创建同名版本库
不同的用户可以创建不同版本库
更新fork接口方法
|
10 years ago |
|
ouyangxuhua
|
36b3d0b636
|
修复火狐浏览器上动态显示文章的bug
|
10 years ago |
|
ouyangxuhua
|
4471b6c485
|
修改组织bug
|
10 years ago |
|
ouyangxuhua
|
f4028f6c0d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
ouyangxuhua
|
a5a413eda0
|
动态查询sql错误
|
10 years ago |
|
ouyangxuhua
|
b6d785bda0
|
修改编辑组织文章样式问题
|
10 years ago |
|
lizanle
|
e905489157
|
代码被剪切了
|
10 years ago |
|
ouyangxuhua
|
dfd1e98d00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
ca770f2727
|
修改新建组织的提示语言
|
10 years ago |
|
cxt
|
82541cae1c
|
新建作业时去掉发布日期和截止日期的label
|
10 years ago |
|
huang
|
a40e5c5b54
|
frok功能开发--权限还未完成
|
10 years ago |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
 sw
|
e6cd104ead
|
index界面以及试卷统计相关路由添加
|
10 years ago |
|
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
022c656db6
|
修复项目加入组织的bug
|
10 years ago |
|
sw
|
70c5b27a43
|
相关路由
|
10 years ago |
|
ouyangxuhua
|
e08039e983
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
3451ced888
|
添加我的组织页面及修改bug
|
10 years ago |
|
Tim
|
183f019c04
|
组织样式调整
|
10 years ago |
|
sw
|
466f3c4cc3
|
数据库修改以及一对一，一对多，多对多等关系的确立
|
10 years ago |
|
lizanle
|
78ebeaee3b
|
批量删除提示修改
|
10 years ago |
|
lizanle
|
465bc9bd6c
|
新增和删除的时候数据联动bug
|
10 years ago |
|
ouyangxuhua
|
866c2feaa1
|
修改组织模块的bug
|
10 years ago |
|
lizanle
|
28a6e09edd
|
资源批量删除情况
|
10 years ago |
|
sw
|
bbf087fa67
|
数据库的修改以及model数据关系的确定
|
10 years ago |
|
lizanle
|
e7d53f5e16
|
课程资源上传允许多选tag
|
10 years ago |
|
ouyangxuhua
|
5aea2250c4
|
组织加入成员时，如果没有选择用户，弹窗给出提示
|
10 years ago |
|
ouyangxuhua
|
2a5eeaa527
|
在组织页面左边，增加项目名称一栏
|
10 years ago |
|
ouyangxuhua
|
eb64fa7642
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
10 years ago |
|
lizanle
|
b3a234cfc6
|
编辑的时候也需要对文章名字限制长度
|
10 years ago |
|
lizanle
|
99637924b4
|
文章标题限制长度
|
10 years ago |
|
lizanle
|
e265047ba9
|
搜索成员翻页靠右
|
10 years ago |
|
lizanle
|
f1b61c1581
|
搜索翻页后将丢失数据
|
10 years ago |
|
lizanle
|
df0051cdd4
|
设置 删除 编辑按钮做成项目一样的
|
10 years ago |
|
lizanle
|
c2e783d78b
|
设置 删除 编辑按钮做成项目一样的
|
10 years ago |
|
lizanle
|
b24fadea05
|
设置 删除 编辑按钮做成项目一样的
|
10 years ago |
|
lizanle
|
6fd76eb622
|
删除成员要做确认
|
10 years ago |
|
lizanle
|
368d755499
|
改为管理人员
|
10 years ago |
|
cxt
|
2c5cd1a4b3
|
编辑作业页面添加截止日期和发布日期label
|
10 years ago |
|
ouyangxuhua
|
7dc02d2c4f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/organizations/_show_org_document.html.erb
|
10 years ago |
|
ouyangxuhua
|
21275e8b7b
|
组织模块功能缺陷修改
|
10 years ago |
|
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
7751dc9081
|
组织页面调整
|
10 years ago |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
10 years ago |
|
ouyangxuhua
|
bf01994e4f
|
修改组织文章显示样式
|
10 years ago |
|
ouyangxuhua
|
d508cfa381
|
组织模块功能实现
|
10 years ago |
|
cxt
|
8fa790dd6b
|
作品列表的文字调整
|
10 years ago |
|
cxt
|
41751f08ba
|
学生作品列表右上角的编辑和删除icon增加tip，两个icon的距离增加
|
10 years ago |
|
huang
|
af70dc0ca3
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
10 years ago |
|
Tim
|
aed305f5bf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
7dd299255b
|
博客页面微调
|
10 years ago |
|
huang
|
9b2ccca649
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
2596f0a788
|
优化权限代码
|
10 years ago |
|
cxt
|
70ce172b88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
3aa73fba35
|
Gitlab权限修改
更新项目Gitlab同步更新
|
10 years ago |
|
lizanle
|
84348d15ea
|
文件上传的 确定按钮的联动 作业提交回退
|
10 years ago |
|
cxt
|
62cd410e1e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
4b26af8920
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
10 years ago |
|
Tim
|
465c5958f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
b8999e1c6e
|
博客标题输入框宽度调整
|
10 years ago |
|
lizanle
|
d13205bd3d
|
文件正在上传提示
|
10 years ago |
|
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
10 years ago |
|
cxt
|
29abe1ab02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
8164ffc1b2
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
huang
|
d8dc7786ca
|
fork接口
|
10 years ago |
|
lizanle
|
2cf61ad74f
|
编辑的时候报500
|
10 years ago |
|
lizanle
|
db0978c657
|
编辑的时候报500
|
10 years ago |
|
cxt
|
91ef155b10
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
463b6e91f5
|
添加邮箱验证
|
10 years ago |
|
cxt
|
ec6728df07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
6dd264990e
|
作品列表的“点击查看详情”
|
10 years ago |
|
lizanle
|
94367eee82
|
Merge branch 'dev_zanle' into szzh
|
10 years ago |
|
lizanle
|
82c377a60a
|
在导航处上传文件不可用
|
10 years ago |
|
cxt
|
4be3b16b60
|
隐藏点击查看详情
|
10 years ago |
|
cxt
|
0c43a703ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
4adc6deabf
|
配置课程页面的开课学期不可更改，弹框提醒用户。
|
10 years ago |
|
Tim
|
679ec44f8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/student_work/_evaluation_work.html.erb
|
10 years ago |
|
Tim
|
d9610d2694
|
作品列表提示标签
|
10 years ago |
|
cxt
|
2a82f33227
|
个人首页的留言动态显示不合理
|
10 years ago |
|
lizanle
|
3c93103bc7
|
迟交提示，老师名称要给称呼
|
10 years ago |
|
lizanle
|
7bd9c5b65c
|
更改时区设置
作业发布消息添加发布时间
|
10 years ago |
|
lizanle
|
20b49385de
|
更改时区设置
作业发布消息添加发布时间
|
10 years ago |
|
cxt
|
dc7a90cab5
|
助教无法打开学生作品
|
10 years ago |
|
lizanle
|
0e42554ef9
|
引用资源和 直接上传资源的删除按钮应该在同一列上
|
10 years ago |
|
lizanle
|
0c202a47bb
|
博客回复，点击取消去掉回复框的内容
|
10 years ago |
|
lizanle
|
157ba12513
|
资源库虚线问题
|
10 years ago |
|
cxt
|
6232bbb5e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
d461e1be0d
|
作品列表的提示信息“您尚未提交作品”
|
10 years ago |
|
lizanle
|
2e092b0d04
|
论坛字符允许扩大为30000个字符，超过两万个字符不允许提交
|
10 years ago |
|
lizanle
|
2d321d2dbc
|
论坛字符允许扩大为20000个字符，超过两万个字符不允许提交
|
10 years ago |
|
cxt
|
463262e838
|
提交作品时立马弹框
|
10 years ago |
|
lizanle
|
1edd87f9e0
|
论坛字符允许扩大为20000个字符
|
10 years ago |
|
lizanle
|
4b272b6b9c
|
论坛字符允许扩大为40000个字符
|
10 years ago |
|
lizanle
|
77741cf52c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
f229d18776
|
在课程 项目 上传资源后跳转到对应的资源库界面
|
10 years ago |
guange
|
4e62dd1219
|
修改显示错误信息的格式
|
10 years ago |
