 huang
|
d58167f4bc
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
6357f5be2a
|
解决成员列表获取单位不准确的问题
|
9 years ago |
|
huang
|
f979e80f24
|
Gitlab数据清理及迁移，主要是历史数据
|
9 years ago |
 cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
9 years ago |
 Tim
|
635b3beb32
|
新建issue版本图标问题
|
9 years ago |
|
Tim
|
5adc4e1e5a
|
项目issue上传附件与填写正确加间距
|
9 years ago |
|
Tim
|
bf87ffb992
|
组织历史版本弹框文件夹图标问题
|
9 years ago |
|
Tim
|
f3494489c2
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
Tim
|
78e4d37d8b
|
大纲base页引入弹框样式；作业列表调整
|
9 years ago |
 daiao
|
a55e64dfb3
|
保持组织动态用户名颜色与其他动态用户名颜色显示一直
|
9 years ago |
 yuanke
|
67e87df4d5
|
微信动态详情回复显示修改
|
9 years ago |
|
huang
|
3a43b7beb5
|
redirect to repository when delete jenkins job
|
9 years ago |
|
huang
|
e99c76a0de
|
resolve edit problem of jenkins job
|
9 years ago |
|
yuanke
|
1ce7b22c0e
|
博客动态回复二级回复修改
|
9 years ago |
|
huang
|
1935176500
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
huang
|
14e6db457b
|
rake
|
9 years ago |
guange
|
674c45f1d9
|
去掉上传的csrf报错
|
9 years ago |
|
daiao
|
763ebcbf74
|
修复课程总学时结果，总学时=理论学时+时间学时
|
9 years ago |
|
huang
|
0c0dfbd093
|
changeset关联
|
9 years ago |
|
daiao
|
7808bb5ebe
|
修复非管理远用户帖子出现管理员帖子置顶的问题
|
9 years ago |
|
Tim
|
eb503cc3e8
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
huang
|
cf04bb5ec6
|
迁移上线
|
9 years ago |
|
huang
|
26d4be6518
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
1a129722eb
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
4e3bfd9254
|
some bugs for sonar show
|
9 years ago |
|
yuanke
|
ea88c92d31
|
测试用
|
9 years ago |
|
yuanke
|
bc1b4c1b85
|
班级邀请码弹框修改，我的动态回复数计算修改
|
9 years ago |
|
huang
|
c50ca34b0e
|
代码质量分析部分数据转换成整型
|
9 years ago |
|
huang
|
04fe06eff9
|
gitlab数据迁移
|
9 years ago |
|
Tim
|
1fc2bbd56a
|
作业资源库弹框，资源名称与上传者栏增加宽度限制
|
9 years ago |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
9 years ago |
|
cxt
|
fdf925a0b8
|
个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了
|
9 years ago |
|
guange
|
6c36ee2c28
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
058b1e9d69
|
自动加载
|
9 years ago |
|
daiao
|
03d6afd1c4
|
优化上周动态获取代码
|
9 years ago |
|
cxt
|
8e3488132b
|
导入作业：公共题库中显示的却是我的题库，我的题库中显示的却是公共题库
|
9 years ago |
|
Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
9 years ago |
|
yuanke
|
ff13d2e572
|
微信增加作业发送，修改发送的权限，修改菜单
|
9 years ago |
|
cxt
|
9e5e7a75b0
|
编程作业关闭匿评后，老师点击模拟答题，却弹出匿评提示
|
9 years ago |
|
huang
|
412d74e295
|
优化最近动态获取方法
|
9 years ago |
|
huang
|
5c046f922e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
097374df14
|
去掉全局变量，通过filter获取
|
9 years ago |
|
cxt
|
a9ee1d10cd
|
新增班级成员的消息通知，跳转至该班级的成员配置页面
|
9 years ago |
|
huang
|
3198f8a473
|
解决版本库提交记录中：上传图片或者非可以预览文件 显示详情500问题
|
9 years ago |
|
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
8968c991ff
|
微信：作业增加发送功能
|
9 years ago |
|
guange
|
51692eadd6
|
改进上线流程
|
9 years ago |
|
guange
|
c14979d878
|
assets
|
9 years ago |
|
yuanke
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
c9e0143fe8
|
作业动态的时间
|
9 years ago |
|
yuanke
|
596bfe4bfc
|
邀请码分享问题修改
|
9 years ago |
|
guange
|
82aa369687
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
c02245adfb
|
邀请码分享
|
9 years ago |
|
yuanke
|
ba1af901ad
|
强制更新myresource.js
|
9 years ago |
|
cxt
|
48e5a0be7e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
fcc8a08138
|
课程列表的样式问题
|
9 years ago |
|
huang
|
4c5052dce2
|
作业按更新时间排序
|
9 years ago |
|
cxt
|
5b070b6acc
|
消息列表的html标签
|
9 years ago |
|
huang
|
f9e03434c2
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
yuanke
|
60dc0e72cf
|
微信我我的资源更多按钮显示
|
9 years ago |
|
huang
|
2af3c50dbc
|
里程碑区分issue状态“已解决”“已关闭” 对应不同样式
|
9 years ago |
|
yuanke
|
0a1ecd65e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
b2a8a0fed6
|
修复里程碑进度条数据显示错误的问题
|
9 years ago |
|
yuanke
|
9b17724ebf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
c476dae15b
|
微信我的资源中 更多按钮暂时隐藏
|
9 years ago |
|
cxt
|
dbc8f87346
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
cxt
|
1c967ce569
|
Merge branch 'rep_quality' into develop
Conflicts:
app/views/users/_user_message_system.html.erb
app/views/users/_user_message_userfeedaback.html.erb
|
9 years ago |
|
cxt
|
e260c0b7cc
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
05fe987a8b
|
新手注册三条留言
|
9 years ago |
|
cxt
|
11e0101f56
|
导航栏题库中 我的题库放在前面
|
9 years ago |
|
guange
|
fff6f4b310
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
dd892993dd
|
assets
|
9 years ago |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
9 years ago |
|
guange
|
0e415fffff
|
merge
|
9 years ago |
|
yuanke
|
b540ff7017
|
我的资源里增加更多按钮
|
9 years ago |
|
huang
|
4e3a7e8df1
|
新建版本“日期”--》“截止日止”
|
9 years ago |
|
huang
|
77e4a66e7e
|
模式切换刷新后引起的样式问题
|
9 years ago |
|
huang
|
38cc3c2010
|
发送过来的资源在项目中添加动态
|
9 years ago |
|
cxt
|
fd68479d72
|
课程/项目/组织资源库发送资源、问答区帖子发送、通知发送、新闻发送、动态中发送到课程改为班级
|
9 years ago |
|
huang
|
97b1ea22e7
|
解决：Firefox浏览器中：资源库，先点击资源描述编辑图标按钮（笔），再点击页面空白处，如图两个资源之间有一段空白
|
9 years ago |
|
yuanke
|
dc2ba96353
|
用户注册发送绑定成功消息通知，加入班级消息通知点击跳入班级
|
9 years ago |
|
cxt
|
7ea5d7d934
|
新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示
|
9 years ago |
|
yuanke
|
4be95cd9c5
|
班级内作业课件测验等增加排序
|
9 years ago |
|
Tim
|
2d1d3083d0
|
引入project.css
|
9 years ago |
|
yuanke
|
b8c8b2c4ae
|
修改加入班级的提示
|
9 years ago |
|
yuanke
|
6ab1269c01
|
修改微信反馈框加入重复班级提示有误的问题
|
9 years ago |
|
yuanke
|
4c39dcc677
|
微信：修改班级下有挂起作业所有作业都不显示的BUG，将班级下作业、测验发送按钮屏蔽
|
9 years ago |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
9 years ago |
|
yuanke
|
d50fd40307
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
c524409e4a
|
修改进入某个班级报错的BUG
|
9 years ago |
|
Tim
|
c41a116378
|
博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改
|
9 years ago |
|
yuanke
|
9c560e56b6
|
微信修改 不能直接给数据库对象增加新属性
|
9 years ago |
|
huang
|
7da67350fd
|
issue列表进入详情页面，弹出新页面
|
9 years ago |
|
huang
|
e98d7a213f
|
系统消息点击跳转列表定位
|
9 years ago |
|
huang
|
f7c9bc0a19
|
消息跳转定位
|
9 years ago |
|
cxt
|
e19efc1c8a
|
博客的二级回复
|
9 years ago |
|
huang
|
3485d48163
|
Merge branch 'develop' into rep_quality
Conflicts:
app/controllers/quality_analysis_controller.rb
|
9 years ago |
|
huang
|
8c6fca87c9
|
项目动态中，新闻添加快捷操作，所有操作默认显示
|
9 years ago |
|
yuanke
|
5bd404322b
|
修改微信消息通知详情地址
|
9 years ago |
|
yuanke
|
c2fadc54ef
|
微信消息通知点击跳转页面修改
|
9 years ago |
|
huang
|
00c414c347
|
issue回复填写正确的样式问题
|
9 years ago |
|
Tim
|
fdf147326c
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
huang
|
9b59ca20de
|
修复issue详情页面，删除回复后再编辑保存issue弹出白色框问题
|
9 years ago |
|
yuanke
|
1e8f496718
|
代码查重结果 不显示未提交的作品
|
9 years ago |
|
daiao
|
dcc37ef847
|
增加作品查看界面中，班级查询条件下，增加暂无分班的查询条件
|
9 years ago |
|
yuanke
|
15ccf5cfbe
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
3ffb909e15
|
修改发送创建班级的通知消息
|
9 years ago |
|
cxt
|
ded8f48d34
|
博客的二级回复
|
9 years ago |
|
huang
|
61bf6604b1
|
解决ajax情况下，issue状态选框不显示问题
|
9 years ago |
|
huang
|
ef931d1491
|
编辑issue，与回复issue冲突问题（局部刷新）
|
9 years ago |
|
yuanke
|
5cd394c4ae
|
修改微信班级测验报错的BUG
|
9 years ago |
|
huang
|
845f36c4f3
|
解决z注册时候邮箱不能是大写加下划线的形式
|
9 years ago |
|
cxt
|
9bf853d2bb
|
管理员可修改课程名称和英文名称
|
9 years ago |
|
yuanke
|
b4ac13c157
|
修改编程作业没main函数系统评分100的BUG
|
9 years ago |
|
cxt
|
16cf8a56a1
|
管理员和老师可看到课程下的所有班级
|
9 years ago |
|
yuanke
|
f63df877db
|
将未命名课程去掉
|
9 years ago |
|
huang
|
191261d3b8
|
each time to 10s
|
9 years ago |
|
yuanke
|
4a7fb0e0b5
|
点击查看班级详情跳入班级信息页面
|
9 years ago |
|
yuanke
|
824f9d9174
|
新增创建班级的模版消息
|
9 years ago |
|
guange
|
4908a68a7d
|
时间utc问题
|
9 years ago |
|
Tim
|
73b7b00db9
|
班级学生列表导航栏下拉框错位调整
|
9 years ago |
|
guange
|
ae3212082c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
guange
|
8df0dcae7a
|
调用编辑接口不成功时，打印具体的信息
|
9 years ago |
|
cxt
|
c46fcc48b1
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/users/_join_course_course_message.html.erb
|
9 years ago |
|
huang
|
e766adf087
|
add delete to qa
|
9 years ago |
|
cxt
|
f0e456729e
|
过滤掉消息中的html
|
9 years ago |
|
yuanke
|
d75e2b740f
|
微信点击我的课程里面的两个按钮时没绑定会提示绑定
|
9 years ago |
|
daiao
|
304f18ac5e
|
修复课程中，对动态进行筛选的页面呈现方式
|
9 years ago |
|
cxt
|
955c258856
|
复制班级的弹框中“课程名称”下拉框中只显示当前登录用户的所有课程
|
9 years ago |
|
yuanke
|
d4681eea00
|
我的资源里面显示来源 和大小 并可以下载课件
|
9 years ago |
|
cxt
|
89819f5ccd
|
消息列表
|
9 years ago |
|
huang
|
22745edb9b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
8b5a2ac1cb
|
message 500
|
9 years ago |
|
daiao
|
97599849ee
|
优化课程中作品下内容显示代码
|
9 years ago |
|
daiao
|
00d59a5596
|
修复课程坐下下，提示内容的表达形式
|
9 years ago |
|
cxt
|
d21eaf9154
|
未配置班级列表的班级重命名
|
9 years ago |
|
cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
d71e10c8ac
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
0b4db97756
|
班级动态
|
9 years ago |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
9 years ago |
|
yuanke
|
374aa9918c
|
我的资源里面都显示未发布的，新建课程后返回会刷新数据
|
9 years ago |
|
cxt
|
834e72b0f8
|
未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除
|
9 years ago |
|
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
0a001b4f76
|
message 500 for boliang
|
9 years ago |
|
huang
|
93e79d9419
|
add hidden to css
|
9 years ago |
|
huang
|
bac3e433aa
|
sqlate index nil
|
9 years ago |
|
huang
|
831006f3c6
|
css for sqale_index
|
9 years ago |
|
huang
|
cb148c3b9c
|
fixed 500
|
9 years ago |
|
daiao
|
670b443cc4
|
Merge branch 'develop' into daiao_dev
|
9 years ago |
|
guange
|
99a27766be
|
.
|
9 years ago |
|
guange
|
09a97fc9d8
|
.
|
9 years ago |
|
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
9 years ago |
|
guange
|
f5b4bc3e43
|
merge
|
9 years ago |
|
guange
|
2a2fe9e81d
|
解决android缓存问题
|
9 years ago |
|
huang
|
817eaf318a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
f77bad34ad
|
缩短时间
|
9 years ago |
|
guange
|
8800290db9
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
huang
|
8785264e07
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
62cb7d4568
|
add css
|
9 years ago |
|
guange
|
135b6ca64b
|
assets
|
9 years ago |
|
cxt
|
320db4ddd9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
.access_token
|
9 years ago |
|
guange
|
7c98e0f392
|
merge
|
9 years ago |
|
cxt
|
1a15c0f567
|
新建班级发布作业报500
|
9 years ago |
|
cxt
|
d25f401afa
|
管理员界面修改班级名称
|
9 years ago |
|
yuanke
|
5ccde8e433
|
修改课程列表显示不对的BUG
|
9 years ago |
|
yuanke
|
189e641d23
|
课程列表改下
|
9 years ago |
|
cxt
|
6115b7fa4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
3362ebe321
|
线下作业
|
9 years ago |
|
yuanke
|
1df1368214
|
修改课程名修改无效的BUG
|
9 years ago |
|
yuanke
|
cce503f32f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
f1f61c304a
|
修改课程列表显示有误的问题
|
9 years ago |
|
guange
|
1413fe82dc
|
merge
|
9 years ago |
|
yuanke
|
c2166811eb
|
修改管理课程界面刷新显示问题
|
9 years ago |
|
yuanke
|
c6099177a4
|
修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等
|
9 years ago |
|
guange
|
5c0468f8fd
|
二维码过期改为一个月有效期
|
9 years ago |
|
guange
|
3c36e97ff1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
9 years ago |
|
huang
|
011b7ef4d4
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
yuanke
|
3a2e2c1174
|
未命名课程暂不允许进行课程管理
|
9 years ago |
|
yuanke
|
bb62ba40b7
|
修改微信权限问题、管理课程界面等
|
9 years ago |
|
huang
|
5a40174910
|
change show data's method
|
9 years ago |
|
cxt
|
5a22e9a147
|
作业启动匿评
|
9 years ago |
|
cxt
|
c224f97905
|
样式调整、线下作业的作品评分、导出作业成绩报500
|
9 years ago |
|
huang
|
040b6d4b9d
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
b22882aead
|
some data for css
|
9 years ago |
|
huang
|
fcf32474b6
|
modified days and hours for nil data
|
9 years ago |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
|
huang
|
e588321ada
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
61e2e427fd
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
406d636aac
|
add error system
|
9 years ago |
|
yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
daiao
|
41fc812ca4
|
修复班级配置--添加成员：用户名称太长的问题
|
9 years ago |
|
Tim
|
65cbf14d72
|
提交与取消按钮间添加间距；图标不显示等
|
9 years ago |
|
daiao
|
5c4e4e7c8a
|
修复删除班级后再删除课程，提示错误的问题
|
9 years ago |
|
cxt
|
3b418bc44c
|
如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。
|
9 years ago |
|
huang
|
ec32204809
|
sql_index --to chinese
|
9 years ago |
|
cxt
|
290abeeaa4
|
班级名称的显示
|
9 years ago |
