 huang
|
22745edb9b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
8b5a2ac1cb
|
message 500
|
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 |
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 |
|
Tim
|
65cbf14d72
|
提交与取消按钮间添加间距；图标不显示等
|
9 years ago |
|
cxt
|
3b418bc44c
|
如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。
|
9 years ago |
|
huang
|
ec32204809
|
sql_index --to chinese
|
9 years ago |
|
cxt
|
290abeeaa4
|
班级名称的显示
|
9 years ago |
|
cxt
|
3b91adf689
|
课程大纲内的编辑图标的显示与隐藏
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
Tim
|
b02c1b5995
|
提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；
|
9 years ago |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
9 years ago |
|
guange
|
a2ba65956c
|
.
|
9 years ago |
 daiao
|
c621602050
|
修复当鼠标移至区域内才会显示icon
|
9 years ago |
|
huang
|
b90c90bc60
|
add model error_list
|
9 years ago |
|
huang
|
92b6171c36
|
sonar error puts
|
9 years ago |
|
yuanke
|
a732efa6c6
|
1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
huang
|
88f8752490
|
添加权限
|
9 years ago |
|
yuanke
|
9eee510649
|
新建课程时创建的班级设为私有
|
9 years ago |
|
huang
|
2f8079e85c
|
版本 库存
|
9 years ago |
|
Tim
|
b6716e542a
|
wiki编辑页面更新
|
9 years ago |
|
yuanke
|
796c5d5666
|
修改课程列表还显示已删除班级的BUG
|
9 years ago |
|
Tim
|
0b764d0dfc
|
RSide样式处理
|
9 years ago |
|
Tim
|
75475b6058
|
个人主页，课程，项目样式更新
|
9 years ago |
|
yuanke
|
b994e786ab
|
我的动态中三类动态之间切换的效果
|
9 years ago |
|
daiao
|
db3056f1b1
|
隐藏班级列别的创建时间和创建名称！
|
9 years ago |
|
daiao
|
ad36a1b29e
|
修复课程下编辑框英文换行缺陷
|
9 years ago |
|
huang
|
f50c4a879b
|
modified total commits
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
83617f8475
|
我的资源--》课程资源下不应出现已删除课程的资源
|
9 years ago |
|
Tim
|
b91d6a3273
|
班级动态筛选框样式调整
|
9 years ago |
|
daiao
|
cc72ca8473
|
Merge branch 'develop' into daiao_dev
Conflicts:
db/schema.rb
|
9 years ago |
|
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
9 years ago |
|
cxt
|
3ccdf7f9ae
|
课程问答区，项目讨论区的帖子消息通知应直接打开对应的帖子详情界面
|
9 years ago |
|
yuanke
|
5ecb99196e
|
修改新建项目时公开后面的提示语
|
9 years ago |
|
cxt
|
eff4780ea9
|
去掉班级配置页面的自动填充
|
9 years ago |
|
cxt
|
17a2686d42
|
班级左侧头部信息的样式调整
|
9 years ago |
|
cxt
|
2956b08f40
|
分组作业：去掉组员“追加附件”的入口
|
9 years ago |
|
daiao
|
fff13f426a
|
Merge branch 'daiao_dev' of https://git.trustie.net/jacknudt/trustieforge into daiao_dev
|
9 years ago |
|
daiao
|
7ba930f5c6
|
更改课程列表下动态时间
|
9 years ago |
|
cxt
|
23eefc2b7f
|
班级主页：建议将如图所示适当往上调一点，与左侧头像对齐
|
9 years ago |
|
cxt
|
5f41e191b1
|
在线测验的提示信息
|
9 years ago |
|
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
9 years ago |
|
guange
|
373e3d3422
|
merge
|
9 years ago |
|
guange
|
48fb02a2d6
|
管理课程
|
9 years ago |
|
yuanke
|
9d0b5789d9
|
1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
|
9 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
9 years ago |
|
cxt
|
0dd7ef4460
|
帖子列表的回复数与实际不符
|
9 years ago |
|
cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
9 years ago |
|
guange
|
3c295ba5a1
|
merge
|
9 years ago |
|
guange
|
2c13184d9d
|
修改js引用
|
9 years ago |
|
guange
|
201abd6358
|
assets
|
9 years ago |
|
guange
|
b010ce2e61
|
发送课程完成
|
9 years ago |
|
yuanke
|
3159d16917
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
3737ef40d0
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
yuanke
|
447e624f36
|
课程大纲bug修复
|
9 years ago |
|
huang
|
d346679eaf
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
txz
|
6ac7d322b9
|
some added
|
9 years ago |
|
yuanke
|
62a7d56c97
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
70e26927cb
|
班级中的课程字样改为班级
|
9 years ago |
|
huang
|
171130ed74
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
txz
|
61b5a100eb
|
delete log messages
|
9 years ago |
|
txz
|
134aa55e04
|
authoriod
|
9 years ago |
|
yuanke
|
bc30f1128e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
1bfb2918f0
|
KE间距改回原来的，修改课程大纲附件删除下载问题，修改博客标题与置顶样式问题
|
9 years ago |
|
txz
|
8cc4b7a878
|
public questions
|
9 years ago |
|
Tim
|
28c20c966e
|
查看标签页面显示bug
|
9 years ago |
|
huang
|
67cad6fc25
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
374a905d1e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
e74a2ba275
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
b1a77a036b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
9 years ago |
|
cxt
|
0e2e1b09b5
|
title修改
|
9 years ago |
|
txz
|
25e77497e7
|
consloe pring
|
9 years ago |
|
cxt
|
8b87c141cc
|
bug修复
|
9 years ago |
|
yuanke
|
547d5409bb
|
组织中的课程字样改为班级
|
9 years ago |
|
cxt
|
0f8cc584a9
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
5a1090c0e1
|
bug修复
|
9 years ago |
|
yuanke
|
1edc63721f
|
修改课程列表班级时间显示问题
|
9 years ago |
|
Tim
|
afbf62fd64
|
当课程数为0时，课程列表点击无效
|
9 years ago |
|
cxt
|
6867a88a94
|
课程大纲样式调整
|
9 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
|
yuanke
|
8db5852a61
|
激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决
|
9 years ago |
|
txz
|
7178c50b1d
|
branch's total commits
|
9 years ago |
|
cxt
|
25b5d74a42
|
课程大纲的修改
|
9 years ago |
|
txz
|
21be94cbe1
|
add some links
|
9 years ago |
|
txz
|
1fbb65b906
|
获取结果ajax加载中
|
9 years ago |
|
cxt
|
f70b51769c
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
afe16cc99c
|
课程大纲列表的js调整
|
9 years ago |
|
Tim
|
def0d79271
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
|
9 years ago |
|
Tim
|
7633761bbe
|
课程大纲列表展开收起js
|
9 years ago |
|
cxt
|
b2aee9b1b8
|
新建课程大纲的描述
|
9 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
3b7679b254
|
课程大纲列表
|
9 years ago |
|
cxt
|
a50e15b2ab
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
txz
|
db1ad932c6
|
Function : update jenkins job
|
9 years ago |
|
yuanke
|
a8bd91754d
|
修改博客详情里面内容前面多空格的BUG
|
9 years ago |
|
txz
|
24f1375a4e
|
modified job
|
9 years ago |
|
Tim
|
10f52f110f
|
课程大纲列表点击展开收起，配置按钮链接跳转实现
|
9 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
9 years ago |
|
Tim
|
ba1db91a1e
|
css优化调整
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
daiao
|
2eb7aa7c38
|
修改精品课程下-全部课程下 除序列、主讲老师和课程名外的所有列进行排序！
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
Your Name
|
5c83414828
|
update
|
9 years ago |
|
guange
|
0bb5c8b5fb
|
注册绑定问题
|
9 years ago |
|
huang
|
f7e872cb6c
|
权限修改，项目成员都可以提交质量分析job
|
9 years ago |
|
huang
|
daf14178cd
|
修改权限，只有项目成员能够代码质量分析
|
9 years ago |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
9 years ago |
|
huang
|
b731b05a5a
|
中文
|
9 years ago |
|
Your Name
|
77387778d8
|
some css
|
9 years ago |
|
huang
|
653520763a
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
1225a33cec
|
提示
|
9 years ago |
|
Your Name
|
3390a2d05f
|
500
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
huang
|
36944e8cce
|
提示信息
|
9 years ago |
|
Your Name
|
c8178fc023
|
allert
|
9 years ago |
|
Your Name
|
e887ac5c7c
|
git data from sonar
|
9 years ago |
|
Your Name
|
3c3fb29bb2
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
Your Name
|
22b40c082c
|
resole some nil problems
|
9 years ago |
|
yuanke
|
233e7d5c91
|
Merge branch 'lingbing' into yuanke_org
Conflicts:
Gemfile
|
9 years ago |
 Linda
