 yuanke
|
fd3c0effe5
|
Merge branch 'develop' into weixin_guange
|
2016-09-05 14:50:06 +08:00 |
|
yuanke
|
10017d2c69
|
微信增加解除绑定功能
|
2016-09-05 11:02:34 +08:00 |
|
yuanke
|
6571b94bf1
|
Merge branch 'weixin_guange' into develop
|
2016-09-02 16:08:49 +08:00 |
 cxt
|
877d1930f0
|
超级管理员应该有权限查看不公开学生列表班级的学生列表
|
2016-09-02 15:35:20 +08:00 |
|
cxt
|
b588495847
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:26:23 +08:00 |
|
cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-09-02 15:24:55 +08:00 |
 huang
|
58176456e1
|
Merge branch 'develop' into rep_quality
|
2016-09-02 15:23:00 +08:00 |
|
huang
|
3881e5c5c5
|
资源搜索的是时候tip局部刷新
组织资源更新公开私有问题
|
2016-09-02 14:50:06 +08:00 |
|
yuanke
|
11f3060ca5
|
自己建的issue指向自己不发微信消息
|
2016-09-02 14:40:40 +08:00 |
|
cxt
|
ded6753ce1
|
访问他人的主页只显示他本人的动态
|
2016-09-02 14:23:02 +08:00 |
|
huang
|
2e36cf6d6a
|
课程资源库添加资源提示及
|
2016-09-02 12:12:26 +08:00 |
|
huang
|
fa25a78f62
|
项目资源库 添加私有资源提示及局部过滤刷新
|
2016-09-02 11:27:35 +08:00 |
|
cxt
|
f78595bbbb
|
管理员界面中的学校列表支持按用户数排序
|
2016-09-01 17:11:39 +08:00 |
|
huang
|
17440ca5dc
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-01 16:04:00 +08:00 |
|
huang
|
79e30862e9
|
change sonar method into restart and cancel push events
|
2016-09-01 15:58:53 +08:00 |
|
cxt
|
1e740525b4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-01 14:31:45 +08:00 |
|
cxt
|
e61cf5dd4f
|
多重身份的成员：教师模拟答题和学生答题作为两条记录
|
2016-09-01 14:21:19 +08:00 |
|
yuanke
|
11ed1ea345
|
Merge branch 'weixin_guange' into develop
|
2016-09-01 14:11:20 +08:00 |
|
huang
|
52a8a64a69
|
项目隐藏 项目讨论区发送中去掉课程
|
2016-09-01 10:48:13 +08:00 |
|
cxt
|
9b3e1e0275
|
Merge branch 'develop' into cxt_course
|
2016-08-31 15:02:13 +08:00 |
|
cxt
|
6e36418201
|
admin界面的留言列表过滤掉新用户的留言
|
2016-08-31 09:47:51 +08:00 |
|
cxt
|
f4632c432f
|
消息列表中的at消息报500
|
2016-08-30 17:11:22 +08:00 |
|
yuanke
|
b9e9892257
|
微信issue指向BUG修改，issue@功能修改
|
2016-08-30 15:01:26 +08:00 |
|
yuanke
|
8a6ad89973
|
issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等
|
2016-08-30 14:08:10 +08:00 |
|
huang
|
bbe44b3957
|
Merge branch 'develop' into rep_quality
|
2016-08-30 11:18:49 +08:00 |
|
huang
|
ee2ae456ac
|
unresolved issues for sonar
|
2016-08-30 10:43:47 +08:00 |
|
cxt
|
45f0234ff7
|
组织logo点击可编辑
|
2016-08-29 16:19:06 +08:00 |
|
cxt
|
4ff45c15a3
|
还原质量分析的代码
|
2016-08-29 15:43:32 +08:00 |
|
huang
|
0551c450b5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 10:21:59 +08:00 |
|
huang
|
a6f9c3375e
|
代码质量分析加入“未解决质量问题数”
|
2016-08-29 10:21:42 +08:00 |
|
cxt
|
885cc820a8
|
批量添加学生
|
2016-08-26 19:50:47 +08:00 |
|
huang
|
8c4f943f83
|
注释掉资源提示
|
2016-08-26 19:33:18 +08:00 |
|
huang
|
16dfae4415
|
0
|
2016-08-26 18:47:17 +08:00 |
|
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 |