 cxt
|
ef9b389cfc
|
作业动态报500
|
2016-11-14 17:32:18 +08:00 |
|
cxt
|
5605a9e638
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-14 16:37:54 +08:00 |
|
cxt
|
edf8ceed7c
|
取消收藏的班级和项目动态不显示
|
2016-11-14 16:37:42 +08:00 |
 huang
|
ddb747bfcb
|
解决login中带特殊字符的问题
|
2016-11-14 16:35:15 +08:00 |
|
cxt
|
b06dcc9db4
|
780班级访问分班报500
|
2016-11-14 15:38:00 +08:00 |
 yuanke
|
5134418388
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-14 15:14:05 +08:00 |
|
yuanke
|
5fd00ae472
|
关注官方微信改为关注微信APP
|
2016-11-14 10:35:40 +08:00 |
|
yuanke
|
d0abc8d3ad
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 19:52:38 +08:00 |
|
yuanke
|
369f6eb9f7
|
微信动态不显示的BUG修复
|
2016-11-11 19:52:30 +08:00 |
|
huang
|
898cec5ef0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 19:19:40 +08:00 |
|
huang
|
8e36cd1374
|
attach弹框宽度
|
2016-11-11 19:19:26 +08:00 |
|
cxt
|
a2b0717aaa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 18:41:36 +08:00 |
|
cxt
|
3aec93e5e4
|
分组作业的作品列表展开/收起
|
2016-11-11 18:41:29 +08:00 |
|
cxt
|
a831be59d0
|
匿评时点击姓名和关联的项目应打开作品详情
|
2016-11-11 18:31:00 +08:00 |
|
huang
|
5104340b78
|
Merge branch 'dev_newproject' into develop
|
2016-11-11 18:21:29 +08:00 |
|
huang
|
6752b8fa62
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 18:19:19 +08:00 |
|
huang
|
d1f9ce3ab2
|
课程中资源库导入不能用
|
2016-11-11 18:19:03 +08:00 |
|
cxt
|
809cb5a344
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 18:12:31 +08:00 |
|
cxt
|
acfbe6f03e
|
某用户为某班级的助教和学生两种角色成员，当前身份是助教，点击个人主页“我的作业”，如图对应的班级作品显示的却是“提交作品”-》 “查看作品”
|
2016-11-11 18:12:22 +08:00 |
|
huang
|
561c96b485
|
用户图像下拉列表中我的课程、组织链接改成登录名
|
2016-11-11 18:02:17 +08:00 |
 daiao
|
753da4b078
|
点击用户将id改为用户名
|
2016-11-11 17:59:34 +08:00 |
|
huang
|
e6354c82cf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 17:57:45 +08:00 |
|
huang
|
bb871b5a77
|
个人主页 博客 粉丝 关注url的id改成登录名
|
2016-11-11 17:57:31 +08:00 |
|
cxt
|
6ee9b12c5d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 17:55:32 +08:00 |
|
cxt
|
c352fb5604
|
学生列表的删除和编辑按钮的对齐显示、删除学生时刷新班级头部的学生数
|
2016-11-11 17:55:25 +08:00 |
|
huang
|
7e762a42ed
|
用户动态部分url的id改成登录名
|
2016-11-11 17:50:42 +08:00 |
|
yuanke
|
8561b890b8
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-11 17:42:36 +08:00 |
|
cxt
|
18bfb26689
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 17:38:25 +08:00 |
|
cxt
|
e1c216ef80
|
班级导入问卷不可用
|
2016-11-11 17:38:19 +08:00 |
|
daiao
|
1ec0100386
|
项目简介样式调整，并且输入网页能点击
|
2016-11-11 17:35:11 +08:00 |
|
cxt
|
4a266b33e6
|
新建课程增加示例，并追加班级的说明tip
|
2016-11-11 17:26:38 +08:00 |
|
huang
|
d040d2efd1
|
版本库添加返回上一级目录
|
2016-11-11 17:21:18 +08:00 |
|
cxt
|
ec36b07aab
|
分班名称编辑后，如图班级左侧导航处未自动刷新
|
2016-11-11 17:05:47 +08:00 |
|
daiao
|
bb8726479a
|
Merge branch 'develop' into dev_newproject
|
2016-11-11 17:04:02 +08:00 |
|
huang
|
b944a4a5c6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 17:00:10 +08:00 |
|
huang
|
9113c93e49
|
项目成员列表点击跳入新的页面
|
2016-11-11 16:59:34 +08:00 |
|
cxt
|
93c10515df
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:59:28 +08:00 |
|
cxt
|
7298e983fa
|
如图课程大纲中“加入班级”，输入错误的邀请码，提示“您加入的班级不存在”不合理，应该是“您输入的邀请码错误”
|
2016-11-11 16:59:15 +08:00 |
|
huang
|
f71a21155f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:54:47 +08:00 |
|
huang
|
a655e73c50
|
配置中成员链接改成登录名
|
2016-11-11 16:54:24 +08:00 |
|
cxt
|
cb5ca96bb5
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_homework.html.erb
db/schema.rb
|
2016-11-11 16:53:20 +08:00 |
|
cxt
|
16c51e1eaa
|
基于项目的分组作业没有显示项目详情
|
2016-11-11 16:50:25 +08:00 |
|
huang
|
8c48c3d420
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:46:07 +08:00 |
|
huang
|
f41a36557a
|
时间插件改为英文
|
2016-11-11 16:45:43 +08:00 |
|
yuanke
|
0710ddb7d1
|
测试
|
2016-11-11 16:41:38 +08:00 |
|
daiao
|
e1afe9d2d7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:36:13 +08:00 |
|
daiao
|
92531ce487
|
项目简介样式调整
|
2016-11-11 16:35:26 +08:00 |
|
huang
|
e544b04f6f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:10:20 +08:00 |
|
huang
|
442fb8a531
|
添加fork成员列表
|
2016-11-11 16:09:43 +08:00 |
|
yuanke
|
9136da7972
|
微信测试
|
2016-11-11 15:53:29 +08:00 |