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

11694 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 99c1821b4e Merge branch 'weixin_guange' into develop 2016-05-27 08:56:26 +08:00
cxt 0cac1e99c7 微信动态的描述过滤掉html 2016-05-26 17:18:58 +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
cxt 8257770ec9 课程和项目留言的点赞 2016-05-25 16:20:01 +08:00
cxt c8467a50a0 自己可以给自己点赞 2016-05-25 16:19:41 +08:00
cxt 5c9ec49457 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-25 15:27:00 +08:00
cxt 09b831c189 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-25 14:57:59 +08:00
cxt d9bd13c2fc 复制课程报500 2016-05-25 14:57:46 +08:00
huang 457cf72263 断行样式 
发送JS
 2016-05-25 14:08:05 +08:00
huang 0a8d21ea55 公共资源底端发送JS 2016-05-25 14:05:09 +08:00
huang 72ae31b7f9 作业导出资源代码回复 2016-05-25 11:23:19 +08:00
huang 415b624e0b 样式问题 2016-05-25 11:07:36 +08:00
huang 2abb68c00c 组织代码公共部分整理 2016-05-25 10:54:49 +08:00
huang b6de2dbd2d 发布作业导入资源 2016-05-25 09:44:30 +08:00
huang 4280d79eab Merge branch 'develop' into hjq_beidou 2016-05-25 09:11:55 +08:00
huang 197f054c18 注释掉申请私有资源功能 2016-05-25 09:10:41 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +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
cxt 4ec0d6812b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-24 18:11:18 +08:00
huang 909d40b4eb 默认显示公共资源 2016-05-24 17:14:01 +08:00
cxt fc3b47e3aa 测验统计结果的js问题 2016-05-24 16:37:21 +08:00
huang a4f2ebb73b Merge branch 'develop' into hjq_beidou 2016-05-24 16:12:27 +08:00
huang a7a2be6a4b 作业导入资源问题 2016-05-24 16:01:02 +08:00
Tim 1c0a68e57b 组织配置成员tab，搜索结果太多导致换页断行问题 2016-05-24 15:47:22 +08:00
Tim 65c7719ed2 设置大纲图标在讨论区换行显示问题 2016-05-24 15:18:11 +08:00
cxt ccf29c980a 作业列表搜索作业：搜索结果中包括不包含关键字的作业、作业回复框加载不出 2016-05-24 10:34:36 +08:00
huang bc0e24d39e 资源引用代码注释 2016-05-24 10:28:17 +08:00
cxt 6af9e849d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-24 09:51:45 +08:00
cxt 13676ec9c3 微信的链接修改 2016-05-24 09:51:27 +08:00
huang ed7c6cbcfe 组织新建帖子增减status状态 2016-05-24 09:40:16 +08:00
yuanke e7d20c2b98 1.项目用户反馈、课程留言区增加自动识别URL功能 
2.所有自动识别URL区域的链接颜色都改为#15bccf
 2016-05-24 09:11:50 +08:00
huang b1c70db28a 上线暂时还原代码 2016-05-23 16:34:31 +08:00
cxt e62a4cc646 绑定新的微信公众号 2016-05-23 16:29:38 +08:00
huang 0e03798f6e 组织框架结构（yeild）修改 2016-05-23 16:24:32 +08:00
huang a3abf09841 delayjob封装 2016-05-23 16:04:06 +08:00
yuanke 5eff3db9e8 1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点 
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
 2016-05-23 15:58:32 +08:00
huang d70f42b413 发布课程通知消息异步发送（测试版） 2016-05-23 15:03:22 +08:00
cxt 6586dfaf91 作品搜索时，复制的姓名或学号或邮箱因为包含空格，而搜索不到相关结果 2016-05-23 14:47:10 +08:00
cxt 2afce9d563 隐藏导入作业的申请题库 2016-05-23 14:05:28 +08:00
huang a60356091b issue中添加类型tag 2016-05-23 11:02:21 +08:00
cxt 820e594fec 题库的私有作业显示作业详情 2016-05-23 10:53:49 +08:00
cxt c3ec7289b7 Merge branch 'develop' into cxt_course 2016-05-23 09:51:59 +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
huang 27d029271b Merge branch 'cxt_course' into develop 2016-05-20 22:08:45 +08:00
huang 86ff725b8a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 22:08:32 +08:00
yuanke 76006ef3e7 组织一级二级帖子删除文章问题 2016-05-20 22:07:33 +08:00
huang 039d11e862 资源发送权限问题 2016-05-20 21:48:51 +08:00
Tim 51cd9c6dd1 学号溢出bug 2016-05-20 21:47:31 +08:00
huang 0fcd8ae86d 导入资源鼠标点击效果 2016-05-20 21:10:53 +08:00
huang cdde844e44 Merge branch 'cxt_course' into develop 2016-05-20 21:01:30 +08:00
huang f94806bcdf Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 21:01:18 +08:00
huang e512154ea9 古剑删除描述一致 2016-05-20 21:00:36 +08:00
huang d9241d5dca 组织栏目帖子设为首页后显示在栏目中 2016-05-20 20:55:43 +08:00
Tim dd4786d639 作品列表查看详情定位 2016-05-20 20:44:13 +08:00
huang 166a97dc0c 注释 2016-05-20 20:37:11 +08:00
huang acb6d5892d Merge branch 'yuanke' into develop 2016-05-20 20:31:39 +08:00
huang 90bb940290 资源下载链接问题 2016-05-20 20:27:32 +08:00
yuanke d4be470e5f 1.组织二级帖子文章回复不了 
2.组织二级帖子文章点进详情页面删除不了文章
 2016-05-20 20:08:46 +08:00
