 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
|
06734d86ca
|
attachment_acts页面变量错误
|
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 |
|
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 |
|
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 |
|
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
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 |
|
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 |
|
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
|
98d0e6d411
|
版本库“提交明细”
|
10 years ago |
|
lizanle
|
02a9f08fe6
|
表单长度对齐
|
10 years ago |
|
lizanle
|
47a9be132a
|
详情和编辑页面
|
10 years ago |
|
ouyangxuhua
|
704954583b
|
资源栏目新增Tag后，更新相应的tag数量
|
10 years ago |
|
lizanle
|
8d1003770a
|
在本页面重复修改的时候，由于edit页面没有更新，导致issue更新触发乐观锁。lock_version比数据库记录存在的lock_version更低，所以回滚。
|
10 years ago |
|
cxt
|
481b7b96eb
|
正式版报500
|
10 years ago |
|
lizanle
|
68aceaa7df
|
issue下载
|
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 |
|
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 |
|
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
|
9aebafee09
|
课程添加更新时间
|
10 years ago |
|
ouyangxuhua
|
b72cc82e4d
|
组织资源栏目添加文件标签功能
|
10 years ago |
|
huang
|
5ca8d4cd66
|
修改http链接自动换域名
|
10 years ago |
|
lizanle
|
f6867068f5
|
项目 帖子 更新时间
资源 下载次数
用户 最后登陆时间
|
10 years ago |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
10 years ago |
|
lizanle
|
9b86ec3044
|
更新时间
|
10 years ago |
|
cxt
|
eb8e9f32a3
|
作品列表的私有项目不可点击
|
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
|
1d2b6165ef
|
分组作业报500
|
10 years ago |
|
huang
|
6b9a612594
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
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
|
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 |
|
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 |
|
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
dbadbf8621
|
修改密码gitlab同步
|
10 years ago |
|
ouyangxuhua
|
0a85fbf613
|
1.配置栏目列表，增加类型一列；
2.暂时隐藏类型为“资源”的栏目的链接
|
10 years ago |
|
ouyangxuhua
|
1e652faec7
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
2f7260cba2
|
1.在栏目表中增加field_type(类型)字段；
2.在组织配置-》栏目，增加栏目类型。
|
10 years ago |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
10 years ago |
|
ouyangxuhua
|
78fb8b6254
|
1.编辑或者删除栏目的帖子返回对应页面
|
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
|
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 |
|
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 |
|
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 |
|
guange
|
0c7db76371
|
tag没闭合的错误
|
10 years ago |
|
ouyangxuhua
|
c229104d78
|
修改编辑组织标题
|
10 years ago |
|
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
10 years ago |
|
cxt
|
73e9a00a1a
|
作业动态添加回复的删除功能
|
10 years ago |
|
cxt
|
0472a5ed0c
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
a62ecc10ad
|
作业动态设置评分后无法刷新
|
10 years ago |
|
huang
|
ab1c945a30
|
修改版本库库权限
自己不能fork自己的项目
|
10 years ago |
|
Tim
|
75d79c6c47
|
问题跟踪样式调整
|
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 |
|
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
10 years ago |
|
guange
|
af31946586
|
issue列表开启AT功能
|
10 years ago |
|
huang
|
bd3d0547f5
|
组织样式修改
|
10 years ago |
|
ouyangxuhua
|
4c9d9dee35
|
组织首页样式
|
10 years ago |
|
ouyangxuhua
|
108865968b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
12c57e7e4b
|
将Jquery引入组织首页
|
10 years ago |
|
huang
|
9d68fd7d28
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
37a7abea53
|
组织首页
|
10 years ago |
|
ouyangxuhua
|
01b82e59d8
|
实现组织首页功能
|
10 years ago |
|
ouyangxuhua
|
5b0bdb5069
|
修改组织栏目的内容及样式
|
10 years ago |
|
huang
|
c7058e6bbf
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
4cb58211ad
|
邮件消息提示语修改
|
10 years ago |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
|
huang
|
6fad26cabf
|
去死奥placebold
|
10 years ago |
|
cxt
|
8b160b1c38
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
19c34de643
|
编辑作品时弹出的作品确认框不提供重试的按钮
|
10 years ago |
|
huang
|
120a7274d3
|
fork样式显示
|
10 years ago |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
10 years ago |
|
huang
|
61d76e6744
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
huang
|
9716e99533
|
课程成员提交“修改角色”
|
10 years ago |
|
huang
|
7daaa59010
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
b6edabed9c
|
修改角色
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
Tim
|
dfa9b4cf74
|
学生列表调整
|
10 years ago |
|
huang
|
4a41039fa6
|
课程英雄榜改成课程活跃度
|
10 years ago |
|
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
huang
|
9f73807e05
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
c1747ab217
|
fork重名，提交
|
10 years ago |
|
lizanle
|
dbfc4969e0
|
测验消息bug
|
10 years ago |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
10 years ago |
|
ouyangxuhua
|
2855c0e409
|
修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等
|
10 years ago |
|
lizanle
|
6553559929
|
发送消息
|
10 years ago |
|
huang
|
8f024bdf4d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
7fe3a02d81
|
Merge branch 'gitlab_guange' into develop
|
10 years ago |
|
huang
|
89b8f7783d
|
添加forked_form的id
|
10 years ago |
|
huang
|
5d18b14e73
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
|
10 years ago |
|
huang
|
057d9a3337
|
0
|
10 years ago |
|
huang
|
8d891a9faa
|
fork权限
|
10 years ago |
|
huang
|
b91c65798d
|
课程成员添加设置
|
10 years ago |
|
cxt
|
4e9e7543ba
|
chrome浏览器点击保存测验头部信息无反应
|
10 years ago |
|
cxt
|
fd51b02e16
|
添加修订附件
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
9c4c90e066
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
ouyangxuhua
|
9baeb850a3
|
在管理员界面中，添加组织的编辑和删除功能。
|
10 years ago |
|
ouyangxuhua
|
95b071a8f7
|
修复组织模块的bug
|
10 years ago |
|
lizanle
|
adb246f9ad
|
注释标记 错误
<!-- -->
|
10 years ago |
|
lizanle
|
9fe5cfbf76
|
资源发送课程发送项目自动搜索
|
10 years ago |
|
lizanle
|
2f0895c2c2
|
发送资源成功给出提示
发送资源默认为发送课程
|
10 years ago |
|
cxt
|
ae218fa86c
|
发布作业时添加分组作业
|
10 years ago |
|
lizanle
|
7af82aac98
|
base_forums要加ajax-indicator ajax-model
|
10 years ago |
|
lizanle
|
46ad5f45c1
|
搜索结果下一页样式不对
|
10 years ago |
|
lizanle
|
35b543cd22
|
论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。
|
10 years ago |
|
lizanle
|
d4823e7c8b
|
贴吧更新时间
|
10 years ago |
|
lizanle
|
304cc078a7
|
去掉警示的感叹号
|
10 years ago |
|
cxt
|
68a29d8131
|
学生提交作品后可点击重试重新上传作品
|
10 years ago |
|
ouyangxuhua
|
0aba11f175
|
解决组织配置在360浏览器显示不兼容的问题
|
10 years ago |
|
huang
|
9d970036f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
3750a49b65
|
修复组织编辑下拉框的bug
|
10 years ago |
|
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
|
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
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
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 |
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 |
|
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 |
|
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 |
|
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 |
|
cxt
|
dec5980443
|
截止时间一到立即提交试卷
|
10 years ago |
|
cxt
|
f8621cac76
|
未设置考试时长时，只要还未到截止时间就可以一直提交试卷。
|
10 years ago |
