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

2812 Commits

Author SHA1 Message Date
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 faf5e89cc2 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
	app/views/blogs/_article.html.erb
	db/schema.rb
 2016-05-19 16:04:27 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 3ebef0eae2 消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面 2016-05-19 15:57:20 +08:00
txz 66042cb3c9 debug false 2016-05-19 15:21:25 +08:00
txz e2f3ba8e7d 微信问题修改 2016-05-19 15:20:46 +08:00
txz 278ee66368 系统冲突 2016-05-19 13:47:08 +08:00
txz 1b3bc38f8e 拖代码改动 2016-05-19 13:44:03 +08:00
yuanke 52724bd9ed KE ol ul标签增加margin-bottom:0 2016-05-18 15:11:53 +08:00
yuanke 0e016eed2a KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布 2016-05-18 14:15:39 +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
yuanke 0ac7163b05 KE修改居中换行居中消失的问题 2016-05-17 15:55:24 +08:00
cxt 9b6c629d10 学生列表增加活跃度的统计 2016-05-17 14:18:14 +08:00
yuanke 93fb4441d8 代码测试改用新的提示框 2016-05-17 14:12:42 +08:00
Tim 0b2fe1d88a 分组作业样式 2016-05-17 11:24:29 +08:00
yuanke c0de43ecc0 修改KE字体间距问题，代码测试出错提示。 2016-05-17 10:31:10 +08:00
Tim 76d1251546 将组织门户登录栏挪到与logo同行 2016-05-17 09:36:55 +08:00
guange 80be46dc92 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-16 17:44:32 +08:00
guange 4b4a48b0c4 sso rsa解码这块处理,因为php只能处理117个字节,所以要拆分开 2016-05-16 17:44:08 +08:00
yuanke 025d07e6a4 代码测试编译信息长度限制不小心注释了 2016-05-16 17:02:18 +08:00
yuanke 708cb35fd2 增加一个弹框的通用接口pop_up_box 2016-05-16 16:57:18 +08:00
yuanke 24b969e781 Merge branch 'yuanke' into develop 2016-05-15 00:02:49 +08:00
huang 0cc9a9e4c5 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-05-13 20:02:32 +08:00
yuanke 6056505f96 复制粘贴时将图片所带链接删掉 2016-05-13 19:07:36 +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 55c9faaf7b Merge branch 'yuanke' into develop 2016-05-13 18:26:01 +08:00
cxt 5204e01ee8 课程留言回复的还原 2016-05-13 18:12:06 +08:00
yuanke 2c7a964470 复制粘贴图片相关 2016-05-13 16:59:59 +08:00
huang 0d2a7d8bfd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-13 16:57:39 +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
Tim d384d1e2b4 名师榜样式调整 2016-05-13 16:28:16 +08:00
yuanke be97675aed 没带图片类型的图片不让点击放大看! 2016-05-13 16:09:26 +08:00
txz 8d338cff9e 微信锁定帖子关闭回复 2016-05-13 15:48:31 +08:00
huang 41214bd762 Merge branch 'cxt_course' into develop 2016-05-13 15:25:53 +08:00
huang 1cd74121ae Merge branch 'yuanke' into develop 2016-05-13 15:25:04 +08:00
yuanke a67ee38ac9 将复制粘贴的图片 链接及class都去掉 2016-05-13 15:18:48 +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
yuanke fc0f92738d 复制粘贴时将图片所带链接去掉 2016-05-13 14:58:35 +08:00
cxt 402976cf40 课程留言的回复防止多次提交 2016-05-13 14:33:06 +08:00
yuanke 80c6edd2d3 KE过滤html代码的时候表格的颜色等样式不能被过滤掉 2016-05-13 14:22:10 +08:00
Tim dc92e821a3 名师榜样式调整 2016-05-13 14:08:34 +08:00
huang 7759670fa1 Merge branch 'yuanke' into develop 
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
 2016-05-13 11:39:01 +08:00
yuanke a1323e3d76 表格问题 2016-05-13 11:32:52 +08:00
Tim 61470c9bd4 名师榜css样式添加 2016-05-13 11:29:45 +08:00
cxt 17497cd74e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-13 10:57:54 +08:00
cxt f1821e54e1 通知和新闻详情页面的回复点击多次不会提交表单多次 2016-05-13 10:56:48 +08:00
Tim 51a6727b07 名师榜样式 2016-05-13 10:41:13 +08:00
Linda a2418396dd 邦本库zip下载样式界面 2016-05-13 10:30:38 +08:00