Tim 5f4a9304fe 提交成绩后，列表成绩没刷新修改；分组作业列表宽度调整 2016-05-20 20:05:39 +08:00
huang 3ffe131a73 删除的提示 2016-05-20 20:02:17 +08:00
huang f308b24f5a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 19:52:57 +08:00
huang baf7e1dbc0 没有连接点击不刷新页面 2016-05-20 19:52:42 +08:00
Tim 1c7efa247e 老师提交分数后格式混乱修改 2016-05-20 19:13:55 +08:00
cxt 40f45ea697 发布通知的微信模板消息内容有重复 2016-05-20 19:13:19 +08:00
cxt f517fc5a11 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 19:11:16 +08:00
cxt 56a151a7b4 学生打开的作品列表中不应通过下拉列表访问到挂起的作业 2016-05-20 19:11:09 +08:00
huang e10bc46361 Merge branch 'yuanke' into develop 2016-05-20 18:59:54 +08:00
huang 8ebe8b0d0c 删除提示顺序 
消息样式
 2016-05-20 18:55:17 +08:00
huang e901becfe6 发送权限问题 2016-05-20 18:46:19 +08:00
yuanke c9c3aa5f31 Merge branch 'develop' into yuanke 2016-05-20 18:43:20 +08:00
yuanke bc8171501d 解决组织文章设为首页报500 2016-05-20 18:40:39 +08:00
huang b0e4ed5ab3 请求分享如果自己在项目的话则不需要申请 2016-05-20 17:40:18 +08:00
yuanke 0e827abd35 将代码测试编译器信息的冒号改为中文的 2016-05-20 17:25:56 +08:00
huang 82f4c685da 消息拒绝问题 2016-05-20 17:11:44 +08:00
huang 18054dd96d 私有资源不能下载 2016-05-20 17:04:20 +08:00
huang f9e445500e 已经引用通过的勾选问题 2016-05-20 16:38:58 +08:00
cxt 6479ace5e1 作业积分的弹出框增加序号、导出的学生列表中去掉未发布的作业、弹框高度控制 2016-05-20 16:19:10 +08:00
cxt 8f9ead0a12 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 15:39:37 +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 d108f0a684 Merge branch 'yuanke' into develop 2016-05-20 15:37:44 +08:00
huang 13ac7ef273 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 15:37:02 +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
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +08:00
huang dddd7e0ea2 下载 2016-05-20 15:28:09 +08:00
Tim c3f63709ed Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 15:15:56 +08:00
Tim 13f83719c1 作品列表改为table布局 2016-05-20 15:15:42 +08:00
huang b1e0618742 导入资源不能用的问题 2016-05-20 15:05:04 +08:00
cxt c165d0b37e 作业二级回复的模板通知 2016-05-20 14:52:47 +08:00
cxt 2895dd5342 作业二级回复的消息通知增加显示作业名称的tip 2016-05-20 14:28:14 +08:00
huang 004c48b456 发送至课程项目局部刷新 2016-05-20 14:16:45 +08:00
huang 352b40dd96 默认为“公共资源” 2016-05-20 13:52:39 +08:00
huang f18c3ed667 私有资源中不添加”上传资源“的按钮 2016-05-20 13:37:18 +08:00
huang 0d8d2939b3 资源不符合条件的不能选择框 2016-05-20 12:43:47 +08:00
cxt 82568b5951 缺陷状态更改或内容更改时不发模板消息 2016-05-20 11:39:30 +08:00
cxt 6aa20c9edf 消息通知的内容没有过滤用Tab键空格引起的特殊符号 2016-05-20 11:12:37 +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
huang 1402f2076a 资源申请添加链接 2016-05-19 16:53:22 +08:00
yuanke 0dd7aae08c 先注释自动识别URL 2016-05-19 16:39:23 +08:00
cxt df70c33bcd 学生列表活跃度为0 2016-05-19 16:39:14 +08:00
yuanke 5b0ef6ada0 Merge branch 'develop' into yuanke 2016-05-19 16:30:02 +08:00
yuanke 6e749f49e4 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-05-19 16:29:33 +08:00
yuanke 7da1418069 自动识别URL 2016-05-19 16:24:57 +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 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
huang 984f706722 可发送权限控制 2016-05-19 15:59:59 +08:00
cxt 3ebef0eae2 消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面 2016-05-19 15:57:20 +08:00
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
txz e2f3ba8e7d 微信问题修改 2016-05-19 15:20:46 +08:00
cxt 05a475e47e 微信动态中不应出现已删除的项目和课程动态 2016-05-19 14:35:40 +08:00
huang 0b2f6c9a53 私有资源的搜索和排序 2016-05-19 14:28:13 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00
huang 4c68da9bee 修正链接资源名 2016-05-19 13:49:29 +08:00
huang bddc807057 修正资源库弹框位置 2016-05-19 13:41:32 +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
yuanke c208b79e2d 代码测试上面的语言右边 加上编译器信息 2016-05-18 16:23:28 +08:00
cxt 670b2c48c7 缺陷的模板消息要细化缺陷类型 2016-05-18 16:08:40 +08:00
cxt 3b3cafbc81 微信模板消息的还原 2016-05-18 14:49:49 +08:00
huang 658ea0cf1e 资源引用 结构搭建 数据创建 2016-05-18 14:49:13 +08:00
yuanke 0e016eed2a KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布 2016-05-18 14:15:39 +08:00
cxt 28edaf2246 课程/项目留言：快速点击提交按钮重复产生多条记录的问题 2016-05-18 10:57:56 +08:00
huang 615d0ddbd2 公共资源、私有资源请求分享界面及样式 2016-05-17 16:45:11 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course 
Conflicts:
	db/schema.rb
 2016-05-17 16:30:03 +08:00
