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

4159 Commits

Author SHA1 Message Date
huang 213b0f75b0 Merge branch 'hjq_resource' into develop 2016-05-27 09:33:44 +08:00
huang ab4aa0f06f 公共资源多个资源发送功能 2016-05-27 09:32:24 +08:00
cxt 6fea9c2ba8 微信文字和图片的显示 2016-05-26 17:14:52 +08:00
cxt ff974d6901 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/views/wechats/login.html.erb
 2016-05-26 15:32:00 +08:00
cxt 4d5ee5a722 微信的欢迎图片及欢迎词的修改,测试版的配置 2016-05-26 15:27:31 +08:00
guange b48b1c97b3 weixin 2016-05-26 13:02:27 +08:00
guange e4653426d2 将openid存到session 2016-05-26 12:59:15 +08:00
huang 0a7d1f1efc 公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug 2016-05-25 17:54:53 +08:00
huang 72ae31b7f9 作业导出资源代码回复 2016-05-25 11:23:19 +08:00
huang b6de2dbd2d 发布作业导入资源 2016-05-25 09:44:30 +08:00
huang 197f054c18 注释掉申请私有资源功能 2016-05-25 09:10:41 +08:00
huang b38bd0c1e5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-24 20:13:42 +08:00
cxt ed2f413949 代码还原 2016-05-24 20:04:06 +08:00
cxt 7b7f9cf8f2 删除wechat无用代码 2016-05-24 19:52:51 +08:00
huang a7a2be6a4b 作业导入资源问题 2016-05-24 16:01:02 +08:00
huang bc0e24d39e 资源引用代码注释 2016-05-24 10:28:17 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
huang 66709b16e5 Merge branch 'yuanke' into develop 2016-05-20 22:09:58 +08:00
yuanke 76006ef3e7 组织一级二级帖子删除文章问题 2016-05-20 22:07:33 +08:00
huang acb6d5892d Merge branch 'yuanke' into develop 2016-05-20 20:31:39 +08:00
yuanke d4be470e5f 1.组织二级帖子文章回复不了 
2.组织二级帖子文章点进详情页面删除不了文章
 2016-05-20 20:08:46 +08:00
cxt f517fc5a11 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 19:11:16 +08:00
huang 18054dd96d 私有资源不能下载 2016-05-20 17:04:20 +08:00
cxt 6479ace5e1 作业积分的弹出框增加序号、导出的学生列表中去掉未发布的作业、弹框高度控制 2016-05-20 16:19:10 +08:00
cxt 7b0fd246ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 15:39:16 +08:00
cxt da375dcb4e 挂起作业的作品列表中下拉列表的内容为空，截止时间和发布时间不应显示 2016-05-20 15:39:07 +08:00
huang 1c400669aa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 15:36:00 +08:00
huang 5cefedd20a Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-05-20 15:35:08 +08:00
huang 5114c12c17 注释掉为完成的代码 2016-05-20 15:34:35 +08:00
huang dddd7e0ea2 下载 2016-05-20 15:28:09 +08:00
huang b1e0618742 导入资源不能用的问题 2016-05-20 15:05:04 +08:00
huang 352b40dd96 默认为“公共资源” 2016-05-20 13:52:39 +08:00
huang 80f829c018 解决搜索不能用的问题 2016-05-20 10:48:17 +08:00
huang 92f55e0dc1 公共资源库，点击底部不能发送的问题 2016-05-20 10:02:59 +08:00
cxt b03b9a3c27 课程：问卷导入时显示的数据未进行过滤 2016-05-20 09:59:41 +08:00
huang f806dbf587 资源发送至组织和课程 2016-05-19 17:12:33 +08:00
huang e0370e3e32 私有资源中发送文件 2016-05-19 17:04:46 +08:00
cxt df70c33bcd 学生列表活跃度为0 2016-05-19 16:39:14 +08:00
huang 4857769c49 Merge branch 'yuanke' into develop 2016-05-19 16:11:06 +08:00
huang fe54a19940 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 
Conflicts:
	app/views/blogs/_article.html.erb
	app/views/users/_project_boardlist.html.erb
	public/stylesheets/new_user.css
 2016-05-19 16:10:18 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
huang 0b2f6c9a53 私有资源的搜索和排序 2016-05-19 14:28:13 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00
huang 99cbf0b54e 资源引用消息通知 2016-05-19 11:32:58 +08:00
huang f3f75a57bd 申请资源消息资源发布这收到消息 2016-05-18 17:37:48 +08:00
cxt 31d94dc052 发布可引用的作业至课程，作业的原作者不应收到微信消息提醒 2016-05-18 16:28:43 +08:00
cxt 3b3cafbc81 微信模板消息的还原 2016-05-18 14:49:49 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course 
Conflicts:
	db/schema.rb
 2016-05-17 16:30:03 +08:00
cxt 9b6c629d10 学生列表增加活跃度的统计 2016-05-17 14:18:14 +08:00