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

11366 Commits

Author SHA1 Message Date
cxt 31d94dc052 发布可引用的作业至课程，作业的原作者不应收到微信消息提醒 2016-05-18 16:28:43 +08:00
cxt 670b2c48c7 缺陷的模板消息要细化缺陷类型 2016-05-18 16:08:40 +08:00
cxt 3b3cafbc81 微信模板消息的还原 2016-05-18 14:49:49 +08:00
cxt 28edaf2246 课程/项目留言：快速点击提交按钮重复产生多条记录的问题 2016-05-18 10:57:56 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course 
Conflicts:
	db/schema.rb
 2016-05-17 16:30:03 +08:00
cxt ddafa79835 无法展开隐藏楼层 2016-05-17 15:52:24 +08:00
cxt 55a98d8d6e 作业二级回复的消息通知 2016-05-17 15:33:16 +08:00
cxt 9b6c629d10 学生列表增加活跃度的统计 2016-05-17 14:18:14 +08:00
cxt 9caf9cbf2f 消息列表的消息，在点击时，要弹出新的浏览器页面 2016-05-16 16:16:24 +08:00
cxt 5e56e11982 暂时禁掉作业的模板消息和消息通知 2016-05-16 11:14:21 +08:00
cxt c25b63a254 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-13 20:07:49 +08:00
huang 37b93a4595 文章回复不能用的问题 2016-05-13 20:01:45 +08:00
huang aef178183c 我的资源附件不能删的问题 2016-05-13 19:41:07 +08:00
cxt c2efb7bdda Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-13 18:28:07 +08:00
huang 561f1b0572 Merge branch 'cxt_course' into develop 2016-05-13 18:25:15 +08:00
cxt 5bc19d7ef0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-13 18:12:12 +08:00
cxt 5204e01ee8 课程留言回复的还原 2016-05-13 18:12:06 +08:00
huang a31ffbf8fb 教师栏目不能添加二级域名 2016-05-13 18:10:33 +08:00
huang b9e5c77b91 资源500问题 2016-05-13 18:02:06 +08:00
cxt 695e870a26 作品的统计不见了 2016-05-13 17:30:05 +08:00
cxt 821cd8ad99 作品列表样式调整 2016-05-13 17:26:17 +08:00
huang 519ed365cc 导入资源按钮点击没反应问题 2016-05-13 17:24:12 +08:00
huang fbcae050ad 项目500问题 2016-05-13 17:16:09 +08:00
cxt 66c410884f 作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。 2016-05-13 17:11:53 +08:00
huang 79e57e2b7f 代码和并冲突处理及连接参数 2016-05-13 17:00:25 +08:00
huang e8afcf9157 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/organizations/_org_subfield_rightM2.html.erb
 2016-05-13 16:56:02 +08:00
huang 39c753fd25 名师列表排序 2016-05-13 16:54:27 +08:00
cxt bc39b68bb2 新建测验题目、问卷题目防止多次提交表单 2016-05-13 16:50:41 +08:00
huang 6ccb79a210 教师列表颜色 2016-05-13 16:47:56 +08:00
huang 6d484e15fd Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 16:30:57 +08:00
huang 39d014355b 科大名师，和名师列表添加标题 2016-05-13 16:30:45 +08:00
Tim d384d1e2b4 名师榜样式调整 2016-05-13 16:28:16 +08:00
Tim afbe5317cb Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 16:11:35 +08:00
Tim a88ab59489 名师榜添加右侧banner 2016-05-13 16:11:10 +08:00
huang 467ee60657 名师默认显示5个，没有则不显示 2016-05-13 15:37:04 +08:00
huang 41214bd762 Merge branch 'cxt_course' into develop 2016-05-13 15:25:53 +08:00
huang f1c0347ee2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-13 15:12:40 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
huang 5ae580aab0 添加用户连接 2016-05-13 15:10:34 +08:00
cxt 3e340b6ef9 博客微信api 2016-05-13 15:01:36 +08:00
cxt 22523d25b8 贴吧发帖防止多次提交表单 2016-05-13 14:52:38 +08:00
huang 660cf7ef73 名师列表局部搜索 2016-05-13 14:52:33 +08:00
cxt 89749b853b 微信帖子api 2016-05-13 14:43:22 +08:00
cxt 01287ff93c 学生打开新建的作业列表报500 2016-05-13 14:40:28 +08:00
cxt dc6c5fe18b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-13 14:33:16 +08:00
cxt 402976cf40 课程留言的回复防止多次提交 2016-05-13 14:33:06 +08:00
Tim 1833f15e19 课程资源库导入资源样式修改 2016-05-13 14:23:51 +08:00
huang 91f3fddb16 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 14:23:48 +08:00
huang 0feb1280fd 名师更多列表 
及相关入口路由
 2016-05-13 14:23:36 +08:00
Tim 4ea7d5ed57 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 14:08:48 +08:00