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

11806 Commits

Author SHA1 Message Date
Tim 57bb2f69a4 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/organizations/_org_custom_right2.html.erb
 2016-06-03 09:12:36 +08:00
Tim bb9c9ddddf 添加链接鼠标覆盖蓝色效果 2016-06-03 09:11:49 +08:00
cxt 1396cae14c 消息弹框 2016-06-03 08:59:17 +08:00
huang a71c4a50bb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 08:59:09 +08:00
huang fa03867cc2 样式神略问题 2016-06-03 08:56:54 +08:00
huang 6fbad6d53d 右二优化 2016-06-03 08:45:43 +08:00
huang 0eb6dbe48a Merge branch 'huang_temp2' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 08:30:31 +08:00
huang 257165dbaf 模式二中添加课程定配 2016-06-02 21:32:56 +08:00
huang e2848f4dec 创建栏目时默认状态 2016-06-02 21:10:07 +08:00
huang dc4f927c39 完成右二模式 2016-06-02 21:01:39 +08:00
huang 52bc4aab81 右二（未完） 2016-06-02 18:46:15 +08:00
huang 0b3ec0322f 右一模式 2016-06-02 18:41:00 +08:00
huang e05e6ba53d 样式对齐问题 2016-06-02 18:04:00 +08:00
huang 5d880db18e 详情页面没登陆可以回复 2016-06-02 17:54:12 +08:00
huang fb1a13a522 隐藏版本库功能 2016-06-02 17:05:51 +08:00
huang d047409d31 项目动态 2016-06-02 16:01:58 +08:00
cxt 04764a0e4f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-02 15:26:30 +08:00
huang ba344a86b5 颜色 2016-06-02 14:59:32 +08:00
huang d532cd3c6c 权限 2016-06-02 14:58:13 +08:00
huang e374b1679f 权限 2016-06-02 14:54:54 +08:00
huang 135e50b2e7 链接 2016-06-02 14:54:04 +08:00
huang 1f073c19ae 域名问题 2016-06-02 13:57:07 +08:00
cxt 3d9b7aedb1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-02 13:56:29 +08:00
cxt 2431ef6986 模板消息引起的问题 2016-06-02 13:56:11 +08:00
Tim ed46ca0735 可拖拽作业列表 2016-06-02 13:45:06 +08:00
huang 22cafdbd05 二级目录弹出 2016-06-02 13:43:30 +08:00
huang 31f3d74b0f 组织栏目中，匿名用户可以回复 2016-06-02 13:37:38 +08:00
huang eecf12eda6 添加链接 2016-06-02 13:32:50 +08:00
huang 76732a3034 新模式有一 2016-06-02 13:17:38 +08:00
cxt b20dc06e23 微信测试版配置修改 2016-06-02 10:56:04 +08:00
cxt 747128750c Merge branch 'weixin_guange' into cxt_course 2016-06-02 10:42:04 +08:00
cxt b72ad364db 微信模板消息：用户绑定成功、作业消息、个人留言、班级通知 2016-06-02 10:39:11 +08:00
huang e5eeba90f6 组织精品课程，热门项目 2016-06-02 09:52:06 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +08:00
Tim 308f247c71 可拖拽调整 2016-06-01 16:09:01 +08:00
cxt 32dca93b59 统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名 2016-06-01 15:35:26 +08:00
cxt fa73171818 点击“课程活跃度”和“课程英雄榜”跳到学生列表，并分别以“活跃度”、“英雄榜”倒序排列 2016-06-01 14:58:59 +08:00
huang b1cb4e5f94 完成左一的配置 2016-06-01 14:31:42 +08:00
cxt 5097abbe1e Merge branch 'develop' into cxt_course 2016-06-01 14:22:43 +08:00
Tim 3b55e9e39b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/student_work/_evaluation_un_title.html.erb
	app/views/student_work/_evaluation_un_work.html.erb
 2016-06-01 13:59:01 +08:00
Tim 513fe1a93d 作品列表可拖拽 2016-06-01 13:46:05 +08:00
huang 2acc545896 完成组织左二模式 2016-06-01 10:24:50 +08:00
huang 5c27aee2bd 模式二课程模块 定义公共方法（显示描述内容以省略号结束） 2016-06-01 09:08:08 +08:00
cxt 0cc8cb9928 刚提交的回复时间显示为“刚刚” 2016-06-01 08:57:27 +08:00
guange 32ffd2a5b5 返回优化完成 2016-05-31 20:55:46 +08:00
huang 9ecdf0892b 完成左三模式的配置 2016-05-31 20:45:54 +08:00
guange 814fde878e 从后台获取openid即可 2016-05-31 20:19:45 +08:00
guange e01da32c75 tempate=>file 2016-05-31 19:54:45 +08:00
guange ac5d91a428 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:51:38 +08:00
guange 1c5a31e8f1 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:49:57 +08:00
guange 49a1a9de32 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:46:30 +08:00
guange e73c946806 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:43:27 +08:00
guange 7b5a7a93f5 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:40:54 +08:00
guange 6e44e8355c Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-05-31 19:21:08 +08:00
guange 7f811d7551 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:20:15 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang a96fafd704 模式三（未完） 2016-05-31 18:37:21 +08:00
cxt ed84783f26 私有课程作业的公开作品 2016-05-31 17:03:50 +08:00
huang 8d56d8556f 完成模式6 2016-05-31 16:03:48 +08:00
huang bb7204846f 新版资源类型定制模式6 2016-05-31 14:41:50 +08:00
cxt 796125bd1c 修改微信端的时间提示 2016-05-31 14:18:40 +08:00
huang 6bfe344cbf 组织模式一左侧权限控制 2016-05-31 13:59:29 +08:00
huang 8f897cbf89 组织管理员模式，二级目录局部刷新 2016-05-31 13:47:05 +08:00
huang c369b271a0 组织管理员配置后的权限控制及局部刷新 2016-05-31 11:24:47 +08:00
cxt 79c106a1c6 微信动态的缺失 2016-05-31 11:04:20 +08:00
huang c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31:08 +08:00
cxt 30f1d87fbf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-31 08:57:39 +08:00
cxt c421933cf6 微信最新动态 2016-05-31 08:57:08 +08:00
guange 858ad47338 作业长度定为50 2016-05-30 18:40:22 +08:00
guange acc323e46d issue7890解决 2016-05-30 18:35:47 +08:00
huang c57c575c84 新版组织静态页面模板 2016-05-30 16:24:51 +08:00
cxt f024764e29 课内学生看到的学生列表中学生“姓名”不应显示昵称 2016-05-30 14:59:05 +08:00
huang 471ed7cbd2 组织logo获取，添加样式图片 2016-05-30 14:58:46 +08:00
cxt d4c0e9754a 课程描述展开后应显示“收起描述信息” 2016-05-30 14:51:54 +08:00
huang 81ab73e286 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/organizations/_org_custom_header.html.erb
 2016-05-30 14:48:12 +08:00
