 cxt
|
816a480991
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-26 18:34:44 +08:00 |
|
cxt
|
ff95567926
|
基本资料中从业者的身份判断
|
2016-08-26 18:34:35 +08:00 |
 huang
|
803bd9819a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/css/public.css
|
2016-08-26 17:55:51 +08:00 |
|
huang
|
9b86661f4a
|
<ul class=contribute-list>
|
2016-08-26 17:49:31 +08:00 |
|
huang
|
420a17a7e4
|
资源提示统计数字及权限修改
|
2016-08-26 17:34:17 +08:00 |
|
cxt
|
5fbb9f56a6
|
Merge branch 'dev_shcool' into develop
|
2016-08-26 17:10:15 +08:00 |
|
huang
|
a71f948f41
|
项目、课程资源库添加私有资源提示
|
2016-08-26 16:26:12 +08:00 |
|
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
|
2016-08-26 16:23:07 +08:00 |
|
cxt
|
0ce61bfee8
|
学生删除作品时将作品还原为初始状态
|
2016-08-26 16:20:14 +08:00 |
|
huang
|
a434942b6d
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-26 15:14:07 +08:00 |
|
huang
|
60a76e64a5
|
贡献列表
|
2016-08-26 15:13:07 +08:00 |
|
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
2016-08-26 14:31:14 +08:00 |
 daiao
|
d37cbaad61
|
1.完善资料流程优化；2.基本资料从业者单位保存丢失问题
|
2016-08-26 10:14:48 +08:00 |
|
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
2016-08-25 11:30:47 +08:00 |
 yuanke
|
aa11f39b2d
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/class.html
public/javascripts/wechat/controllers/class.js
|
2016-08-25 11:24:27 +08:00 |
|
huang
|
69301a1120
|
Pull reques登录提示（权限控制）
|
2016-08-25 10:04:51 +08:00 |
|
huang
|
799c451921
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-25 09:20:46 +08:00 |
|
cxt
|
21c48ea383
|
at所有人
|
2016-08-24 17:46:18 +08:00 |
|
huang
|
80c6132ba5
|
Merge branch 'rep_quality' into develop
|
2016-08-24 17:39:44 +08:00 |
|
huang
|
7493de1334
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-24 17:38:40 +08:00 |
|
cxt
|
56b74b755b
|
取消收藏
|
2016-08-24 17:30:30 +08:00 |
|
huang
|
8cc60ef1e8
|
delete some language of quality_analysis
|
2016-08-24 17:28:55 +08:00 |
|
huang
|
f0ed380002
|
Merge branch 'rep_quality' into develop
|
2016-08-24 15:13:37 +08:00 |
|
huang
|
ba6d0e6926
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-24 15:13:00 +08:00 |
|
huang
|
bafb3e98a7
|
tip for sonar results
|
2016-08-24 15:05:10 +08:00 |
|
yuanke
|
e0957113d8
|
项目issue模版消息提醒
|
2016-08-24 11:28:50 +08:00 |
|
yuanke
|
bd3911c072
|
.
|
2016-08-24 11:22:34 +08:00 |
|
yuanke
|
f8dfe85156
|
项目issue增加模版消息
|
2016-08-24 11:03:38 +08:00 |
|
yuanke
|
0eb1c1a392
|
微信审核链接修改
|
2016-08-24 09:45:18 +08:00 |
|
yuanke
|
e0ab93b739
|
微信审核路径修改
|
2016-08-24 09:30:28 +08:00 |
|
yuanke
|
c5cedbfcc2
|
修改班级和项目审核模版消息地址
|
2016-08-23 17:37:23 +08:00 |
|
cxt
|
461912bec2
|
班级作业，上传附件提交作品，重试后直接提交，提交页面附件不显示但验证弹框中被删除的附件又显示了
|
2016-08-23 10:50:51 +08:00 |
|
cxt
|
b8dc444cc7
|
普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表
复制班级功能里，勾选“作业”，同上
对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
|
2016-08-23 10:17:08 +08:00 |
|
daiao
|
7e34062435
|
Merge branch 'dev_shcool' into develop
|
2016-08-23 09:43:38 +08:00 |
|
huang
|
ea6b928188
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-22 17:19:48 +08:00 |
|
yuanke
|
864c6c821f
|
Merge branch 'weixin_guange' into develop
|
2016-08-22 16:50:13 +08:00 |
|
huang
|
5e98884801
|
tip for sonar
|
2016-08-22 16:32:32 +08:00 |
|
yuanke
|
c275557fa7
|
调试
|
2016-08-22 15:44:20 +08:00 |
|
cxt
|
f5cbdf11bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-22 15:24:18 +08:00 |
|
cxt
|
06361246c7
|
作品列表中的已提交人数无法自动刷新
|
2016-08-22 15:24:12 +08:00 |
|
yuanke
|
7f8a6f931b
|
调试
|
2016-08-22 15:23:34 +08:00 |
|
yuanke
|
d5a7d10f5d
|
调试
|
2016-08-22 14:59:50 +08:00 |
|
yuanke
|
9e4aaa767c
|
调试
|
2016-08-22 14:57:28 +08:00 |
|
yuanke
|
0c381ad53d
|
调试
|
2016-08-22 14:42:04 +08:00 |
|
yuanke
|
d9e031c314
|
调试
|
2016-08-22 14:34:42 +08:00 |
|
huang
|
f8fc656920
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-22 14:22:31 +08:00 |
|
huang
|
300dab5fa1
|
版本库更新时间提交
|
2016-08-22 14:20:59 +08:00 |
|
yuanke
|
53bca5c006
|
调试
|
2016-08-22 13:52:40 +08:00 |
|
yuanke
|
0412009182
|
调试
|
2016-08-22 11:13:14 +08:00 |
|
yuanke
|
a38d4f15a6
|
调试
|
2016-08-22 10:50:22 +08:00 |