Commit Graph

13281 Commits

Author SHA1 Message Date
huang cb9fd1d2ba Merge branch 'hjq_beidou' into develop 2016-04-08 18:20:58 +08:00
huang 9f44babff5 去掉作业提交附件中用户名 2016-04-08 18:20:06 +08:00
guange 3ba7372523 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-08 17:34:11 +08:00
guange 612b79410b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 17:33:41 +08:00
guange b627513bae 中文问题 2016-04-08 17:33:00 +08:00
cxt 89330f9e40 调试 2016-04-08 17:03:48 +08:00
cxt d6daa906b6 回复 2016-04-08 16:58:27 +08:00
huang 5b744093af 回复application编码问题代码 2016-04-08 16:41:33 +08:00
huang 9fa50e0452 编码问题 2016-04-08 16:19:38 +08:00
cxt de8d630fc1 解决冲突 2016-04-08 16:02:10 +08:00
cxt fcddaf403c 删除博客为空的数据 2016-04-08 15:59:23 +08:00
txz c88e924843 博客留言html内容转义 2016-04-08 15:31:43 +08:00
cxt bd19913db8 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:51:33 +08:00
guange 8dc47c9bd3 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:51:46 +08:00
cxt 1cb1835a1a 动态 2016-04-08 14:51:26 +08:00
guange c5b1ffb42f 错误信息打印到日志 2016-04-08 14:50:49 +08:00
cxt c5048d7c72 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:46:49 +08:00
cxt e007ee58ef 博客动态 2016-04-08 14:46:42 +08:00
guange ef317089f1 错误信息打印到日志 2016-04-08 14:46:00 +08:00
guange a35511195a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:42:39 +08:00
guange abf4a80942 错误信息打印到日志 2016-04-08 14:42:23 +08:00
cxt 15ce3ba7e9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:38:43 +08:00
cxt eee7b89388 项目动态 2016-04-08 14:38:35 +08:00
guange 5241dddca2 错误信息打印到日志 2016-04-08 14:38:23 +08:00
huang b5ced6eda9 编码问题 2016-04-08 14:21:54 +08:00
guange ce611bc725 merge 2016-04-08 14:17:56 +08:00
guange e9ab2a482b key3修改 2016-04-08 14:17:09 +08:00
cxt 4621d99a1c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:12:47 +08:00
cxt 51a61a52d4 activity.rb 2016-04-08 14:12:17 +08:00
txz 799722ef45 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:07:55 +08:00
txz 707127631e 微信公众号样式调整 2016-04-08 14:07:49 +08:00
cxt 4df5f3114d 模板消息 2016-04-08 14:00:01 +08:00
huang 57716e7efc 解决项目添加成员没选中而导致点击确定发消息的问题 2016-04-08 12:31:40 +08:00
cxt c870b92489 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 11:59:21 +08:00
cxt a3097c2752 truncate函数 2016-04-08 11:59:13 +08:00
guange 6baf0b46f7 模板消息修改 2016-04-08 11:37:58 +08:00
guange f62b393d7d 模板消息修改 2016-04-08 11:23:28 +08:00
guange 5cc0ac04e6 模板消息修改 2016-04-08 11:19:05 +08:00
guange 0731405828 重新再次进来的用户提示欢迎信息 2016-04-08 10:50:05 +08:00
guange 4e50a9e289 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 10:45:10 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
huang 549ee9daa2 上传非图片格式的不显示问题 2016-04-08 10:41:11 +08:00
txz 4ab96586de Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 10:10:19 +08:00
txz f3738519e9 长单词折行问题 2016-04-08 10:10:08 +08:00
cxt 1503686ddb 无更多动态时不显示更多 2016-04-08 10:09:45 +08:00
huang bed583b051 提示语 2016-04-08 10:01:54 +08:00
huang 320ed07b31 解决上传图片问题 2016-04-08 09:55:02 +08:00
huang c83eefbbaa Merge branch 'hjq_beidou' into develop 2016-04-07 17:08:01 +08:00
huang 3501d6f1d6 完成组织模块的开发 2016-04-07 17:05:22 +08:00
cxt bb71d1c322 调试模式 2016-04-07 16:59:46 +08:00