huang 698e4bd7b3 header 2016-05-30 14:41:53 +08:00
Tim 9cc749bd57 门户样式统一，防止冲突 2016-05-30 14:38:57 +08:00
huang 46e4f2c143 组织新base框架 2016-05-30 14:23:52 +08:00
guange 8b623e3a0c Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-05-27 22:59:11 +08:00
guange bb30709fa1 window close 2016-05-27 22:54:57 +08:00
guange 63b9aaefe2 window close 2016-05-27 22:22:09 +08:00
guange be94d445a9 window close 2016-05-27 22:19:49 +08:00
guange 4561bdfd0d code=>params[:code] 2016-05-27 22:18:03 +08:00
guange 4137fe07f3 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-27 22:14:55 +08:00
guange 622d71c476 已绑定成功的，直接提示 2016-05-27 22:14:41 +08:00
cxt 0cafebb3a2 新闻列表的点赞 2016-05-27 17:14:37 +08:00
huang 94dd8befc8 Merge branch 'yuanke' into develop 2016-05-27 17:13:39 +08:00
huang f7cb9bdffd Merge branch 'cxt_course' into develop 2016-05-27 17:13:01 +08:00
huang 12ac353de9 北斗新base 2016-05-27 17:08:50 +08:00
yuanke e650dca1ed 修改用户反馈中二级回复 回复框不消失的问题 2016-05-27 17:06:34 +08:00
cxt 086ccedc08 先隐藏作业信息，再点击查询或分班后“显示作业信息”的按钮不见了 2016-05-27 16:45:04 +08:00
cxt 1535c4cd07 编辑分组作业时的基于项目实施总是默认选中 2016-05-27 15:54:55 +08:00
yuanke d08809bfbd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/project.css
 2016-05-27 15:34:55 +08:00
huang ff14809237 Merge branch 'cxt_course' into develop 2016-05-27 15:30:35 +08:00
huang a207f48b94 Merge branch 'hjq_mail' into develop 
Conflicts:
	app/models/news.rb
 2016-05-27 15:27:02 +08:00
huang 649b3918c4 通知、消息创建的时候异步发送消息 2016-05-27 15:25:27 +08:00
cxt 227a668413 分组匿评的显示 2016-05-27 15:15:14 +08:00
cxt 7599bf75a3 分组作业不关联项目时的作品列表样式调整 2016-05-27 15:04:56 +08:00
Tim 5f27519c67 table可拖拽 2016-05-27 14:44:32 +08:00
huang 9e17db376a 解决组织一级目录二级目录匿名用户问题 2016-05-27 14:44:28 +08:00
cxt 400a470a2b 作品列表的样式调整 2016-05-27 14:42:12 +08:00
cxt 03d70e8c9a 作品列表：当先进行作品搜索或选择分班操作后，然后点击“隐藏作业信息”，再点击“显示作业信息”无反应 （测验列表也一起修复了） 2016-05-27 14:27:54 +08:00
cxt 3b33732e6f 学生列表的姓名、学号、分班和加入时间做成不可点击的 2016-05-27 14:15:26 +08:00
yuanke cfc3751f6f Merge branch 'yuanke' into develop 2016-05-27 14:01:02 +08:00
huang c7bf29b0c9 组织切换问题 2016-05-27 12:46:11 +08:00
cxt 3b84cd3ed2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-27 11:07:42 +08:00
cxt 1fa6ac89ce 微信的配置 2016-05-27 11:07:27 +08:00
huang afedaf3fe5 组织资源历史版本下载权限问题 2016-05-27 10:48:28 +08:00
huang f3a1a7371d 资源过多最下面点击更新版本的时候弹框没有居中 2016-05-27 10:43:50 +08:00
huang 7b6a62e972 历史版本下载403问题 2016-05-27 10:34:57 +08:00
huang fb46062640 项目、课程、组织资源列表发送无法弹框问题 2016-05-27 10:20:15 +08:00
huang 74384d10a5 组织 论坛编辑 2016-05-27 10:06:25 +08:00
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