Commit Graph

10793 Commits

Author SHA1 Message Date
cxt 281fcf315f 点击模板消息页面为空 2016-04-08 21:01:15 +08:00
cxt 845b1cdab8 模板 2016-04-08 19:54:33 +08:00
cxt 440ba27fa4 回复 2016-04-08 18:52:26 +08:00
cxt d6daa906b6 回复 2016-04-08 16:58:27 +08:00
cxt fcddaf403c 删除博客为空的数据 2016-04-08 15:59:23 +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
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 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
guange ce611bc725 merge 2016-04-08 14:17:56 +08:00
guange e9ab2a482b key3修改 2016-04-08 14:17:09 +08:00
cxt 51a61a52d4 activity.rb 2016-04-08 14:12:17 +08:00
cxt 4df5f3114d 模板消息 2016-04-08 14:00:01 +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 aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
huang 549ee9daa2 上传非图片格式的不显示问题 2016-04-08 10:41:11 +08:00
huang bed583b051 提示语 2016-04-08 10:01:54 +08:00
huang 320ed07b31 解决上传图片问题 2016-04-08 09:55:02 +08:00
huang 3501d6f1d6 完成组织模块的开发 2016-04-07 17:05:22 +08:00
cxt ae981cfb07 项目问答区改成项目讨论区 2016-04-07 16:57:40 +08:00
cxt 523a623f1b 作业详情页面的点赞 2016-04-07 16:53:37 +08:00
cxt c404d26ac5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-07 16:40:36 +08:00
cxt dc0bf4df30 传act_id、act_type到详情页面 2016-04-07 16:40:21 +08:00
txz 139a7931ee 点赞功能修改 2016-04-07 16:39:04 +08:00
cxt 60c8320f82 praise api的修改 2016-04-07 15:42:08 +08:00
huang 8d40950491 项目讨论区锁定后不能回复 2016-04-07 15:20:25 +08:00
cxt 2fe32fda61 点赞的js 2016-04-07 15:17:42 +08:00
cxt c8e769e05b 回复倒序排列 2016-04-07 15:09:17 +08:00
huang 23a4a29c76 关联项目、课程中过滤掉私有课程、项目 2016-04-07 14:12:24 +08:00
cxt edb18bd1b8 api提供has_praise 2016-04-07 11:16:38 +08:00
txz 8e1473a484 点赞代码优化等 2016-04-07 09:26:24 +08:00
huang 623114dc41 解决删除项目的私有资源显示在我的资源中的问题 2016-04-06 19:02:07 +08:00
cxt 8f7c6f49b7 api的修改 2016-04-06 14:56:09 +08:00
huang 378dfca006 组织图标只有管理员可以修改 2016-04-06 13:53:40 +08:00
cxt 6c527a9a54 点赞的api 2016-04-06 11:40:05 +08:00
huang a6f6f63d6d 图片上传添加提示 2016-04-06 11:05:13 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
huang c408185b40 Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new
Conflicts:
	db/schema.rb
2016-04-05 11:25:25 +08:00
cxt c3ee4dadfb 作品提交确认框的高度添加限制 2016-04-05 11:24:13 +08:00
guange 58c1b27600 加入openid传参 2016-04-02 08:13:52 +08:00