 yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
9 years ago |
 huang
|
8d625eff5e
|
修改方式就用户图像显示
|
9 years ago |
 daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
huang
|
643b06484b
|
消息表添加字段
|
9 years ago |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
9 years ago |
|
huang
|
0bf9b5c6e6
|
消息红点记录 个人主页添加加入项目入口
|
9 years ago |
 cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
9 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
9 years ago |
|
huang
|
824b430fbd
|
解决质量分支弹出空白页面问题
|
9 years ago |
|
cxt
|
a1553c7a8f
|
角色的修改
|
9 years ago |
|
daiao
|
5b30036639
|
单位名称列表功能
|
9 years ago |
|
huang
|
450217e7c2
|
同意加入消息发送，及添加成员
|
9 years ago |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
9 years ago |
|
daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
9 years ago |
|
yuanke
|
93844e757c
|
微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改
|
9 years ago |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
9 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
9 years ago |
|
yuanke
|
cf65e6748b
|
微信项目相关功能开发，班级角色功能等
|
9 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
9 years ago |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
7413298aad
|
项目邀请码申请及弹框
|
9 years ago |
|
huang
|
2f79e521ca
|
单位批准发送消息；申请单位给系统每位管理员发送消息
|
9 years ago |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
9 years ago |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
9 years ago |
|
daiao
|
f35b33b09e
|
单位申请记录用户信息（添加user_id）
|
9 years ago |
|
cxt
|
a0f2f518cf
|
回复他人的博客首页不应跳到自己的博客首页
|
9 years ago |
|
daiao
|
0d59f5a358
|
Merge branch 'daiao_dev' into develop
|
9 years ago |
|
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
9 years ago |
|
huang
|
f12423e8a6
|
issue动态中不能删除问题
|
9 years ago |
|
huang
|
d51295127d
|
issue删除回复删除附件的问题 同事关联删除
|
9 years ago |
|
huang
|
e7f862458f
|
issue回复问题； 二级回复编辑issue弹空白框问题
|
9 years ago |
|
daiao
|
6ab2c15504
|
修复先删除课程下的某班级，再删除该课程报错
|
9 years ago |
|
huang
|
b01e228d51
|
修复issue回复不能点击的问题
|
9 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
|
daiao
|
67bdea314a
|
作品列表-分班过滤：点击“请选择分班”过滤显示所有学生
|
9 years ago |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
9 years ago |
guange
|
6a871e2116
|
.
|
9 years ago |
|
guange
|
9d2900d58f
|
解决没绑定用户不跳转到绑定页问题
|
9 years ago |
|
cxt
|
0564ddb6ea
|
课程大纲的回复
|
9 years ago |
|
huang
|
35172dab59
|
管理员界面单位申请框架
|
9 years ago |
|
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
9 years ago |
|
cxt
|
6c7925a7b4
|
样式调整
|
9 years ago |
|
cxt
|
45fb2d0a3e
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
cxt
|
808b553e43
|
班级动态只有10条，底部却显示“点击展开更多”
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
cxt
|
02a5254943
|
课程大纲的回复展开更多无反应
|
9 years ago |
|
huang
|
19734c1aa4
|
组织匿名用户问题
|
9 years ago |
|
yuanke
|
cdb7782849
|
除了issue 和news都增加了二级回复显示
|
9 years ago |
|
cxt
|
9422e2886c
|
新版班级主页
|
9 years ago |
|
huang
|
6fea64afe2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1e28ff880d
|
新版课程大纲
|
9 years ago |
|
huang
|
ff8cad5cf2
|
项目动态中添加提交动态
|
9 years ago |
|
yuanke
|
86731c34d5
|
单个课程作业不显示的BUG修改，加入班级时如果班级已被删除需要提示!
|
9 years ago |
|
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
9 years ago |
|
yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
yuanke
|
7cd505ea4b
|
博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
|
9 years ago |
|
cxt
|
9a4c210d16
|
组织文章的“点击展开隐藏楼层”
|
9 years ago |
|
cxt
|
c84a9e6e10
|
个人主页，不需要对其他用户显示关注人的动态。例如，我看周老师的个人主页时，不应该显示我的博客动态；但他本人看自己的主页时，应该显示尹刚的博客动态，因为他关注我了。
|
9 years ago |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
9 years ago |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
9 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
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 |
|
huang
|
1935176500
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
guange
|
674c45f1d9
|
去掉上传的csrf报错
|
9 years ago |
|
huang
|
cf04bb5ec6
|
迁移上线
|
9 years ago |
|
huang
|
04fe06eff9
|
gitlab数据迁移
|
9 years ago |
|
cxt
|
fdf925a0b8
|
个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了
|
9 years ago |
|
cxt
|
8e3488132b
|
导入作业：公共题库中显示的却是我的题库，我的题库中显示的却是公共题库
|
9 years ago |
|
yuanke
|
ff13d2e572
|
微信增加作业发送，修改发送的权限，修改菜单
|
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
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
0a1ecd65e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
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
|
11e0101f56
|
导航栏题库中 我的题库放在前面
|
9 years ago |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
9 years ago |
|
guange
|
0e415fffff
|
merge
|
9 years ago |
|
huang
|
38cc3c2010
|
发送过来的资源在项目中添加动态
|
9 years ago |
|
yuanke
|
dc2ba96353
|
用户注册发送绑定成功消息通知，加入班级消息通知点击跳入班级
|
9 years ago |
|
yuanke
|
b8c8b2c4ae
|
修改加入班级的提示
|
9 years ago |
|
yuanke
|
6ab1269c01
|
修改微信反馈框加入重复班级提示有误的问题
|
9 years ago |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
9 years ago |
|
yuanke
|
d50fd40307
|
Merge branch 'weixin_guange' into develop
|
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
|
9b59ca20de
|
修复issue详情页面，删除回复后再编辑保存issue弹出白色框问题
|
9 years ago |
|
yuanke
|
1e8f496718
|
代码查重结果 不显示未提交的作品
|
9 years ago |
|
daiao
|
dcc37ef847
|
增加作品查看界面中，班级查询条件下，增加暂无分班的查询条件
|
9 years ago |
|
cxt
|
ded8f48d34
|
博客的二级回复
|
9 years ago |
|
huang
|
61bf6604b1
|
解决ajax情况下，issue状态选框不显示问题
|
9 years ago |
|
cxt
|
16cf8a56a1
|
管理员和老师可看到课程下的所有班级
|
9 years ago |
|
huang
|
191261d3b8
|
each time to 10s
|
9 years ago |
|
yuanke
|
824f9d9174
|
新增创建班级的模版消息
|
9 years ago |
|
guange
|
4908a68a7d
|
时间utc问题
|
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 |
|
huang
|
e766adf087
|
add delete to qa
|
9 years ago |
|
yuanke
|
d75e2b740f
|
微信点击我的课程里面的两个按钮时没绑定会提示绑定
|
9 years ago |
|
huang
|
22745edb9b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
8b5a2ac1cb
|
message 500
|
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 |
|
cxt
|
834e72b0f8
|
未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除
|
9 years ago |
|
huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
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 |
|
huang
|
f77bad34ad
|
缩短时间
|
9 years ago |
|
huang
|
8785264e07
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
62cb7d4568
|
add css
|
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
|
6115b7fa4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
3362ebe321
|
线下作业
|
9 years ago |
|
huang
|
011b7ef4d4
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
5a40174910
|
change show data's method
|
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 |
|
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 |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
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 |
|
huang
|
2f8079e85c
|
版本 库存
|
9 years ago |
|
huang
|
f50c4a879b
|
modified total commits
|
10 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
83617f8475
|
我的资源--》课程资源下不应出现已删除课程的资源
|
10 years ago |
|
daiao
|
cc72ca8473
|
Merge branch 'develop' into daiao_dev
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
5f41e191b1
|
在线测验的提示信息
|
10 years ago |
|
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
10 years ago |
|
guange
|
48fb02a2d6
|
管理课程
|
10 years ago |
|
cxt
|
0dd7ef4460
|
帖子列表的回复数与实际不符
|
10 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
|
10 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
10 years ago |
|
guange
|
3c295ba5a1
|
merge
|
10 years ago |
|
guange
|
b010ce2e61
|
发送课程完成
|
10 years ago |
|
huang
|
d346679eaf
|
Merge branch 'rep_quality' into develop
|
10 years ago |
 txz