guange 1767e1200d school不用Base64解码，两边都是utf8 2016-05-17 15:56:06 +08:00
cxt ddafa79835 无法展开隐藏楼层 2016-05-17 15:52:24 +08:00
cxt 55a98d8d6e 作业二级回复的消息通知 2016-05-17 15:33:16 +08:00
huang 07678e367e 资源新样式删除功能 2016-05-17 15:32:18 +08:00
huang 4c71e525a7 资源新样式增加后，重命名功能 2016-05-17 15:30:10 +08:00
cxt 9b6c629d10 学生列表增加活跃度的统计 2016-05-17 14:18:14 +08:00
Tim 70ff3e2c19 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-17 11:24:42 +08:00
Tim 0b2fe1d88a 分组作业样式 2016-05-17 11:24:29 +08:00
huang 0cba32ecd6 北斗单点登录引起的500问题 2016-05-17 11:23:20 +08:00
huang 61ba7b0c30 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-17 11:22:03 +08:00
huang 4c066f9ad3 初始化单点登录用户同步用户角色 2016-05-17 11:21:05 +08:00
yuanke c0de43ecc0 修改KE字体间距问题，代码测试出错提示。 2016-05-17 10:31:10 +08:00
huang 11bc6b1e6c 配置500问题 2016-05-17 10:18:24 +08:00
huang e9c35ae20f 组织未登录情况默认图片展示 2016-05-17 10:13:03 +08:00
huang 985b1e4c95 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-17 10:06:17 +08:00
Tim 15ea9a9659 组织门户自动播放禁用 2016-05-17 10:04:23 +08:00
Tim 1402ae190d 组织头像 2016-05-17 10:03:26 +08:00
huang 20e8627b02 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-17 09:52:51 +08:00
huang 326c3a84a0 还原域名问题 2016-05-17 09:52:26 +08:00
Tim 76d1251546 将组织门户登录栏挪到与logo同行 2016-05-17 09:36:55 +08:00
Tim aee56c7eca Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-17 09:15:05 +08:00
Tim 545e4ac380 禁用组织门户合作伙伴自动滚动效果 2016-05-17 09:11:30 +08:00
huang b0f9d0280f 0 2016-05-17 09:06:38 +08:00
huang 855b33c4a5 Merge branch 'develop' into hjq_beidou 2016-05-17 09:02:43 +08:00
huang 13cc5ceaa6 model中添加获取二级域名的方法 2016-05-17 09:02:17 +08:00
Tim e9a3bc5094 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-17 09:00:40 +08:00
huang 5ee6c9e5d3 子域名添加成员问题 2016-05-16 18:08:05 +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
cxt 9caf9cbf2f 消息列表的消息，在点击时，要弹出新的浏览器页面 2016-05-16 16:16:24 +08:00
Tim fbbda96c60 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-16 15:00:21 +08:00
Tim fa788ced1b 资源库添加私有资源 2016-05-16 15:00:08 +08:00
huang 6cca44df98 组织项目、课程动态问题 2016-05-16 14:53:40 +08:00
huang 2484d642a1 组织500问题 2016-05-16 14:19:04 +08:00
huang ff20b50aa2 Merge branch 'cxt_course' into develop 2016-05-16 11:15:01 +08:00
cxt 5e56e11982 暂时禁掉作业的模板消息和消息通知 2016-05-16 11:14:21 +08:00
huang 09c462ebad 资源代码还原 2016-05-15 08:50:10 +08:00
yuanke 24b969e781 Merge branch 'yuanke' into develop 2016-05-15 00:02:49 +08:00
yuanke e24470db4c 代码测试截取ERROR_MSG时只在编译错误下截取 2016-05-15 00:00:16 +08:00
guange f217b3f510 去除用户名域名 2016-05-14 16:00:04 +08:00
guange 8411a08ddb 修改错别字 2016-05-14 09:43:01 +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