 lizanle
|
6288151f40
|
qq群加入链接问题
|
2015-11-02 09:49:21 +08:00 |
|
lizanle
|
7df2a632fc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-02 09:35:41 +08:00 |
|
lizanle
|
681f33ee2c
|
取消大纲 提示
|
2015-11-02 09:35:13 +08:00 |
 huang
|
066d04016e
|
去掉重复“提交代码”
|
2015-11-02 08:39:17 +08:00 |
 guange
|
fa0332babd
|
只有在同步项目时才同步用户
|
2015-11-01 22:25:42 +08:00 |
|
guange
|
be25a57eaf
|
同步用户bug解决
|
2015-11-01 21:49:07 +08:00 |
|
huang
|
09335cf018
|
Merge branch 'szzh' into develop
|
2015-10-30 19:04:16 +08:00 |
 cxt
|
0fb48a41cb
|
课程搜索页面的加入按钮
|
2015-10-30 19:03:49 +08:00 |
|
huang
|
db5b1e4192
|
Merge branch 'szzh' into develop
|
2015-10-30 18:18:07 +08:00 |
|
lizanle
|
4b9a60658f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 17:51:20 +08:00 |
|
lizanle
|
7962bdf5a2
|
outline
after keyboard enter
_course_outline_list cannot disppear
|
2015-10-30 17:51:12 +08:00 |
|
huang
|
48d0553e8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-30 17:47:04 +08:00 |
|
huang
|
babed5382f
|
Merge branch 'develop' into szzh
|
2015-10-30 17:46:31 +08:00 |
|
huang
|
2b89244f52
|
修改用户url问题
解决urlhttp重复问题
|
2015-10-30 17:45:44 +08:00 |
|
lizanle
|
732e4e1017
|
user_message
enter course message ,username need to be realname
|
2015-10-30 17:32:50 +08:00 |
|
lizanle
|
55db83d31c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 17:28:45 +08:00 |
|
lizanle
|
19f3172966
|
user_message
enter course message ,username need to be realname
|
2015-10-30 17:28:35 +08:00 |
|
cxt
|
97de8b584c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-30 17:24:26 +08:00 |
|
cxt
|
3bb56f1606
|
教辅可查看未发布的作业
|
2015-10-30 17:24:09 +08:00 |
|
lizanle
|
b7a6bc3614
|
outline url
|
2015-10-30 17:21:12 +08:00 |
|
lizanle
|
efef1d943f
|
outline bug
|
2015-10-30 17:13:06 +08:00 |
|
lizanle
|
e0c488f970
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 16:56:06 +08:00 |
|
lizanle
|
bab616060b
|
答疑群
|
2015-10-30 16:55:55 +08:00 |
|
huang
|
e41a53cb8f
|
Merge branch 'szzh' into develop
|
2015-10-30 16:51:46 +08:00 |
|
huang
|
89507b2b47
|
版本库域名写入配置文件中
|
2015-10-30 16:26:51 +08:00 |
|
huang
|
d936c8cc7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-30 15:58:19 +08:00 |
|
huang
|
60dd55e52d
|
解决用户提交完代码后再修改邮箱的问题
|
2015-10-30 15:56:59 +08:00 |
|
lizanle
|
a08be355ae
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 15:56:19 +08:00 |
|
lizanle
|
ae6fe6f9a7
|
申请加入课程，允许身份覆盖
|
2015-10-30 15:55:48 +08:00 |
|
huang
|
aa4710d872
|
git中忽略配置文件
提交记录新界面
修改获取用户路径
|
2015-10-30 15:46:06 +08:00 |
|
lizanle
|
af14861b96
|
取消大纲
|
2015-10-30 14:26:50 +08:00 |
|
lizanle
|
8531ab51ab
|
取消大纲不删除博客
|
2015-10-30 14:22:11 +08:00 |
|
lizanle
|
b97ad10cc9
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 14:10:19 +08:00 |
|
lizanle
|
27a2a2890f
|
大纲设置图标 鼠标放上去呈手型
图标一直显示
|
2015-10-30 14:10:08 +08:00 |
|
cxt
|
f5aaf7ac58
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-30 13:59:33 +08:00 |
|
cxt
|
6dcc97d5d1
|
添加作业的发布功能
|
2015-10-30 13:58:54 +08:00 |
|
lizanle
|
4d7ca63a12
|
添加一个参数控制
在课程首页设置大纲不跳转
在大纲展示页面设置大纲，跳转大纲页面
|
2015-10-30 11:51:09 +08:00 |
|
lizanle
|
8dc730cd3e
|
大纲回复框改变
|
2015-10-30 11:31:42 +08:00 |
|
lizanle
|
6b1c140258
|
更改宽度
|
2015-10-30 11:12:50 +08:00 |
|
lizanle
|
00157b4302
|
大纲设置的图标改动 ，添加删除动作
|
2015-10-30 10:52:56 +08:00 |
|
lizanle
|
a27c359df4
|
大纲设置的图标改动
|
2015-10-30 10:52:34 +08:00 |
|
lizanle
|
9e1c675c66
|
根据大纲搜索结果适应高度
|
2015-10-30 10:49:58 +08:00 |
|
lizanle
|
4766cff41d
|
不符合条件的输入的时候，不显示结果
|
2015-10-30 10:46:51 +08:00 |
|
lizanle
|
bc7ce290a2
|
没有选中任何大纲不能提交
|
2015-10-30 10:43:35 +08:00 |
|
lizanle
|
3b6ac1bef8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 10:20:08 +08:00 |
|
lizanle
|
70003a8d9c
|
课程大纲功能 弹出框样式问题
|
2015-10-30 10:19:57 +08:00 |
|
cxt
|
c4816a0414
|
名字为空的用户创建博客时博客名称为登录名
|
2015-10-30 09:56:55 +08:00 |
|
huang
|
286b1a1f0d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-10-29 17:31:03 +08:00 |
|
huang
|
b2f6d4f2bc
|
Merge branch 'szzh' into develop
|
2015-10-29 17:30:05 +08:00 |
|
huang
|
470fb3bfa6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-29 17:29:26 +08:00 |