|
6ac7d322b9
|
some added
|
10 years ago |
|
huang
|
171130ed74
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
txz
|
61b5a100eb
|
delete log messages
|
10 years ago |
|
yuanke
|
bc30f1128e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
yuanke
|
1bfb2918f0
|
KE间距改回原来的，修改课程大纲附件删除下载问题，修改博客标题与置顶样式问题
|
10 years ago |
|
txz
|
8cc4b7a878
|
public questions
|
10 years ago |
|
huang
|
67cad6fc25
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
374a905d1e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
e74a2ba275
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
10 years ago |
|
txz
|
25e77497e7
|
consloe pring
|
10 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
10 years ago |
|
yuanke
|
8db5852a61
|
激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决
|
10 years ago |
|
txz
|
7178c50b1d
|
branch's total commits
|
10 years ago |
|
cxt
|
25b5d74a42
|
课程大纲的修改
|
10 years ago |
|
txz
|
1fbb65b906
|
获取结果ajax加载中
|
10 years ago |
|
cxt
|
b2aee9b1b8
|
新建课程大纲的描述
|
10 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
10 years ago |
|
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
txz
|
db1ad932c6
|
Function : update jenkins job
|
10 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
10 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
10 years ago |
|
daiao
|
2eb7aa7c38
|
修改精品课程下-全部课程下 除序列、主讲老师和课程名外的所有列进行排序！
|
10 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
10 years ago |
Your Name
|
5c83414828
|
update
|
10 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
|
10 years ago |
|
Your Name
|
3390a2d05f
|
500
|
10 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
10 years ago |
|
Your Name
|
c8178fc023
|
allert
|
10 years ago |
|
Your Name
|
e887ac5c7c
|
git data from sonar
|
10 years ago |
|
Your Name
|
3c3fb29bb2
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
10 years ago |
|
Your Name
|
22b40c082c
|
resole some nil problems
|
10 years ago |
|
yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
10 years ago |
|
huang
|
0a684227b8
|
如果sonar没扫描完成则暂时不读取数据
|
10 years ago |
|
guange
|
7fdfc02821
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
10 years ago |
|
Your Name
|
300ad68405
|
default path for sonar
|
10 years ago |
|
Your Name
|
a08edcca8a
|
quanxian
|
10 years ago |
|
cxt
|
cbe34ea0a7
|
分组作业提交作品时关联成员列表为空
|
10 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
10 years ago |
|
Your Name
|
dd6b19a8b5
|
some status of sonar
|
10 years ago |
|
guange
|
436de8ce5a
|
优先取env中的wechat url
|
10 years ago |
|
guange
|
57cdc1d5ec
|
协议修改
|
10 years ago |
|
Your Name
|
f930bbddad
|
modified create
|
10 years ago |
|
Your Name
|
e5b93ac7ed
|
modified main method
|
10 years ago |
|
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
10 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
10 years ago |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
10 years ago |
|
guange
|
c501af70ba
|
.
|
10 years ago |
|
Your Name
|
69f7dab04d
|
some modified
|
10 years ago |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
10 years ago |
|
Your Name
|
c658296e2b
|
config
|
10 years ago |
|
Your Name
|
537f152562
|
0
|
10 years ago |
|
cxt
|
0d66763026
|
迟交扣分
|
10 years ago |
|
guange
|
b5bfe40693
|
.
|
10 years ago |
|
guange
|
9e61f2229e
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
10 years ago |
|
guange
|
084b545be9
|
修改为正式版
|
10 years ago |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
10 years ago |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
10 years ago |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
10 years ago |
|
guange
|
4436e87c84
|
.
|
10 years ago |
|
cxt
|
c0e58d19fa
|
导出的作业成绩中的缺评、迟交扣分应与作品列表的一致
|
10 years ago |
|
Your Name
|
eae70f9c71
|
some config
|
10 years ago |
|
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
10 years ago |
|
guange
|
9a9f6400da
|
.
|
10 years ago |
|
guange
|
c522d7160c
|
.
|
10 years ago |
|
guange
|
9ec1f916b6
|
.
|
10 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
10 years ago |
|
guange
|
7e2482167d
|
.
|
10 years ago |
|
guange
|
16a9f017b6
|
error
|
10 years ago |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
10 years ago |
|
guange
|
485d0e3743
|
ticket处理
|
10 years ago |
|
Your Name
|
06fe02890f
|
index for sonar result
|
10 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
10 years ago |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
10 years ago |
|
Your Name
|
128f6721be
|
stoped the zhizhen
|
10 years ago |
|
Your Name
|
de80403e8d
|
add address to config
|
10 years ago |
|
cxt
|
bd3277681c
|
分组作业的作业成绩导出、学生列表的导出
|
10 years ago |
|
Your Name
|
e6b263feb5
|
issues from sonar
|
10 years ago |
|
guange
|
52d4d36097
|
邀请码页面
|
10 years ago |
|
cxt
|
e457593416
|
作品列表--导出作业成绩：excel中增加缺评扣分、迟交扣分情况
|
10 years ago |
|
Your Name
|
53b9cbee72
|
added hightcharts and added some api for sonar
|
10 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
10 years ago |
|
Your Name
|
3fe5d9a1a3
|
get date froma sonar
|
10 years ago |
|
guange
|
d466b09f3f
|
.
|
10 years ago |
|
Your Name
|
ce6e6116b5
|
get data from sonar API
|
10 years ago |
|
guange
|
1470cafe57
|
.
|
10 years ago |
|
guange
|
9b42b4e7f7
|
.
|
10 years ago |
|
guange
|
40217d5c56
|
.
|
10 years ago |
|
guange
|
0929d2ac28
|
.
|
10 years ago |
|
guange
|
7700445c17
|
加入课程
|
10 years ago |
|
yuanke
|
9461c41fa7
|
激活留言修改
|
10 years ago |
|
yuanke
|
b68e227531
|
没激活的帐号界面
|
10 years ago |
|
guange
|
8129e29d5b
|
.
|
10 years ago |
|
guange
|
f791f37205
|
.
|
10 years ago |
|
guange
|
5b087179eb
|
.
|
10 years ago |
|
guange
|
833c5a5ede
|
.
|
10 years ago |
|
guange
|
4663f48496
|
修改跳转菜单
|
10 years ago |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
10 years ago |
|
Your Name
|
2275fe6d23
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
10 years ago |
|
Your Name
|
9e7cde6056
|
stable version for sonar
|
10 years ago |
|
huang
|
494b69c89b
|
sonar数据获取
|
10 years ago |
|
huang
|
dee53a1383
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/repositories/_quality_analyses.html.erb
|
10 years ago |
|
huang
|
e3b6bd19e1
|
修改质量分支控制器名
|
10 years ago |
|
Your Name
|
26b7c3e70b
|
aqulity analysis
|
10 years ago |
|
cxt
|
7e25ec1a00
|
登录报500
|
10 years ago |
|
Your Name
|
d5631defb5
|
added xml to jenkins and added some gems
|
10 years ago |
|
guange
|
1d6d100983
|
.
|
10 years ago |
|
guange
|
6f14b61cce
|
.
|
10 years ago |
|
guange
|
4b813ef535
|
加入班级消息
|
10 years ago |
|
guange
|
c940527694
|
.
|
10 years ago |
|
guange
|
62a1b5de7c
|
加入班级更新
|
10 years ago |
|
huang
|
96e00f7bf3
|
jenkins连接
|
10 years ago |
|
guange
|
c6f04db19e
|
wechat
|
10 years ago |
|
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
10 years ago |
|
guange
|
b7230333dc
|
code获取修改
|
10 years ago |
|
guange
|
3f98562c0f
|
打包
|
10 years ago |
|
huang
|
36e47fa8b1
|
代码质量分析，弹框参数传递
|
10 years ago |
|
guange
|
9d19caa736
|
.
|
10 years ago |
|
guange
|
7aec37bb3a
|
.
|
10 years ago |
|
guange
|
98c6548e39
|
重写登录和注册
|
10 years ago |
|
cxt
|
7b1efe193d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
eb3694dbe6
|
消息报500
|
10 years ago |
|
yuanke
|
fde3fd0d94
|
新建贴吧跳入该贴吧帖子列表，组织栏目配置默认选择第一个栏目类型
|
10 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
35ee17c4ca
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
huang
|
d0791253d9
|
quality
|
10 years ago |
|
cxt
|
1dac05c6d1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
fea21fe7cd
|
Merge branch 'develop' into rep_quality
|
10 years ago |
|
yuanke
|
70a762220a
|
组织、项目的资源文件增加描述修改及上传文件时候添加描述，并且所有操作对超级管理员开放
|
10 years ago |
|
cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
10 years ago |
|
yuanke
|
049a21c7d0
|
不上线的先还原
|
10 years ago |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
10 years ago |
|
cxt
|
03b92f8570
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
yuanke
|
1023b94f0d
|
新建贴吧之后转入这个贴吧界面,组织配置栏目默认选择第一项
|
10 years ago |
|
huang
|
9b6f40bb02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
yuanke
|
5a7f7da1f7
|
新建贴吧和组织配置默认选项暂时还原。
|
10 years ago |
|
huang
|
d75a8bc35a
|
Merge branch 'hjq_beidou' into develop
|
10 years ago |
|
yuanke
|
7b6e8fbc53
|
修改组织点击登录后可回复报500的BUG
|
10 years ago |
|
cxt
|
caa966c85a
|
分组作业的作品列表提示的修改
分组作业提交作品时的最小人数限制不起作用
|
10 years ago |
|
cxt
|
c50d307e89
|
分组作业添加成员后再次打开，数据未保存
|
10 years ago |
|
huang
|
5515fb660f
|
完成资源更新的时候 描述继承问题，并且可以修改描述
|
10 years ago |
|
huang
|
d21df48961
|
代码质量分析弹框及参数传入
|
10 years ago |
|
cxt
|
6100abe0da
|
课程大纲
|
10 years ago |
|
huang
|
9029fd91e0
|
rails 代码中调用shell命令调用
|
10 years ago |
|
huang
|
0c25e3b13d
|
版本库质量分析 ssh链接
|
10 years ago |
|
yuanke
|
e86419c28b
|
组织配置里面栏目类型默认为帖子
|
10 years ago |
|
cxt
|
3a8a61e404
|
在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序
|
10 years ago |
|
cxt
|
be47331213
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
huang
|
c9021eb70f
|
版本库附件打包下载从配置文件获取
|
10 years ago |
|
cxt
|
9d36c74d7f
|
作业回复的删除
|
10 years ago |
|
cxt
|
24f5e245df
|
鼠标经过消息通知时弹窗显示最新的5条未读消息
|
10 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
huang
|
90aaaa544a
|
最新动态按创建时间排序
|
10 years ago |
|
huang
|
2f9dcc8a31
|
文章点击500问题
|
10 years ago |
|
huang
|
49406681ef
|
详情页面留言为空的问题
|
10 years ago |
|
huang
|
67f0cad331
|
组织网站动态新页面
|
10 years ago |
|
huang
|
e4f48f046b
|
子页面没有内容显示
|
10 years ago |
|
huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
10 years ago |
|
huang
|
a8b68d64ee
|
导航权限控制
|
10 years ago |
|
huang
|
3e2810129b
|
课程留言动态过滤掉
|
10 years ago |
|
cxt
|
768d91278d
|
微信提示信息的修改
|
10 years ago |
|
huang
|
c5bccf1adb
|
组织动态按更新时间排序
|
10 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
10 years ago |
|
huang
|
acf4a64e6a
|
二级帖子子页面
|
10 years ago |
|
huang
|
59988f17da
|
帖子目录界面
|
10 years ago |
|
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
10 years ago |
|
huang
|
b8d49f0079
|
0
|
10 years ago |
|
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
d3c6c0ca99
|
二级目录未登录时回复提示
|
10 years ago |
|
huang
|
c6d36bd738
|
未登录留言判断
|
10 years ago |
|
cxt
|
6a25adb37e
|
最新动态改成我的动态，提示修改
|
10 years ago |
|
cxt
|
fe22cfa5c5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
e4ff4ad156
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
huang
|
57f3cf713c
|
去掉搜索
|
10 years ago |
|
cxt
|
07941233d8
|
题库点击发送到后，先输入一个不存在的课程ID，点击确定，在出现请先选择课程的提示后删除输入的ID，此时会显示出该用户所有的课程，包括已经删除的
|
10 years ago |
|
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
d27a050ffa
|
消息弹窗的显示
|
10 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
10 years ago |
|
huang
|
5ec9e31626
|
精品项目，精品课程按照动态数排序
|
10 years ago |
|
huang
|
3af115ee54
|
组织新版样式，及方法优化
|
10 years ago |
|
huang
|
ca3b072f85
|
热门项目按照项目得分排序及设置界面中默认设置
|
10 years ago |
|
huang
|
432baebdc3
|
组织默认activite status
|
10 years ago |
|
huang
|
6fbad6d53d
|
右二优化
|
10 years ago |
|
huang
|
257165dbaf
|
模式二中添加课程定配
|
10 years ago |
