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

1429 Commits

Author SHA1 Message Date
huang 3853d5b7ad 右三模式定制 2016-05-13 13:39:44 +08:00
huang 1673ae451b 名师榜新增一个后就不能再新增 2016-05-13 10:50:34 +08:00
huang 99d9a28828 名师榜sql查询 2016-05-10 11:33:02 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
huang cd0603f01b 模式二里面的链接问题 2016-05-06 20:36:06 +08:00
cxt c6c3625029 题目申请说明内容较长时，会导致被申请者收不到消息 2016-05-06 18:47:38 +08:00
huang a5be092c16 二级目录帖子列表中添加编辑功能 2016-05-06 14:42:13 +08:00
huang 6e7d20c410 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-06 10:17:18 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
guange 88fd2cbfb6 Merge remote-tracking branch 'origin/develop' into guange_dev 2016-05-05 14:07:29 +08:00
guange dfdd301f2f sso同步登录功能完成 2016-05-05 14:06:47 +08:00
cxt 5f50ad046c 留言报500 2016-05-05 10:52:54 +08:00
cxt d845b14992 讨论区的模板消息 2016-05-05 09:36:45 +08:00
cxt 121aca7505 缺陷模板消息 2016-05-05 09:09:45 +08:00
guange e8adcf8cc7 添加sso model 2016-05-04 15:40:18 +08:00
huang a602a6aa63 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_message.html.erb
 2016-05-03 17:12:38 +08:00
cxt c49627913b 更改评分设置中的教师优先，评分未更新 2016-05-03 15:12:56 +08:00
cxt b0988dc950 Merge branch 'cxt_course' into develop 2016-04-29 17:57:32 +08:00
cxt 389b75f7ab 申请引用私有作业时发送消息 2016-04-29 17:55:57 +08:00
cxt 341927506a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-29 15:58:05 +08:00
cxt 53bf0dcd7a 题库加入所有私有作业、并可通过提交申请来导入私有作业 2016-04-29 15:46:26 +08:00
huang 2b4f16e5f1 二级目录新界面的帖子列表页面 2016-04-29 14:46:40 +08:00
huang d8480ea3c6 二级目录内容页面 2016-04-29 11:33:56 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +08:00
huang 9fbf713709 完成组织二级域名 2016-04-27 17:02:44 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
cxt 766026e3cf 教师评分为最终评分 2016-04-27 16:21:35 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
guange 2c23b88998 boards#index性能优化 2016-04-24 12:48:03 +08:00
huang a985f6fee1 新建帖子/回帖不发送消息 2016-04-22 14:14:21 +08:00
huang 17b5832df0 Merge branch 'hjq_beidou' into develop 2016-04-22 12:45:05 +08:00
huang c4bd78e442 讨论区代码还原及优化 2016-04-22 12:44:37 +08:00
huang e23262225a 版本库名不能是全数字 2016-04-22 10:34:45 +08:00
cxt 06f15735fe Merge branch 'weixin_guange' into develop 2016-04-20 15:15:54 +08:00
cxt aed3818273 点击模板消息跳到微信详情页面 2016-04-20 14:44:10 +08:00
cxt ef987d6bf7 模板消息中有html标签 2016-04-20 10:44:54 +08:00
yuanke bc59ce0b60 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 09:55:29 +08:00
yuanke 0f5fe51f97 1.管理员界面代码测试列表的修改 
2.代码查重按钮位置
3.查重结果样式
 2016-04-20 09:51:51 +08:00
huang b1f47fe120 历史版本不能删除问题 2016-04-19 11:19:29 +08:00
huang a907089bd0 附件历史版本可以删除 2016-04-19 10:41:48 +08:00
huang 7259d607dc Merge branch 'hjq_beidou' into develop 2016-04-18 15:38:11 +08:00
huang 8064fe6c46 讨论区新建帖子代码优化 2016-04-18 15:37:32 +08:00
huang 16bba76f61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 16:52:15 +08:00
huang 6027b6d0f5 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 16:51:37 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +08:00
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +08:00
cxt 96accf1e7a 未发布的作业不应进行作业的积分统计 2016-04-14 15:35:27 +08:00