 cxt
|
b468134e3e
|
Merge branch 'cxt_course' into develop
|
2016-09-14 21:19:01 +08:00 |
|
cxt
|
abdc08c7af
|
提交作品时左侧导航栏对应班级的导航栏
|
2016-09-14 20:58:15 +08:00 |
|
cxt
|
1bd93904af
|
Merge branch 'cxt_course' into develop
|
2016-09-14 19:47:24 +08:00 |
 yuanke
|
c7be9cadf1
|
Merge branch 'weixin_guange' into develop
|
2016-09-14 19:38:19 +08:00 |
|
cxt
|
6f4618fffb
|
分组作业可对组员单独评分
|
2016-09-14 17:38:57 +08:00 |
 huang
|
9f5e257890
|
作品列表搜索问题
|
2016-09-14 17:36:20 +08:00 |
|
cxt
|
e4efc8c302
|
作业编辑
|
2016-09-14 16:45:10 +08:00 |
|
yuanke
|
154b77a3a7
|
微信班级名改为课程名。班级名
|
2016-09-14 15:10:24 +08:00 |
|
huang
|
a309bf4f73
|
课程首页show方法优化
|
2016-09-14 11:31:48 +08:00 |
|
yuanke
|
cb6a3e7161
|
微信公众号留言回复修改
|
2016-09-14 10:26:18 +08:00 |
|
cxt
|
9002844188
|
新版发布作业
|
2016-09-13 16:18:57 +08:00 |
|
huang
|
64f9ed3e42
|
Merge branch 'rep_quality' into develop
|
2016-09-13 15:20:02 +08:00 |
|
huang
|
390f68aad6
|
作品列表页面性能提升（主要是数据库查询减少，建立相关索引）
|
2016-09-13 14:57:45 +08:00 |
|
yuanke
|
22da03a1e0
|
微信注册后跳入编辑资料界面，进入别的页面无姓名则跳入编辑资料界面
|
2016-09-13 13:44:26 +08:00 |
|
yuanke
|
4ea468eacb
|
Merge branch 'weixin_guange' into develop
|
2016-09-12 17:44:04 +08:00 |
|
yuanke
|
168a47fabb
|
微信通知显示被删除修改
|
2016-09-12 17:34:55 +08:00 |
|
cxt
|
61836dbe93
|
组织动态报500
|
2016-09-09 18:02:47 +08:00 |
|
yuanke
|
80ab8801ce
|
Merge branch 'weixin_guange' into develop
|
2016-09-09 16:05:32 +08:00 |
|
cxt
|
5d83c66949
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-09-09 15:58:42 +08:00 |
|
huang
|
7899bfe985
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/issues/_form.html.erb
db/schema.rb
|
2016-09-09 16:00:05 +08:00 |
|
huang
|
00e6549bec
|
解决issue详情性能N+1问题
|
2016-09-09 15:56:40 +08:00 |
|
yuanke
|
564da2ed72
|
微信课件下载修改
|
2016-09-09 15:36:15 +08:00 |
|
yuanke
|
9997de0d96
|
微信课件下载不需要登录
|
2016-09-09 15:14:24 +08:00 |
 Tim
|
b796ac3b53
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/exercise/_student_table.html.erb
db/schema.rb
|
2016-09-09 13:30:10 +08:00 |
 daiao
|
ed448f0087
|
Merge branch 'develop' into dev_shcool
Conflicts:
db/schema.rb
|
2016-09-09 09:31:17 +08:00 |
|
daiao
|
2ee9c22186
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
2016-09-09 09:16:49 +08:00 |
|
daiao
|
aa27d7def2
|
修复编辑issue，更新附件时，自动回复提示问题（不同Issue下，重名不显示，同意issue下，会更新创建时的附件）
|
2016-09-09 09:16:22 +08:00 |
|
huang
|
8bb2b5e8d9
|
change sonar reuslts
|
2016-09-09 09:00:21 +08:00 |
|
yuanke
|
8c71cf1946
|
Merge branch 'weixin_guange' into develop
|
2016-09-08 18:18:13 +08:00 |
|
cxt
|
cf25dc8dfd
|
首页的项目列表
|
2016-09-08 15:00:20 +08:00 |
|
cxt
|
e6ddb3cec0
|
个人主页动态过滤中点击全部动态要显示当前用户关联的所有动态
|
2016-09-07 11:30:26 +08:00 |
|
cxt
|
7b2943c37a
|
重试
|
2016-09-06 18:01:16 +08:00 |
|
cxt
|
7b2ce93acc
|
分组作业添加成员
|
2016-09-06 17:51:13 +08:00 |
|
cxt
|
e2aef37114
|
分组作品的提交出错
|
2016-09-06 17:06:31 +08:00 |
|
cxt
|
bf4c6d049c
|
新建分组作业时不创建作品列表
|
2016-09-06 16:38:29 +08:00 |
|
cxt
|
1e7f3db946
|
分组作业：组内每个成员都复制一份组长的作业，得分相同
|
2016-09-06 15:07:43 +08:00 |
|
daiao
|
cdd4dfcf09
|
项目列表中：私有项目对非成员显示，非成员不点击进入
|
2016-09-05 16:55:56 +08:00 |
|
yuanke
|
fd3c0effe5
|
Merge branch 'develop' into weixin_guange
|
2016-09-05 14:50:06 +08:00 |
|
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
|
2016-09-05 13:47:39 +08:00 |
|
yuanke
|
10017d2c69
|
微信增加解除绑定功能
|
2016-09-05 11:02:34 +08:00 |
|
cxt
|
22e914eec2
|
查看他人的留言动态报500
|
2016-09-02 16:42:19 +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 |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
2016-09-02 13:25:01 +08:00 |