Commit Graph

14588 Commits

Author SHA1 Message Date
yuanke e86419c28b 组织配置里面栏目类型默认为帖子 2016-06-13 13:35:01 +08:00
yuanke 3a46a409a9 Merge branch 'develop' into yuanke 2016-06-13 09:46:17 +08:00
yuanke f2903ae903 新建贴吧后自动跳入该贴吧 2016-06-13 09:45:11 +08:00
guange 0a82de1cf4 中文问题 2016-06-12 17:25:47 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
guange 637411f258 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 17:18:19 +08:00
guange 1cb63055cb api可以通过openid来认证 2016-06-12 17:18:05 +08:00
huang d4d4e38c41 门户模式中含有三级域名的用户图像https问题 2016-06-12 16:48:35 +08:00
huang 9d3bb44682 简洁模式 2016-06-12 16:04:26 +08:00
txz 0e63a3a24c 指派文字显示不全 2016-06-12 15:37:52 +08:00
guange 15e074417c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 15:06:41 +08:00
guange cbc4f2f6fd 菜单更新 2016-06-12 15:05:45 +08:00
huang dcb3d8659b Merge branch 'cxt_course' into develop 2016-06-12 15:02:33 +08:00
huang c9021eb70f 版本库附件打包下载从配置文件获取 2016-06-12 15:01:28 +08:00
cxt 9d36c74d7f 作业回复的删除 2016-06-12 14:59:00 +08:00
txz 719774f159 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 14:52:29 +08:00
txz b57f6fbc65 微信回复框增加padding 2016-06-12 14:52:24 +08:00
cxt 00528bec60 学生列表没有分班就不显示分班列 2016-06-12 14:50:47 +08:00
huang 1a1fde778f Merge branch 'develop' into hjq_beidou 2016-06-12 13:49:58 +08:00
huang 928d71500d 门户模式--组织栏目没有动态时显示位置 2016-06-12 13:45:22 +08:00
guange 07760bcfca 优化 2016-06-12 13:42:53 +08:00
guange d3c45fd133 使用jquery1.3比较小 2016-06-12 13:40:14 +08:00
huang d18094cc92 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-12 13:36:53 +08:00
huang 78b445a7ae 组织历史数据迁移 模式术语修改, 配置页面域名长度问题 2016-06-12 13:36:35 +08:00
guange 36fedd4d15 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 10:21:07 +08:00
guange 793b651393 压缩angularjs 2016-06-09 19:48:58 +08:00
yuanke 7504b353c9 组织报500问题修复 2016-06-08 16:50:13 +08:00
yuanke 994bb3ad20 Merge branch 'develop' into yuanke 2016-06-08 16:39:14 +08:00
txz 070b48d85f 增加作业类别 2016-06-08 15:48:24 +08:00
txz 981b199a0f 微信图标与数字间距调整,作业增加作业类型 2016-06-08 15:34:14 +08:00
cxt a1e49d9a81 Merge branch 'cxt_course' into develop 2016-06-08 15:24:00 +08:00
cxt c0d167d2e2 项目缺陷动态的回复不显示 2016-06-08 15:23:19 +08:00
txz 5f26e9e3ee 微信回复文字格式不一致,微信回复换行处理 2016-06-08 15:02:06 +08:00
huang 871a4d2d7b 组织设为首页500问题 2016-06-08 13:15:08 +08:00
huang 3e3c300273 Merge branch 'cxt_course' into develop 2016-06-08 11:37:58 +08:00
huang 90aaaa544a 最新动态按创建时间排序 2016-06-08 11:36:32 +08:00
cxt b6eb5a3668 还原作品列表的拖动 2016-06-08 11:28:20 +08:00
huang 388e862241 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-08 11:25:33 +08:00
huang 2f9dcc8a31 文章点击500问题 2016-06-08 11:23:16 +08:00
cxt fa58fbdca1 微信的menu.yml和wechat.yml不提交 2016-06-08 11:21:02 +08:00
yuanke 670c00b8a7 Merge branch 'yuanke' into develop 2016-06-08 11:12:08 +08:00
yuanke e4312674c4 KE表格修改 2016-06-08 11:11:32 +08:00
huang a138ee31ab 详情页面取消首页问题 2016-06-08 11:00:19 +08:00
huang 3d3c859473 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-08 10:54:15 +08:00
huang 6cdccc3b08 设置首页显示问题 2016-06-08 10:53:56 +08:00
yuanke 3ce5efbfe1 Merge branch 'yuanke' into develop 2016-06-08 10:45:41 +08:00
yuanke 4cb4213a52 修改blockquote样式 2016-06-08 10:44:58 +08:00
huang 7e44eb1577 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-08 10:02:24 +08:00
huang 49406681ef 详情页面留言为空的问题 2016-06-08 10:02:10 +08:00
yuanke 41efa6456a Merge branch 'yuanke' into develop 2016-06-08 09:41:41 +08:00