|
c24fdee134
|
个人资料页面新版修改
|
9 years ago |
|
yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
9 years ago |
|
huang
|
0a684227b8
|
如果sonar没扫描完成则暂时不读取数据
|
9 years ago |
|
guange
|
222855ea79
|
越过course表的validate,以防save invitecode 失败
|
9 years ago |
|
daiao
|
cb11cac506
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/admin/excellent_all_courses.html.erb
|
9 years ago |
|
guange
|
7fdfc02821
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
3c425edc3c
|
修复邀请码会变的问题
|
9 years ago |
|
Your Name
|
300ad68405
|
default path for sonar
|
9 years ago |
|
Your Name
|
a08edcca8a
|
quanxian
|
9 years ago |
|
cxt
|
4983d5283b
|
关联成员能多次添加
|
9 years ago |
|
cxt
|
cbe34ea0a7
|
分组作业提交作品时关联成员列表为空
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
|
daiao
|
d8284e45ed
|
在课程列表下增加动态时间一栏
|
9 years ago |
|
Your Name
|
dd6b19a8b5
|
some status of sonar
|
9 years ago |
|
daiao
|
863cdee37c
|
在精品课程的全部课程界面下增加公开属性
|
9 years ago |
|
guange
|
436de8ce5a
|
优先取env中的wechat url
|
9 years ago |
|
guange
|
57cdc1d5ec
|
协议修改
|
9 years ago |
