 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 |
|
huang
|
831006f3c6
|
css for sqale_index
|
9 years ago |
|
daiao
|
670b443cc4
|
Merge branch 'develop' into daiao_dev
|
9 years ago |
|
guange
|
2a2fe9e81d
|
解决android缓存问题
|
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
|
d25f401afa
|
管理员界面修改班级名称
|
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 |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
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 |
|
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 |
|
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 |
|
huang
|
2f8079e85c
|
版本 库存
|
9 years ago |
|
Tim
|
b6716e542a
|
wiki编辑页面更新
|
9 years ago |
|
Tim
|
0b764d0dfc
|
RSide样式处理
|
9 years ago |
|
Tim
|
75475b6058
|
个人主页，课程，项目样式更新
|
9 years ago |
|
daiao
|
db3056f1b1
|
隐藏班级列别的创建时间和创建名称！
|
9 years ago |
|
daiao
|
ad36a1b29e
|
修复课程下编辑框英文换行缺陷
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
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
|
48fb02a2d6
|
管理课程
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
Your Name
|
300ad68405
|
default path for sonar
|
9 years ago |
|
Your Name
|
a08edcca8a
|
quanxian
|
9 years ago |
|
cxt
|
4983d5283b
|
关联成员能多次添加
|
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
|
57cdc1d5ec
|
协议修改
|
9 years ago |
|
guange
|
047903ddff
|
重构课程地址
|
9 years ago |
|
Your Name
|
e5b93ac7ed
|
modified main method
|
9 years ago |
|
guange
|
1e6454efc0
|
加入我的资源
|
9 years ago |
|
guange
|
f6f329b00f
|
erge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
huang
|
845141a189
|
注释掉代码质量分析入口
|
9 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
9 years ago |
|
daiao
|
ad3626d53a
|
将搜索页面：“登陆”改为“登录”
|
9 years ago |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
c501af70ba
|
.
|
9 years ago |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
9 years ago |
|
Your Name
|
c658296e2b
|
config
|
9 years ago |
|
cxt
|
f984a01cdc
|
跳转协议问题
|
9 years ago |
|
Your Name
|
537f152562
|
0
|
9 years ago |
|
cxt
|
8d5501615c
|
加入课程的样式调整
|
9 years ago |
|
cxt
|
492b2f895c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
4f342142e6
|
组织文章的展开更多
|
9 years ago |
|
Your Name
|
e5ad64831a
|
0
|
9 years ago |
|
huang
|
6bc4dec636
|
列表界面
|
9 years ago |
|
Your Name
|
244c178758
|
666
|
9 years ago |
|
yuanke
|
e3c094cb07
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
f1682edf64
|
修改创建贴吧BUG
|
9 years ago |
|
cxt
|
b2f939fa92
|
代码调整
|
9 years ago |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
guange
|
c39a982093
|
二维码
|
9 years ago |
|
cxt
|
eab000306c
|
动态回复的展开更多、收起，组织文章回复不可用
|
9 years ago |
|
Your Name
|
eae70f9c71
|
some config
|
9 years ago |
|
cxt
|
d558a4d357
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
9 years ago |
|
Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
ec33569033
|
取消拖拽
|
9 years ago |
|
huang
|
4ea210a05b
|
重复改成代码重复
|
9 years ago |
|
Tim
|
a3738c4cb2
|
新建组织，题库和资源库弹框样式检查
|
9 years ago |
|
cxt
|
260759e4db
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
cxt
|
ac629440b1
|
课程邀请码
|
9 years ago |
|
huang
|
09b78fc546
|
中文
|
9 years ago |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
Your Name
|
06fe02890f
|
index for sonar result
|
9 years ago |
|
yuanke
|
c61c14fa97
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
9 years ago |
|
Tim
|
a28d775cb2
|
资源库，题库样式检查
|
9 years ago |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
9 years ago |
|
Your Name
|
128f6721be
|
stoped the zhizhen
|
9 years ago |
|
Your Name
|
de80403e8d
|
add address to config
|
9 years ago |
|
Your Name
|
e4e0e7b166
|
helper
|
9 years ago |
|
yuanke
|
2a971c3bc6
|
修改有的组织添加成员的BUG
|
9 years ago |
|
yuanke
|
e818b5fb07
|
旧的注册页面去掉
|
9 years ago |
|
cxt
|
2959391438
|
作业列表：没有作业时下拉框被点击后，显示一条记录：目前尚未发布作业
|
9 years ago |
