jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,325 Commits 98 Branches 0 Tags 0 B
Commit Graph

1373 Commits

Author SHA1 Message Date
cxt 5a3b68816a 冲突 2016-04-12 15:57:18 +08:00
cxt e420be8ee9 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/models/blog_comment.rb
 2016-04-12 15:56:08 +08:00
cxt 2898805aa7 回复的模板消息 2016-04-12 15:12:40 +08:00
cxt 275895f805 模板消息的重构 2016-04-12 11:00:47 +08:00
guange beec2b3246 merge 2016-04-09 18:17:07 +08:00
huang a2a3d6b6b9 Merge remote-tracking branch 'remotes/origin/weixin_guange' into develop 
Conflicts:
	app/models/blog_comment.rb
 2016-04-09 17:01:20 +08:00
cxt c041f742c1 缺陷和留言的回复 2016-04-09 16:21:13 +08:00
guange 2d41d0a2f6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-09 16:02:24 +08:00
cxt 007fee95bd 作业和留言回复的模板消息 2016-04-09 14:41:45 +08:00
cxt 3f365e75b5 讨论区的模板消息 2016-04-09 14:13:59 +08:00
guange 96dfeead0f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 21:46:56 +08:00
cxt 281fcf315f 点击模板消息页面为空 2016-04-08 21:01:15 +08:00
huang f951d22d56 发布博客500问题 2016-04-08 20:53:30 +08:00
guange 3ff19364dc merge 2016-04-08 20:02:19 +08:00
cxt 845b1cdab8 模板 2016-04-08 19:54:33 +08:00
cxt 440ba27fa4 回复 2016-04-08 18:52:26 +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 d6daa906b6 回复 2016-04-08 16:58:27 +08:00
huang 9fa50e0452 编码问题 2016-04-08 16:19:38 +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 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 aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
cxt 88c39512b9 journal的修改 2016-04-01 21:32:33 +08:00
Yiang Gan af2bd66847 回复api 2016-04-01 18:23:12 +08:00
huang 10371e8bdd 添加附件图片功能 2016-04-01 00:27:34 +08:00
Yiang Gan 536394663a 微信消息模板 2016-03-31 20:46:36 +08:00
ouyangxuhua 0f4d2e40fb 添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整 2016-03-25 19:09:25 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-25 16:16:55 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
ouyangxuhua 589f939bbd 消息类型“学生再次提交作业”中的链接，应该打开学生作品 2016-03-24 11:39:38 +08:00
ouyangxuhua 3fc988757c 组织、项目、课程等在配置中添加成员时，对特殊字符'_'、‘/’添加转义，使能够搜索 2016-03-24 10:14:25 +08:00
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-24 09:37:06 +08:00
huang 185ad829cd 项目访问速度优化 2016-03-24 09:36:46 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
huang 7967066b05 附件添加动态发送方式改变 2016-03-22 15:06:54 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
huang 51bd745b8d 课程讨论区限制改成20000 2016-03-18 13:39:28 +08:00
huang 8a8c9bf7c3 注释修改 2016-03-18 12:41:07 +08:00
huang 79767f4bae 用户行为记录 2016-03-17 17:22:07 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-17 16:06:36 +08:00