huang
|
a6f9c3375e
|
代码质量分析加入“未解决质量问题数”
|
9 years ago |
huang
|
8c4f943f83
|
注释掉资源提示
|
9 years ago |
huang
|
5237d9664f
|
css for avatar
|
9 years ago |
huang
|
803bd9819a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/css/public.css
|
9 years ago |
huang
|
9b86661f4a
|
<ul class=contribute-list>
|
9 years ago |
huang
|
420a17a7e4
|
资源提示统计数字及权限修改
|
9 years ago |
cxt
|
f25a90cccd
|
项目的非创建者管理员也可编辑项目头像
|
9 years ago |
cxt
|
5fbb9f56a6
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
cxt
|
148aa9cda9
|
首页头像调整
|
9 years ago |
huang
|
af68f4ca76
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/files/_course_file.html.erb
app/views/files/_project_file.html.erb
|
9 years ago |
huang
|
a71f948f41
|
项目、课程资源库添加私有资源提示
|
9 years ago |
cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
yuanke
|
21df119c59
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
yuanke
|
a66ecf6c28
|
修改图片地址
|
9 years ago |
Tim
|
3f7c623163
|
新增资源提示框
|
9 years ago |
huang
|
a434942b6d
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
60a76e64a5
|
贡献列表
|
9 years ago |
cxt
|
cdffaed1ea
|
班级主页设置班级为公开私有时刷新资源库页面
|
9 years ago |
cxt
|
eb20ca4ffe
|
新建班级时班级名称实例要加上课程名称
|
9 years ago |
cxt
|
0d05d04d2c
|
头像编辑的样式调整
|
9 years ago |
cxt
|
62e28f638c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
app/views/layouts/base_projects.html.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
9 years ago |
yuanke
|
fcf6325761
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
yuanke
|
2a6321cd9e
|
发布帖子标题长度改为128
|
9 years ago |
Tim
|
a8f30fe85f
|
个人主页,课程,项目头像、logo增加编辑按钮
|
9 years ago |
daiao
|
d37cbaad61
|
1.完善资料流程优化;2.基本资料从业者单位保存丢失问题
|
9 years ago |
cxt
|
f4b5a5cf4e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
Tim
|
fbad4ecd8a
|
班级页面logo及行间距调整;测导航数字大小背景调整
|
9 years ago |
cxt
|
cb5e5f18ce
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
9 years ago |
Tim
|
27678d09f6
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
Tim
|
df1039cd09
|
项目收藏按钮位置调整
|
9 years ago |
cxt
|
d8117f9576
|
作品列表页面中分组作业关联项目的综合评分应与项目首页的评分一致
|
9 years ago |
daiao
|
758aaca12a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
daiao
|
a466fdd64e
|
强制修改基本资料:申请单位点击确定后,进入主页面;提问按钮不可用
|
9 years ago |
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
9 years ago |
huang
|
3778871f58
|
issue在项目动态、列表、用户动态中删除回复添加提示
|
9 years ago |
huang
|
69301a1120
|
Pull reques登录提示(权限控制)
|
9 years ago |
huang
|
799c451921
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
21c48ea383
|
at所有人
|
9 years ago |
huang
|
80c6132ba5
|
Merge branch 'rep_quality' into develop
|
9 years ago |
huang
|
7493de1334
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
0cc59260cd
|
modified sonar list form of language
|
9 years ago |
cxt
|
56b74b755b
|
取消收藏
|
9 years ago |
huang
|
8cc60ef1e8
|
delete some language of quality_analysis
|
9 years ago |
cxt
|
ea7f65308e
|
at所有人后不应带有用户登录名
|
9 years ago |
cxt
|
7d89f69981
|
班级和项目收藏夹
|
9 years ago |
daiao
|
a3ec35c008
|
个人主页报500
|
9 years ago |
huang
|
f0ed380002
|
Merge branch 'rep_quality' into develop
|
9 years ago |
daiao
|
90803fbb2a
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
daiao
|
8b0c0925dd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
daiao
|
078900088a
|
修复:新建组织关联trustie-forge项目,点击组织动态的论坛动态报500
|
9 years ago |
cxt
|
6af43070c7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
Tim
|
bb2b51aa8d
|
收藏按钮增加title
|
9 years ago |
Tim
|
57ecffc130
|
班级新增收藏功能
|
9 years ago |
cxt
|
5d5bd88c88
|
个人主页:用户不应有修改他人头像的权限
|
9 years ago |
cxt
|
74b15229fb
|
at所有人
|
9 years ago |
daiao
|
5088770214
|
修复:文章附件和资源栏目下载权限一致
|
9 years ago |
daiao
|
7e34062435
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
huang
|
ea6b928188
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
5e98884801
|
tip for sonar
|
9 years ago |
cxt
|
06361246c7
|
作品列表中的已提交人数无法自动刷新
|
9 years ago |
cxt
|
572ad5a162
|
个人主页的课程和项目展开出现重复数据
|
9 years ago |
huang
|
ea3ba1f71e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
577aa40ea1
|
time for nil
|
9 years ago |
huang
|
7c28f97208
|
get quality analisys update time
|
9 years ago |
huang
|
ff592c106e
|
sonar最新触发时间获取
|
9 years ago |
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
9 years ago |
huang
|
1f4f03d8ed
|
修改项目列表中的资源链接
|
9 years ago |
cxt
|
a4a0ef139b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
1374444ec1
|
左侧项目列表的展开
|
9 years ago |
huang
|
3ce088002a
|
留言和已关闭流程修改
|
9 years ago |
Tim
|
f67336fbe5
|
课程信息单词折行
|
9 years ago |
huang
|
d7faed7f6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
35260f2f6d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
cxt
|
f4e965c9fb
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
cxt
|
2759d562ac
|
首页项目列表
|
9 years ago |
huang
|
9003040d6a
|
版本库获取动态API修改
|
9 years ago |
daiao
|
4a9967674a
|
1. 强制编辑基本资料,在删除单位时给出消息通知
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像,并连接到申请人主页
|
9 years ago |
huang
|
93f8ac31f1
|
项目资源库新分页及ajax刷新
|
9 years ago |
huang
|
00f032816c
|
版本库获取方式修改
|
9 years ago |
guange
|
a761bfe3f8
|
.
|
9 years ago |
huang
|
37df983009
|
项目列表
|
9 years ago |
huang
|
1b19d227f9
|
项目列表样式及连接
|
9 years ago |
huang
|
ce9c2d3d06
|
搜索的时候分页刷新
|
9 years ago |
huang
|
75971120f7
|
Merge branch 'develop' into rep_quality
|
9 years ago |
huang
|
047eea125d
|
课程资源分页及局部刷新
|
9 years ago |
huang
|
7efc8ccac6
|
新建项目,增加项目名称输入例
|
9 years ago |
yuanke
|
24a0bfea77
|
分享修改
|
9 years ago |
yuanke
|
3a000a360a
|
appid 修改
|
9 years ago |
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定,然后注册的时候将已绑定的用户信息修改为注册的信息
|
9 years ago |
cxt
|
03c093fb13
|
班级作业列表中“赞”和“取消点赞”不可用
|
9 years ago |
huang
|
8eaeea299a
|
相同分支和项目消息JS提示
|
9 years ago |
huang
|
3df8a46634
|
PUll request代码简化及reverse评论
|
9 years ago |
huang
|
41ad5ca444
|
修改Gitlab接口返回创建时间
|
9 years ago |
Tim
|
f4445619d2
|
题库预览弹框样式调整
|
9 years ago |
huang
|
a9942fd4b3
|
change integer to A
|
9 years ago |
Tim
|
59a76c3b9a
|
调整组织上传资源弹窗位置
|
9 years ago |
cxt
|
bae0562b97
|
适用专业和先修课程的换行显示
|
9 years ago |
cxt
|
9b8470b813
|
编辑分组作业后点确定,原来设置的基于项目实施会被取消
|
9 years ago |
huang
|
88e35c7431
|
quality list
|
9 years ago |
huang
|
56afad9242
|
质量分析列表中添加时间和版本
|
9 years ago |
cxt
|
d99348c245
|
测验描述超出边框
|
9 years ago |
Tim
|
83323e7d18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
Tim
|
ba7f9ed735
|
班级、项目侧导航文字缩小
|
9 years ago |
huang
|
b046f24b44
|
合并信息提交
|
9 years ago |
cxt
|
7edb30754b
|
student_works添加字段commit_time,记录学生作品实际的提交时间
|
9 years ago |
huang
|
98a8702ba6
|
记录谁合并的pull request请求
|
9 years ago |
huang
|
5ad063b830
|
记录接受PR用户信息,并且唯一性判断
|
9 years ago |
huang
|
8af8147ebb
|
代码分析列表加上时间
|
9 years ago |
cxt
|
a50ac2d79d
|
禁用匿评的作业提交时不要显示“提示:作品名称和描述中不要出现真实的姓名信息”的提示
|
9 years ago |
huang
|
e2557aede8
|
test jenkins
|
9 years ago |
cxt
|
0cc9fafddb
|
“关注、粉丝”页面中分页显示要紧跟上面的内容
|
9 years ago |
cxt
|
0ed508a887
|
题库预览弹窗的调整
|
9 years ago |
cxt
|
8de8035441
|
班级首页顶部加上主讲老师的链接
|
9 years ago |
huang
|
4f3b41f323
|
详情页面提供分页(评论、变更、提交)
|
9 years ago |
cxt
|
65f6b0fc70
|
新建课程报500
|
9 years ago |
huang
|
867434531d
|
pull request 列表页面添加分页
|
9 years ago |
cxt
|
4a527dc84e
|
Merge branch 'cs_optimize_txz' into develop
|
9 years ago |
huang
|
87c5f50545
|
PULL request 评论创建及局部刷新
|
9 years ago |
huang
|
b7bccc7d22
|
PR添加评论 列表页面
|
9 years ago |
Tim
|
5838e8f810
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
Tim
|
5dd6244a34
|
pull request添加留言
|
9 years ago |
cxt
|
547aae0743
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
2951259d23
|
左侧项目列表的展开
|
9 years ago |
cxt
|
153e02c4fa
|
消息列表报500
|
9 years ago |
cxt
|
40dc9b761f
|
未配置课程的班级报404
|
9 years ago |
huang
|
d1b4e83fee
|
完成pull request 关闭功能
|
9 years ago |
huang
|
26c11693fd
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
518d6bacbe
|
添加关闭pull request功能
|
9 years ago |
huang
|
ecc6f5601e
|
接受请求后显示admin问题
|
9 years ago |
huang
|
2bdf3d573b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
20fac3852d
|
合并信息
|
9 years ago |
daiao
|
85c16ca9e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
daiao
|
e89d7398aa
|
申请管理消息通知
|
9 years ago |
cxt
|
90e480f7e9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
5b8883960b
|
Merge branch 'cxt_course' into develop
|
9 years ago |
Tim
|
0200590a70
|
待处理合并无更新内容时,页尾显示偏移bug
|
9 years ago |
cxt
|
d3db6719eb
|
“我的作业”中编辑作业不跳转到“题库”,而是返回到“我的作业”
|
9 years ago |
huang
|
910fe0f48c
|
css
|
9 years ago |
huang
|
f54eafce76
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
a46aba1491
|
样式调整
|
9 years ago |
Tim
|
ee1d30b277
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
9 years ago |
huang
|
42e616bdea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
7c484b4f4a
|
页面显示问题
|
9 years ago |
Tim
|
920e470f6d
|
pull request列表省略号显示
|
9 years ago |
Tim
|
d4f08f6498
|
课程logo替换,邀请码样式更改,班级路径显示主讲教师
|
9 years ago |
cxt
|
ea4f0d7d9d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
aaaeb4b8da
|
子域名申请消息报错
|
9 years ago |
huang
|
3afdeda4d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
af7e507279
|
合并权限
|
9 years ago |
huang
|
3ef2509d27
|
报告人员加入项目不用提醒
|
9 years ago |
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
9 years ago |
cxt
|
fb5a969fd3
|
消息弹窗
|
9 years ago |
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
9 years ago |
daiao
|
7fbca5f260
|
单位审查消息及其BUG修复
|
9 years ago |
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
9 years ago |
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
huang
|
43a4e0a2bf
|
fork成功不跳转提示
|
9 years ago |
huang
|
308b050612
|
link to路由问题
|
9 years ago |
huang
|
b62ac02c15
|
自身分支创建PR修改
|
9 years ago |
Tim
|
56452d69f4
|
侧导航字体大小,颜色更改
|
9 years ago |
huang
|
4ec8cc9a50
|
PR新建相关功能完善
|
9 years ago |
huang
|
f3c0c25d76
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
b86b2299a7
|
fork分支选择 js
|
9 years ago |
Tim
|
c679b986d6
|
侧导航新增请求快捷链接
|
9 years ago |
huang
|
b297446778
|
select选择框
|
9 years ago |
huang
|
ab6acb460e
|
forke项目发送pull request API
|
9 years ago |
huang
|
f4bda16469
|
fork分支PR
|
9 years ago |
huang
|
5419103268
|
修改API(gitlab中创建所有pullrequest为Admin的问题)
|
9 years ago |
cxt
|
b7c05fed4a
|
首页样式和js调整
|
9 years ago |
huang
|
99fa39371d
|
接受请求ajax刷新
|
9 years ago |
huang
|
9eb084c3bd
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/_show.html.erb
|
9 years ago |
huang
|
515649beb6
|
接受PR局部刷新及跳转
|
9 years ago |
Tim
|
33467d3152
|
已处理页面样式;新建时选择项目刷新分支js
|
9 years ago |
huang
|
54a9fadbd1
|
判断合并和未合并的pr
|
9 years ago |
huang
|
362e95d103
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
7084a3fed9
|
新建pull request的时候JS控制标题不能为空
|
9 years ago |
Tim
|
6f1b7f827e
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
Tim
|
b8a40862ce
|
改变行代码格式化,不折行
|
9 years ago |
huang
|
1f5c4a800f
|
代码没有改动时候提示
|
9 years ago |
huang
|
0b3e1f558c
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/show.html.erb
|
9 years ago |
huang
|
21747d02a2
|
新建PR成功后JS跳转HTML跳转,相关页面局部刷新,及错误提示
|
9 years ago |
cxt
|
6c7b53f7d4
|
首页左侧栏
|
9 years ago |
yuanke
|
aaa1c01eed
|
微信动态分享图片修改
|
9 years ago |
Tim
|
f444d6fab0
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/_form.html.erb
|
9 years ago |
Tim
|
cedff021ad
|
分支下拉框样式;改动样式;无合并内容提示
|
9 years ago |
huang
|
a62ede1a33
|
先建pull request及局部刷新
|
9 years ago |
huang
|
2e91da4f28
|
项目分支获取
|
9 years ago |
daiao
|
7f62de59e1
|
优化周二代码审查的代码
|
9 years ago |
huang
|
c20b679c22
|
PR new调整
|
9 years ago |
huang
|
f8b53b8dfc
|
Pull request列表页面分类
|
9 years ago |
huang
|
9f9eed2e27
|
隐藏编辑功能
|
9 years ago |
huang
|
22a8adb64e
|
添加统计数目
|
9 years ago |
huang
|
b8cccdffda
|
完成changes数据获取及展示
|
9 years ago |
huang
|
8e329db4d8
|
pull request commits样式调整
|
9 years ago |
huang
|
27e755a0a9
|
数据获取及展示
|
9 years ago |
cxt
|
f262447ff1
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/user_homeworks.html.erb
|
9 years ago |
cxt
|
cecf917764
|
从题库选用作业时增加提示:“您选中的题是“我收到的作业”,不能选用”
|
9 years ago |
Tim
|
a5fe620452
|
题库翻页居中对齐
|
9 years ago |
huang
|
0a9224d036
|
每次请求提交的代码
|
9 years ago |
cxt
|
bae775ec34
|
题库的搜索调整
|
9 years ago |
huang
|
be081f5c66
|
添加Api(提交内容,改动)及相关方法路由
|
9 years ago |
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
9 years ago |
cxt
|
718b13e6c1
|
新版题库
|
9 years ago |
huang
|
1cb6809bdf
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/new.html.erb
|
9 years ago |
huang
|
182c861b30
|
创建pull request
|
9 years ago |
Tim
|
e7fa38e52c
|
pull request show页面
|
9 years ago |
yuanke
|
6ee6cdf28f
|
微信项目加入审核修改
|
9 years ago |
daiao
|
5f969c6593
|
单位审核相关Bug修复
|
9 years ago |
yuanke
|
65719add19
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
guange
|
6f2b84570f
|
去除调试模式
|
9 years ago |
guange
|
2a67ec5407
|
配置登录页菜单
|
9 years ago |
guange
|
2632f7aa59
|
引入wechat js sdk
|
9 years ago |
huang
|
5e9c27b63d
|
代码封装
|
9 years ago |
Tim
|
b91bb1f0d2
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
Tim
|
c8dce2c2fc
|
请求处理页面
|
9 years ago |
huang
|
56a444dac0
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
3ce1ac80b4
|
pull_request ---> new
|
9 years ago |
Tim
|
09f25588a8
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
Tim
|
7e440596ab
|
新建请求,js效果
|
9 years ago |
huang
|
20bdd23665
|
pull requtst show
|
9 years ago |
huang
|
d286d3fe06
|
pullrequest头部
|
9 years ago |
Tim
|
3e95b070d0
|
合并请求代码
|
9 years ago |
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
9 years ago |
huang
|
94b36e227c
|
申请加入项目消息刷新,同时更新其它管理员的消息状态
|
9 years ago |
Tim
|
9af8757ceb
|
项目合并请求
|
9 years ago |
Tim
|
1fc617d5fa
|
pull request页面删除
|
9 years ago |
Tim
|
e33bbfff3f
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
b718803bd9
|
修改控制器名称及控制器查询访问权限
|
9 years ago |
Tim
|
be36755d95
|
代码合并页面
|
9 years ago |
huang
|
685f9d8090
|
项目左侧权限控制
|
9 years ago |
daiao
|
24783705b5
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
daiao
|
0ffeec64e3
|
单位审核bug修复
|
9 years ago |
huang
|
7c4759f3b7
|
项目左侧添加pull request入口
|
9 years ago |
daiao
|
fc1fc0bd7d
|
单位审核bug修复
|
9 years ago |
huang
|
96b04f39b1
|
pull requests框架搭建(路由控制器、views)
|
9 years ago |
Tim
|
08b8e3f1cb
|
加入班级,项目弹框定位js重写
|
9 years ago |
cxt
|
18539b45de
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
daiao
|
5272f20de8
|
单位审核bug的修复
|
9 years ago |
huang
|
3feb0680cc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
f7e8c5232c
|
个人主页加入项目,如果已经申请了则提示已申请
|
9 years ago |
cxt
|
87e3707b52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
0ac906a5cf
|
消息列表报500
|
9 years ago |
daiao
|
6ea829131b
|
单位列表发送消息样式调整
|
9 years ago |
daiao
|
15227907ea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
daiao
|
db690bedab
|
单位名称列表缺陷修复
|
9 years ago |
huang
|
21eed9ebb3
|
去掉同意拒绝“:”
|
9 years ago |
cxt
|
bf529f07a5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
97288d4eb4
|
按钮样式
|
9 years ago |
cxt
|
23bb010315
|
课程列表的资源数显示不对
|
9 years ago |
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
9 years ago |
daiao
|
5b93d40f67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
9 years ago |
daiao
|
641ccee631
|
修改名称过长问题
|
9 years ago |
cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
9 years ago |
cxt
|
4a800b67d8
|
消息列表报500
|
9 years ago |
cxt
|
a41fbdb985
|
课程大纲报500
|
9 years ago |
daiao
|
39478eb4e4
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
Conflicts:
app/views/admin/applied_schools.html.erb
app/views/admin/has_applied_schools.html.erb
|
9 years ago |
cxt
|
ebb336afa0
|
课程大纲的二级回复
|
9 years ago |
daiao
|
d6178ec7dd
|
管理员界面单位申请
|
9 years ago |
yuanke
|
1704462986
|
管理员界面单位申请修改
|
9 years ago |
cxt
|
04b9c35a05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
807db1ac40
|
课程角色申请链接的样式
|
9 years ago |
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
huang
|
cf63d252e2
|
局部刷新
|
9 years ago |
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
9 years ago |
huang
|
f857ceab32
|
消息中项目添加title
|
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 |
cxt
|
02bee33ad2
|
身份切换加提示
|
9 years ago |
huang
|
0bf9b5c6e6
|
消息红点记录 个人主页添加加入项目入口
|
9 years ago |
cxt
|
b3d34d6e0f
|
配置班级列表的名称显示全
|
9 years ago |
huang
|
153efb7eda
|
局部刷新
|
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 |
huang
|
60417b2db7
|
项目邀请消息样式问题
|
9 years ago |
cxt
|
5a8d2407e2
|
放开新建课程、新建班级的权限
|
9 years ago |
cxt
|
335b82c046
|
加入班级的弹框
|
9 years ago |
huang
|
48a72ff816
|
代码分析结果入口放置在版本库
|
9 years ago |
cxt
|
a1553c7a8f
|
角色的修改
|
9 years ago |
daiao
|
5b30036639
|
单位名称列表功能
|
9 years ago |
huang
|
769a07bd94
|
去掉配置页面的成员申请
|
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
|
de46c5d9ca
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
huang
|
a8fa4a55e3
|
项目申请消息发送
|
9 years ago |
yuanke
|
283dc86a8b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
db/schema.rb
public/assets/wechat/homework_detail.html
public/javascripts/wechat/controllers/activity.js
|
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 |
cxt
|
e275cd9aa0
|
邀请码
|
9 years ago |
cxt
|
e2546cdcb7
|
邀请码的提示
|
9 years ago |
cxt
|
2fea69359d
|
非本课程成员无法看到邀请码
|
9 years ago |
cxt
|
0dfc887f74
|
复制班级中资源的提示修改
|
9 years ago |
huang
|
b1f69140c7
|
issue用户添加链接,issue链接颜色修改
|
9 years ago |
Tim
|
52475099dc
|
博客设为主页后,文字整个容器宽度显示;班级配置图标菜单css冲突处理;大纲样式冲突处理
|
9 years ago |
cxt
|
35b3993c0c
|
未提交的作品去掉提示
|
9 years ago |
cxt
|
a1149c1104
|
班级列表的公开私有
|
9 years ago |
huang
|
43cb2a0d18
|
单位申请消息显示
|
9 years ago |
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
9 years ago |
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
9 years ago |
cxt
|
aafe0aa4ae
|
删除班级留言时左侧导航栏的样式问题
|
9 years ago |
cxt
|
4422bb1bc0
|
课程列表中的私有班级不可访问
|
9 years ago |
cxt
|
76eca76728
|
作业发布时资源库的提示修改
|
9 years ago |
cxt
|
a0f2f518cf
|
回复他人的博客首页不应跳到自己的博客首页
|
9 years ago |
cxt
|
d17a9dabd8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/helpers/courses_helper.rb
|
9 years ago |
daiao
|
0d59f5a358
|
Merge branch 'daiao_dev' into develop
|
9 years ago |
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
9 years ago |
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
9 years ago |
huang
|
d51295127d
|
issue删除回复删除附件的问题 同事关联删除
|
9 years ago |
daiao
|
3661969528
|
修改课程下,课件名称,显示尽可能全
|
9 years ago |
daiao
|
1dcf4918b9
|
非管理员用户在新建帖子时,置顶及锁定功能在页面不显示
|
9 years ago |
huang
|
e7f862458f
|
issue回复问题; 二级回复编辑issue弹空白框问题
|
9 years ago |
daiao
|
6ab2c15504
|
修复先删除课程下的某班级,再删除该课程报错
|
9 years ago |
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
daiao
|
4646d13234
|
1.修改资源课程名称,竟可能显示全。
2.班级动态下,去掉“班级动态>”
|
9 years ago |
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
9 years ago |
huang
|
774650c819
|
项目邀请码直接数据库读取,权限修改
|
9 years ago |
cxt
|
1e0ed2bfba
|
新建课程和班级时的占位符需要更改
|
9 years ago |
cxt
|
812481d5fa
|
非班级成员邀请码显示为*****
|
9 years ago |
huang
|
84d1adbf25
|
生成邀请码
|
9 years ago |
cxt
|
0564ddb6ea
|
课程大纲的回复
|
9 years ago |
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
9 years ago |
cxt
|
11c9fba7e7
|
提示信息修改
|
9 years ago |
cxt
|
dc9c0f924b
|
教师列表和学生列表的样式
|
9 years ago |
cxt
|
48d5b89338
|
课程推荐为0的不显示
|
9 years ago |
cxt
|
60fe1854cd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
ab4d85dcb7
|
组织500问题
|
9 years ago |
cxt
|
6c7925a7b4
|
样式调整
|
9 years ago |
cxt
|
45fb2d0a3e
|
Merge branch 'develop' into cxt_course
|
9 years ago |
cxt
|
6d4835c6cc
|
样式调整
|
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 |
huang
|
4d79f93079
|
Merge branch 'cs_optimize_txz' into develop
|
9 years ago |
cxt
|
27fa113de1
|
组织动态报500
|
9 years ago |
cxt
|
27afee03b2
|
编辑课程的英文名称时输入框不清空
|
9 years ago |
huang
|
8dbdebe02e
|
修改动态问题
|
9 years ago |
cxt
|
6b1116dfd1
|
课程的回复和名称的编辑
|
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 |
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 |
cxt
|
60bbe89c0d
|
博客的自动保存
|
9 years ago |
cxt
|
0146ac1f11
|
访问他人主页时,对于动态过滤按钮,“我的动态”应改为“他的动态”;但浏览自己的主页时,应该显示为“我的动态”。
|
9 years ago |
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
9 years ago |
Tim
|
53c515b8d1
|
课程大纲侧导航js控制
|
9 years ago |
daiao
|
7c2495c8a1
|
统一在线测验新建单选选项时,样式出现的bug
|
9 years ago |
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
9 years ago |
huang
|
d58167f4bc
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
6357f5be2a
|
解决成员列表获取单位不准确的问题
|
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
|
78e4d37d8b
|
大纲base页引入弹框样式;作业列表调整
|
9 years ago |
daiao
|
a55e64dfb3
|
保持组织动态用户名颜色与其他动态用户名颜色显示一直
|
9 years ago |
huang
|
e99c76a0de
|
resolve edit problem of jenkins job
|
9 years ago |
daiao
|
763ebcbf74
|
修复课程总学时结果,总学时=理论学时+时间学时
|
9 years ago |
daiao
|
7808bb5ebe
|
修复非管理远用户帖子出现管理员帖子置顶的问题
|
9 years ago |
Tim
|
eb503cc3e8
|
Merge branch 'develop' into cs_optimize_txz
|
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 |
huang
|
c50ca34b0e
|
代码质量分析部分数据转换成整型
|
9 years ago |
Tim
|
1fc2bbd56a
|
作业资源库弹框,资源名称与上传者栏增加宽度限制
|
9 years ago |
cxt
|
fdf925a0b8
|
个人主页留言动态:如图回复当前用户自己的留言却不能删除,“展开回复”后又可删除了,刷新网页后又删除不了
|
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 |
cxt
|
9e5e7a75b0
|
编程作业关闭匿评后,老师点击模拟答题,却弹出匿评提示
|
9 years ago |
huang
|
412d74e295
|
优化最近动态获取方法
|
9 years ago |
cxt
|
a9ee1d10cd
|
新增班级成员的消息通知,跳转至该班级的成员配置页面
|
9 years ago |
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
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
|
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 |
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 |
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
|
11e0101f56
|
导航栏题库中 我的题库放在前面
|
9 years ago |
guange
|
dd892993dd
|
assets
|
9 years ago |
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
9 years ago |
guange
|
0e415fffff
|
merge
|
9 years ago |
huang
|
4e3a7e8df1
|
新建版本“日期”--》“截止日止”
|
9 years ago |
huang
|
77e4a66e7e
|
模式切换刷新后引起的样式问题
|
9 years ago |
cxt
|
fd68479d72
|
课程/项目/组织资源库发送资源、问答区帖子发送、通知发送、新闻发送、动态中发送到课程改为班级
|
9 years ago |
huang
|
97b1ea22e7
|
解决:Firefox浏览器中:资源库,先点击资源描述编辑图标按钮(笔),再点击页面空白处,如图两个资源之间有一段空白
|
9 years ago |
cxt
|
7ea5d7d934
|
新建班级页面,提示“如果列表中没有对应的课程,请您先创建课程”始终显示
|
9 years ago |
Tim
|
2d1d3083d0
|
引入project.css
|
9 years ago |
yuanke
|
6ab1269c01
|
修改微信反馈框加入重复班级提示有误的问题
|
9 years ago |
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
9 years ago |
yuanke
|
d50fd40307
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
Tim
|
c41a116378
|
博客上传附件后,编辑处文件夹图标显示;大纲引用css样式更改
|
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 |
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 |
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 |
cxt
|
16cf8a56a1
|
管理员和老师可看到课程下的所有班级
|
9 years ago |
huang
|
191261d3b8
|
each time to 10s
|
9 years ago |
Tim
|
73b7b00db9
|
班级学生列表导航栏下拉框错位调整
|
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 |
daiao
|
304f18ac5e
|
修复课程中,对动态进行筛选的页面呈现方式
|
9 years ago |
cxt
|
955c258856
|
复制班级的弹框中“课程名称”下拉框中只显示当前登录用户的所有课程
|
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
|
5d9bde3c95
|
课程发送资源到课程
|
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 |