Commit Graph

10646 Commits

Author SHA1 Message Date
ouyangxuhua 1a7e1db3fb 资源库鼠标在移动时,灰色条跟着动 2015-11-02 14:20:14 +08:00
huang 05bb40c8a7 Merge branch 'develop' into gitlab_guange 2015-11-02 13:58:09 +08:00
huang 6e21e50aaf Merge branch 'szzh' into develop 2015-11-02 13:56:34 +08:00
huang af37dac432 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-02 13:53:54 +08:00
huang 8ec2dc3196 多版本库情况:
1、没有新增项目提供接口
2、新建页面历史版本库列表
2015-11-02 13:53:35 +08:00
lizanle b762a639ea Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-02 13:47:25 +08:00
lizanle bd5a316842 反馈框 信息修改 2015-11-02 13:47:18 +08:00
ouyangxuhua 4dcbe18027 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-02 13:12:21 +08:00
ouyangxuhua 583b92a842 课程添加或者删除成员时,实时更新课程成员数量。 2015-11-02 13:12:03 +08:00
ouyangxuhua fb692fad4c 在项目设置中,添加或删除成员时,实时更新项目成员数量。 2015-11-02 12:54:58 +08:00
lizanle 8846e2ff67 Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-02 10:37:51 +08:00
lizanle 0aa2aefe03 修改用户名密码不可用 2015-11-02 10:30:51 +08:00
cxt a2e2c5de3c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-02 10:14:18 +08:00
lizanle 6fffcec250 如果没有填写真实名字的话,那么就要用用户名了。 2015-11-02 10:10:32 +08:00
cxt 6e7a6909d6 作业动态中的未发布作业显示发布时间 2015-11-02 10:02:02 +08:00
lizanle 46680a7cfe Merge branch 'szzh' into gitlab_guange 2015-11-02 09:59:56 +08:00
cxt 25e1eb75ab 课程内发布作业失败 2015-11-02 09:49:58 +08:00
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