Commit Graph

14843 Commits

Author SHA1 Message Date
cxt 53614197aa Merge branch 'cxt_course' into develop 2016-06-21 11:18:28 +08:00
cxt 4f80e259e8 消息弹窗的延时显示 2016-06-21 11:16:45 +08:00
cxt dc70b40309 kindeditor中的a标签属性编辑 2016-06-21 11:04:35 +08:00
cxt 860068f7ed 新注册用户的留言 2016-06-21 11:03:50 +08:00
yuanke db6962a3a6 Merge branch 'develop' into yuanke_org 2016-06-21 09:25:46 +08:00
guange 5a8de44c43 添加我的班级控制器 2016-06-20 19:42:51 +08:00
Your Name d5631defb5 added xml to jenkins and added some gems 2016-06-20 17:53:56 +08:00
guange 1d6d100983 . 2016-06-20 17:37:35 +08:00
yuanke 64a4af21eb Merge branch 'yuanke' into develop 2016-06-20 17:36:08 +08:00
yuanke 40792ff222 更新资源版本描述默认显示 2016-06-20 17:34:35 +08:00
guange 6f14b61cce . 2016-06-20 17:28:21 +08:00
guange 4b813ef535 加入班级消息 2016-06-20 17:26:29 +08:00
yuanke 0ebbf29b54 Merge branch 'yuanke' into develop 2016-06-20 17:14:14 +08:00
yuanke a5ffd013b9 修改更新资源版本的样式问题 2016-06-20 17:13:14 +08:00
guange c940527694 . 2016-06-20 17:12:53 +08:00
guange 62a1b5de7c 加入班级更新 2016-06-20 17:04:42 +08:00
yuanke 301556b9c3 Merge branch 'yuanke' into develop 2016-06-20 16:41:23 +08:00
yuanke d3f3f019a0 下拉菜单有时候不显示 2016-06-20 16:40:56 +08:00
yuanke fde06a2327 更新资源描述样式修改 2016-06-20 16:35:16 +08:00
guange 4db1df0a4d css 2016-06-20 16:29:52 +08:00
guange 311f21ee5a css 2016-06-20 16:23:59 +08:00
huang 96e00f7bf3 jenkins连接 2016-06-20 16:21:37 +08:00
guange 29a815aeaf 添加weui 2016-06-20 16:09:04 +08:00
guange b4a3d4a5a2 弹出框处理 2016-06-20 16:04:38 +08:00
cxt f4d67bc027 未读消息弹窗“点击展开”显示10条未读消息 2016-06-20 16:03:57 +08:00
guange 47c443e59d 输入框变大一点 2016-06-20 15:56:57 +08:00
guange c6f04db19e wechat 2016-06-20 15:50:52 +08:00
Tim 3548c23aad Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-20 15:43:15 +08:00
cxt 048bb7fed5 头像下拉菜单、未读消息的延时 2016-06-20 15:38:43 +08:00
guange 05ddbe5874 修改code 2016-06-20 15:28:19 +08:00
guange b7230333dc code获取修改 2016-06-20 15:21:13 +08:00
guange 3f98562c0f 打包 2016-06-20 14:45:19 +08:00
guange 61c117b8cb 重构老的代码,本地通过session来存放token, 所有的访问直接用老接口 2016-06-20 14:39:20 +08:00
huang 36e47fa8b1 代码质量分析,弹框参数传递 2016-06-20 14:21:40 +08:00
cxt b26a6b5195 消息弹窗的链接无效 2016-06-20 11:24:34 +08:00
txz b17b92cc3e 微信回复后先加载后启用回复按钮 2016-06-20 11:08:57 +08:00
yuanke 0719313f01 Merge branch 'yuanke' into develop 2016-06-20 09:41:26 +08:00
yuanke 7c729107cc KE复制粘贴的时候保留图片的外链 2016-06-20 09:40:21 +08:00
yuanke 4b7fa3a040 修改有的组织不能修改资源描述的问题 2016-06-20 09:19:50 +08:00
guange f40794282f . 2016-06-17 18:54:24 +08:00
guange 762ca9c3cb . 2016-06-17 18:50:43 +08:00
guange 9d19caa736 . 2016-06-17 18:48:27 +08:00
guange b9280caf36 . 2016-06-17 18:46:15 +08:00
guange 64ad182a84 . 2016-06-17 18:42:58 +08:00
guange 46018ad388 . 2016-06-17 18:41:16 +08:00
guange 3582849ef3 . 2016-06-17 18:40:03 +08:00
guange a0c0a65d18 绑定用户迁移到接口 2016-06-17 18:37:26 +08:00
guange 7aec37bb3a . 2016-06-17 18:25:55 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
huang fce93de296 500问题 2016-06-17 18:03:58 +08:00