 daiao
|
ed448f0087
|
Merge branch 'develop' into dev_shcool
Conflicts:
db/schema.rb
|
9 years ago |
 huang
|
6dbb2e4e94
|
Pull request数量为0的时候显示在更多中
|
9 years ago |
 cxt
|
1e7f3db946
|
分组作业：组内每个成员都复制一份组长的作业，得分相同
|
9 years ago |
|
daiao
|
3dc0e8407a
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/organizations/_org_member_list.html.erb
app/views/organizations/setting.html.erb
app/views/users/_project_news.html.erb
|
9 years ago |
|
cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
9 years ago |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
9 years ago |
|
cxt
|
f78595bbbb
|
管理员界面中的学校列表支持按用户数排序
|
9 years ago |
 yuanke
|
11ed1ea345
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
9b3e1e0275
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
huang
|
9ab68625df
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
4320fbf945
|
Merge branch 'dev_blankdatabase' into develop
|
9 years ago |
|
huang
|
936198a8bd
|
隐藏非项目信息
|
9 years ago |
|
huang
|
0c221abd61
|
PULL REQUEST 默认情况下不显示
|
9 years ago |
|
cxt
|
23ff5f6449
|
匿评时具有多重身份的教辅打的分变成了“我的评分”
|
9 years ago |
|
yuanke
|
8a6ad89973
|
issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等
|
9 years ago |
 Tim
|
ea0211c9ca
|
组织搜索成员时，页数过多折行问题
|
9 years ago |
|
Tim
|
64b7aedd1c
|
footer部分logo与链接替换更新
|
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
|
420a17a7e4
|
资源提示统计数字及权限修改
|
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 |
|
daiao
|
a3ec35c008
|
个人主页报500
|
9 years ago |
|
daiao
|
90803fbb2a
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
|
daiao
|
078900088a
|
修复：新建组织关联trustie-forge项目，点击组织动态的论坛动态报500
|
9 years ago |
|
daiao
|
5088770214
|
修复：文章附件和资源栏目下载权限一致
|
9 years ago |
|
cxt
|
b8dc444cc7
|
普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表
复制班级功能里，勾选“作业”，同上
对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
|
9 years ago |
|
huang
|
d7177713ff
|
勾选游客后，游客能够下载资源
|
9 years ago |
|
huang
|
7c28f97208
|
get quality analisys update time
|
9 years ago |
|
huang
|
ff592c106e
|
sonar最新触发时间获取
|
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 |
|
huang
|
9003040d6a
|
版本库获取动态API修改
|
9 years ago |
|
huang
|
00f032816c
|
版本库获取方式修改
|
9 years ago |
|
huang
|
75971120f7
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
cxt
|
4a25b6357b
|
我的作业报500
|
9 years ago |
|
huang
|
8eaeea299a
|
相同分支和项目消息JS提示
|
9 years ago |
|
huang
|
a9942fd4b3
|
change integer to A
|
9 years ago |
|
huang
|
98a8702ba6
|
记录谁合并的pull request请求
|
9 years ago |
|
cxt
|
71326c901d
|
学生在启动匿评后再提交作品，此时该学生及该学生的作品是不被匿评的，应该是“查看作品”
|
9 years ago |
|
huang
|
867434531d
|
pull request 列表页面添加分页
|
9 years ago |
|
huang
|
518d6bacbe
|
添加关闭pull request功能
|
9 years ago |
|
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
9 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
f4bda16469
|
fork分支PR
|
9 years ago |
|
daiao
|
7f62de59e1
|
优化周二代码审查的代码
|
9 years ago |
|
huang
|
b8cccdffda
|
完成changes数据获取及展示
|
9 years ago |
|
huang
|
be081f5c66
|
添加Api（提交内容，改动）及相关方法路由
|
9 years ago |
|
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
9 years ago |
|
Tim
|
1fc617d5fa
|
pull request页面删除
|
9 years ago |
|
huang
|
b718803bd9
|
修改控制器名称及控制器查询访问权限
|
9 years ago |
|
huang
|
685f9d8090
|
项目左侧权限控制
|
9 years ago |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
9 years ago |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
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
|
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 |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
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
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
9 years ago |
|
cxt
|
1f8fa1c70a
|
班级动态去掉“>”
|
9 years ago |
|
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
9 years ago |
|
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
9 years ago |
|
huang
|
2c8f94c899
|
去掉ID转换成用户login
|
9 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
|
daiao
|
4646d13234
|
1.修改资源课程名称，竟可能显示全。
2.班级动态下，去掉“班级动态>”
|
9 years ago |
|
huang
|
920a599417
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
huang
|
7984affe36
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
be88914e39
|
去掉id转换用户名
|
9 years ago |
|
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
9 years ago |
|
huang
|
43c6301223
|
id转换成用户名
|
9 years ago |
|
cxt
|
6c7925a7b4
|
样式调整
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
huang
|
8dbdebe02e
|
修改动态问题
|
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 |
|
huang
|
ff8cad5cf2
|
项目动态中添加提交动态
|
9 years ago |
|
yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
9 years ago |
|
huang
|
6357f5be2a
|
解决成员列表获取单位不准确的问题
|
9 years ago |
|
daiao
|
03d6afd1c4
|
优化上周动态获取代码
|
9 years ago |
|
huang
|
412d74e295
|
优化最近动态获取方法
|
9 years ago |
|
huang
|
5c046f922e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
3198f8a473
|
解决版本库提交记录中：上传图片或者非可以预览文件 显示详情500问题
|
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 |
|
cxt
|
c9e0143fe8
|
作业动态的时间
|
9 years ago |
|
cxt
|
48e5a0be7e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
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 |
|
huang
|
2af3c50dbc
|
里程碑区分issue状态“已解决”“已关闭” 对应不同样式
|
9 years ago |
|
huang
|
b2a8a0fed6
|
修复里程碑进度条数据显示错误的问题
|
9 years ago |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
9 years ago |
|
daiao
|
dcc37ef847
|
增加作品查看界面中，班级查询条件下，增加暂无分班的查询条件
|
9 years ago |
