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

4514 Commits

Author SHA1 Message Date
huang 35ee17c4ca Merge branch 'yuanke' into develop 2016-06-17 11:32:50 +08:00
huang d0791253d9 quality 2016-06-17 11:29:49 +08:00
cxt 1dac05c6d1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 11:26:58 +08:00
huang fea21fe7cd Merge branch 'develop' into rep_quality 2016-06-17 10:36:09 +08:00
yuanke 70a762220a 组织、项目的资源文件增加描述修改及上传文件时候添加描述，并且所有操作对超级管理员开放 2016-06-16 16:55:25 +08:00
cxt e3ee99b486 消息通知中过滤掉已删除的课程消息、 
at消息不显示
 2016-06-16 15:46:16 +08:00
yuanke 049a21c7d0 不上线的先还原 2016-06-16 14:08:54 +08:00
yuanke 2781605670 课程资源描述增加可编辑 2016-06-16 14:04:12 +08:00
cxt 03b92f8570 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 17:23:23 +08:00
yuanke 1023b94f0d 新建贴吧之后转入这个贴吧界面,组织配置栏目默认选择第一项 2016-06-15 17:22:39 +08:00
huang 9b6f40bb02 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 15:43:42 +08:00
yuanke 5a7f7da1f7 新建贴吧和组织配置默认选项暂时还原。 2016-06-15 15:34:13 +08:00
huang d75a8bc35a Merge branch 'hjq_beidou' into develop 2016-06-15 14:49:10 +08:00
yuanke 7b6e8fbc53 修改组织点击登录后可回复报500的BUG 2016-06-15 14:33:25 +08:00
cxt caa966c85a 分组作业的作品列表提示的修改 
分组作业提交作品时的最小人数限制不起作用
 2016-06-15 14:12:42 +08:00
cxt c50d307e89 分组作业添加成员后再次打开，数据未保存 2016-06-14 17:36:12 +08:00
huang 5515fb660f 完成资源更新的时候 描述继承问题，并且可以修改描述 2016-06-14 14:47:02 +08:00
huang d21df48961 代码质量分析弹框及参数传入 2016-06-14 14:10:33 +08:00
cxt 6100abe0da 课程大纲 2016-06-14 10:38:11 +08:00
huang 9029fd91e0 rails 代码中调用shell命令调用 2016-06-14 09:57:29 +08:00
huang 0c25e3b13d 版本库质量分析 ssh链接 2016-06-13 15:21:29 +08:00
yuanke e86419c28b 组织配置里面栏目类型默认为帖子 2016-06-13 13:35:01 +08:00
cxt 3a8a61e404 在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序 2016-06-13 11:10:28 +08:00
cxt be47331213 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-12 15:08:43 +08:00
huang dcb3d8659b Merge branch 'cxt_course' into develop 2016-06-12 15:02:33 +08:00
huang c9021eb70f 版本库附件打包下载从配置文件获取 2016-06-12 15:01:28 +08:00
cxt 9d36c74d7f 作业回复的删除 2016-06-12 14:59:00 +08:00
cxt 24f5e245df 鼠标经过消息通知时弹窗显示最新的5条未读消息 2016-06-12 14:20:55 +08:00
huang 3e3c300273 Merge branch 'cxt_course' into develop 2016-06-08 11:37:58 +08:00
huang 90aaaa544a 最新动态按创建时间排序 2016-06-08 11:36:32 +08:00
huang 2f9dcc8a31 文章点击500问题 2016-06-08 11:23:16 +08:00
huang 49406681ef 详情页面留言为空的问题 2016-06-08 10:02:10 +08:00
huang 67f0cad331 组织网站动态新页面 2016-06-08 09:40:05 +08:00
huang e4f48f046b 子页面没有内容显示 2016-06-08 09:16:57 +08:00
huang fdb1846f75 Merge branch 'hjq_beidou' into develop 2016-06-07 17:37:38 +08:00
huang a8b68d64ee 导航权限控制 2016-06-07 17:19:19 +08:00
huang 3e2810129b 课程留言动态过滤掉 2016-06-07 16:24:02 +08:00
cxt 768d91278d 微信提示信息的修改 2016-06-07 16:15:25 +08:00
huang c5bccf1adb 组织动态按更新时间排序 2016-06-07 16:02:46 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
huang acf4a64e6a 二级帖子子页面 2016-06-07 15:40:28 +08:00
huang 59988f17da 帖子目录界面 2016-06-07 14:48:43 +08:00
huang 1553eadc58 宽度改成1000二级目录模式二样式调整 2016-06-07 10:17:16 +08:00
huang b8d49f0079 0 2016-06-06 18:24:12 +08:00
huang 21197c95b3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-06 15:11:59 +08:00
huang d3c6c0ca99 二级目录未登录时回复提示 2016-06-06 14:29:33 +08:00
huang c6d36bd738 未登录留言判断 2016-06-06 14:21:58 +08:00
cxt 6a25adb37e 最新动态改成我的动态，提示修改 2016-06-06 11:13:35 +08:00
cxt fe22cfa5c5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 18:02:41 +08:00
huang e4ff4ad156 Merge branch 'cxt_course' into develop 2016-06-03 17:55:42 +08:00
huang 57f3cf713c 去掉搜索 2016-06-03 17:50:40 +08:00
cxt 07941233d8 题库点击发送到后，先输入一个不存在的课程ID，点击确定，在出现请先选择课程的提示后删除输入的ID，此时会显示出该用户所有的课程，包括已经删除的 2016-06-03 17:03:53 +08:00
cxt ffe447e5bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 16:28:23 +08:00
cxt d27a050ffa 消息弹窗的显示 2016-06-03 16:28:11 +08:00
huang b128ba5257 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 14:58:37 +08:00
huang 5ec9e31626 精品项目，精品课程按照动态数排序 2016-06-03 13:10:03 +08:00
huang 3af115ee54 组织新版样式，及方法优化 2016-06-03 12:42:02 +08:00
huang ca3b072f85 热门项目按照项目得分排序及设置界面中默认设置 2016-06-03 10:31:29 +08:00
huang 432baebdc3 组织默认activite status 2016-06-03 09:38:24 +08:00
huang 6fbad6d53d 右二优化 2016-06-03 08:45:43 +08:00
huang 257165dbaf 模式二中添加课程定配 2016-06-02 21:32:56 +08:00
huang e2848f4dec 创建栏目时默认状态 2016-06-02 21:10:07 +08:00
huang 52bc4aab81 右二（未完） 2016-06-02 18:46:15 +08:00
huang 31f3d74b0f 组织栏目中，匿名用户可以回复 2016-06-02 13:37:38 +08:00
huang 76732a3034 新模式有一 2016-06-02 13:17:38 +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
cxt 32dca93b59 统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名 2016-06-01 15:35:26 +08:00
cxt fa73171818 点击“课程活跃度”和“课程英雄榜”跳到学生列表，并分别以“活跃度”、“英雄榜”倒序排列 2016-06-01 14:58:59 +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
cxt ed84783f26 私有课程作业的公开作品 2016-05-31 17:03:50 +08:00
huang 8f897cbf89 组织管理员模式，二级目录局部刷新 2016-05-31 13:47:05 +08:00
huang c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31: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 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 4561bdfd0d code=>params[:code] 2016-05-27 22:18:03 +08:00
guange 622d71c476 已绑定成功的，直接提示 2016-05-27 22:14:41 +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 9e17db376a 解决组织一级目录二级目录匿名用户问题 2016-05-27 14:44:28 +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 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 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 c8467a50a0 自己可以给自己点赞 2016-05-25 16:19:41 +08:00
huang 72ae31b7f9 作业导出资源代码回复 2016-05-25 11:23:19 +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
huang 909d40b4eb 默认显示公共资源 2016-05-24 17:14:01 +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
cxt ccf29c980a 作业列表搜索作业：搜索结果中包括不包含关键字的作业、作业回复框加载不出 2016-05-24 10:34:36 +08:00
huang bc0e24d39e 资源引用代码注释 2016-05-24 10:28:17 +08:00
huang ed7c6cbcfe 组织新建帖子增减status状态 2016-05-24 09:40:16 +08:00
huang 0e03798f6e 组织框架结构（yeild）修改 2016-05-23 16:24:32 +08:00
cxt 6586dfaf91 作品搜索时，复制的姓名或学号或邮箱因为包含空格，而搜索不到相关结果 2016-05-23 14:47:10 +08:00
cxt 820e594fec 题库的私有作业显示作业详情 2016-05-23 10:53:49 +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
yuanke 76006ef3e7 组织一级二级帖子删除文章问题 2016-05-20 22:07:33 +08:00
huang acb6d5892d Merge branch 'yuanke' into develop 2016-05-20 20:31:39 +08:00
yuanke d4be470e5f 1.组织二级帖子文章回复不了 
2.组织二级帖子文章点进详情页面删除不了文章
 2016-05-20 20:08:46 +08:00
cxt f517fc5a11 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 19:11:16 +08:00
huang 18054dd96d 私有资源不能下载 2016-05-20 17:04:20 +08:00
cxt 6479ace5e1 作业积分的弹出框增加序号、导出的学生列表中去掉未发布的作业、弹框高度控制 2016-05-20 16:19:10 +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 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
huang dddd7e0ea2 下载 2016-05-20 15:28:09 +08:00
huang b1e0618742 导入资源不能用的问题 2016-05-20 15:05:04 +08:00
huang 352b40dd96 默认为“公共资源” 2016-05-20 13:52:39 +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
cxt df70c33bcd 学生列表活跃度为0 2016-05-19 16:39:14 +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 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
huang 0b2f6c9a53 私有资源的搜索和排序 2016-05-19 14:28:13 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +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
cxt 3b3cafbc81 微信模板消息的还原 2016-05-18 14:49:49 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course 
Conflicts:
	db/schema.rb
 2016-05-17 16:30:03 +08:00
cxt 9b6c629d10 学生列表增加活跃度的统计 2016-05-17 14:18:14 +08:00
huang 0cba32ecd6 北斗单点登录引起的500问题 2016-05-17 11:23:20 +08:00
huang 4c066f9ad3 初始化单点登录用户同步用户角色 2016-05-17 11:21: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
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 8411a08ddb 修改错别字 2016-05-14 09:43:01 +08:00
huang 37b93a4595 文章回复不能用的问题 2016-05-13 20:01:45 +08:00
huang aef178183c 我的资源附件不能删的问题 2016-05-13 19:41:07 +08:00
huang 561f1b0572 Merge branch 'cxt_course' into develop 2016-05-13 18:25:15 +08:00
huang b9e5c77b91 资源500问题 2016-05-13 18:02:06 +08:00
cxt 695e870a26 作品的统计不见了 2016-05-13 17:30:05 +08:00
huang 519ed365cc 导入资源按钮点击没反应问题 2016-05-13 17:24:12 +08:00
cxt 66c410884f 作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。 2016-05-13 17:11:53 +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 39d014355b 科大名师，和名师列表添加标题 2016-05-13 16:30:45 +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 660cf7ef73 名师列表局部搜索 2016-05-13 14:52:33 +08:00
huang 0feb1280fd 名师更多列表 
及相关入口路由
 2016-05-13 14:23:36 +08:00
huang 7759670fa1 Merge branch 'yuanke' into develop 
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
 2016-05-13 11:39:01 +08:00
huang f7a888ac3d 名师默认创建 2016-05-13 11:11:09 +08:00
huang 83ac35cc94 不同的组织定制是否允许设置名师榜 2016-05-13 10:29:22 +08:00
huang 37ee03374e 完成设置名师功能 2016-05-13 09:53:22 +08:00
yuanke 6237bcb6cd 加个gem 'certified' 2016-05-13 09:10:08 +08:00
yuanke a39702f962 图片自动上传，代码测试编译错误过长。 2016-05-13 08:38:28 +08:00
cxt 8af0459519 首页动态中不应出现已删除的课程动态 2016-05-12 16:56:50 +08:00
cxt 582c305a47 申请引用过的作业在课程删除后不应该在申请题库中显示 2016-05-12 16:29:39 +08:00
huang ad2f12c9d0 名师列表搜索功能 2016-05-12 15:02:23 +08:00
cxt b3782c5d0c 合并代码 2016-05-12 10:47:07 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
cxt f4b8f2c794 学生追加附件发送消息 2016-05-12 10:29:43 +08:00
huang 922958e732 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-11 16:23:58 +08:00
huang 52c8593b09 组织教师列表sql优化 2016-05-11 16:20:55 +08:00
cxt d4a35b94f6 导出的作品成绩保存为数字格式 2016-05-11 14:51:49 +08:00
huang 43f06c0826 版本库ZIP下载 2016-05-11 13:44:15 +08:00
cxt 9bc8ccbb9e 教辅可只评语不评分 2016-05-11 09:18:55 +08:00
cxt 5baf467d13 作品评分不覆盖 2016-05-10 15:26:08 +08:00
yuanke 629591ad00 课程、项目列表更新时间取动态表中的 2016-05-10 12:55:42 +08:00
yuanke e502aa7c43 KE表格项目问题，自动上传图片做了一点 2016-05-10 12:51:42 +08:00
huang 99d9a28828 名师榜sql查询 2016-05-10 11:33:02 +08:00
cxt d303a06377 首页列表的排序 2016-05-10 11:32:20 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
cxt f6d7df7393 管理员界面添加“分享作业申请”列表 2016-05-09 18:40:21 +08:00
huang fc36e4c01e 教师列表 2016-05-09 18:10:22 +08:00
cxt 1eb41478b2 课程动态和首页动态中的作业动态实现二级回复 2016-05-09 17:06:10 +08:00
cxt 644e097dc8 定时更新关联项目的作业更新时间 2016-05-09 16:16:03 +08:00
cxt 1b309d4bf0 时间的比较 2016-05-09 10:36:38 +08:00
cxt 7b84c994e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-09 10:32:48 +08:00
cxt fc95d048a5 作业列表打不开 2016-05-09 10:32:41 +08:00
huang 18b70e9dd3 上线问题 2016-05-06 22:59:46 +08:00
cxt e03bc42c53 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/words_controller.rb
 2016-05-06 22:53:16 +08:00
cxt 2a55d8f0c3 作业的回复更新作业的updated_at字段 2016-05-06 22:23:05 +08:00
cxt 9526962c69 翻页时不更新作业动态 2016-05-06 22:06:24 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
cxt b0f407aae5 去掉导出的作业成绩中的作品描述的html代码 2016-05-06 20:19:16 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
cxt 620cc83d4b "从题库选用作业"暂时只提供公共作业和我的作业 2016-05-06 17:56:56 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang ae298f9b55 帖子详情页面添加编辑功能 2016-05-06 14:57:36 +08:00
huang a5be092c16 二级目录帖子列表中添加编辑功能 2016-05-06 14:42:13 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
 2016-05-06 12:22:43 +08:00
huang 572a051b04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/views/blogs/_article.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-05-06 11:35:27 +08:00
huang aefcb78926 新base 2016-05-06 10:28:21 +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
huang 885b6f6092 隐藏掉“综合”选项，分页每页显示20个 2016-05-06 10:12:30 +08:00
cxt 0fafbffa49 项目的更新加到作业的最后更新时间中 2016-05-06 08:52:54 +08:00
huang d0db711449 编辑功能 2016-05-05 18:47:32 +08:00
huang 02d6186045 二级域名讨论帖子添加删除链接 2016-05-05 16:43:20 +08:00
huang e0c011948c 二级域名的隐藏和显示 2016-05-05 15:16:14 +08:00
yuanke b82a1c1162 讨论区计算回复数的一个BUG 2016-05-05 14:52:58 +08:00
guange 72f5f5b795 加入组织 2016-05-05 14:52:10 +08:00
huang 79cd36f297 二级域名排序 2016-05-05 14:39:27 +08:00
guange 17282083a6 merge 2016-05-05 14:07:37 +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
huang 6d28d0becd 二级域名的删除功能 2016-05-05 12:27:35 +08:00
huang 2920f21c95 二级域名编辑功能自动刷新 2016-05-05 11:28:28 +08:00
huang d86fec6f03 模式6没有内容的显示 2016-05-04 19:30:01 +08:00
huang 33bf4fafa6 模式4没有内容的显示情况 2016-05-04 19:12:53 +08:00
huang 04b2aee166 板块一没有图片的显示情况 2016-05-04 18:50:25 +08:00
guange df41f7328f json解析换成rails的 2016-05-04 17:25:24 +08:00
huang 2996daef71 二级域名局部刷新 2016-05-04 17:06:32 +08:00
guange eaad006d17 safe base64 2016-05-04 16:54:12 +08:00
cxt 06586f9e4b 导出作业成绩中添加作品描述的导出 2016-05-04 16:43:37 +08:00
guange e9834f108a 修改pwd 2016-05-04 16:35:39 +08:00
yuanke 9dc92fe817 列表优化 2016-05-04 16:28:40 +08:00
guange ff23df4f12 oss之前不用检验登录 2016-05-04 16:21:53 +08:00
cxt 6c184b9248 题库的分享请求 2016-05-04 16:17:37 +08:00
huang 8dfe95dfd1 配置页面新建二级域名样式 2016-05-04 15:50:53 +08:00
guange e8adcf8cc7 添加sso model 2016-05-04 15:40:18 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
guange 0635c1e98b 添加单点登录controller 2016-05-04 14:05:46 +08:00
cxt 467af47386 私有题库的作业详情页面不显示 2016-05-04 11:13:52 +08:00
huang 578982faba subdomain 404跳转 2016-05-04 11:08:16 +08:00
yuanke 411ae6f89e 1.修改贴吧分页显示问题2列表优化 2016-05-04 11:03:08 +08:00
huang fd543828ac Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/controllers/sub_document_comments_controller.rb
	app/views/sub_document_comments/_show_newstyle.html.erb
	app/views/sub_document_comments/show.html.erb
 2016-05-04 09:46:26 +08:00
huang 557e731343 模式二添加回复功能，模式一回复超过三行则隐藏 2016-05-04 09:45:02 +08:00
cxt 70910c5238 “我的作业”中不应出现已删除课程的作业 2016-05-04 09:40:18 +08:00
Tim 399f757811 0 2016-05-04 09:01:51 +08:00
huang 39dd62580a 完成2级目录详情页面 2016-05-03 20:08:40 +08:00
huang a9059c4c2e 帖子添加编辑删除功能 2016-05-03 19:32:38 +08:00
huang 48002eb247 二级目录讨论区添加帖子回复功能 2016-05-03 19:03:28 +08:00
huang 4489bc13d7 课程列表按创建时间排序 2016-05-03 18:17:03 +08:00
yuanke 8b672cc7c3 项目、课程列表增加更新时间 2016-05-03 17:57:24 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +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
huang 5fb5a2e8bc 二级域名帖子列表两种形式区分 2016-05-03 16:49:13 +08:00
yuanke 96e7c9d134 新闻排序时间改为更新时间 2016-05-03 16:34:31 +08:00
cxt c49627913b 更改评分设置中的教师优先，评分未更新 2016-05-03 15:12:56 +08:00
yuanke d5805e8103 课程、项目列表不显示已删除的 2016-05-03 11:24:16 +08:00
cxt 6b1137980e 挂起的作业编辑截止日期后报500 2016-05-03 10:58:49 +08:00
cxt 39c2365338 已拒绝的私有作业不可引用 2016-05-03 10:15:09 +08:00
cxt 3f7a391214 课程和项目的排序 2016-04-29 20:45:14 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
cxt 0bb6d42c80 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-29 19:22:08 +08:00
cxt a9cb556a20 题库的切换报500 2016-04-29 19:21:54 +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
huang 253189ea7a 帖子列表中添加分页 2016-04-29 16:33:10 +08:00
huang f6c3e89454 二级目录帖子详细页面 2016-04-29 16:14:08 +08:00
cxt 341927506a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-29 15:58:05 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke f8abd46ae9 列表修改 2016-04-29 15:52:44 +08:00
cxt 53bf0dcd7a 题库加入所有私有作业、并可通过提交申请来导入私有作业 2016-04-29 15:46:26 +08:00
huang 2b4f16e5f1 二级目录新界面的帖子列表页面 2016-04-29 14:46:40 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
huang d8480ea3c6 二级目录内容页面 2016-04-29 11:33:56 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +08:00
yuanke f185c59e90 Merge branch 'yuanke' into develop 2016-04-28 14:33:30 +08:00
yuanke 2cb9f0cd05 组织还原 2016-04-28 14:31:40 +08:00
yuanke b3fdc45a04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 12:38:06 +08:00
yuanke dc53b86a4e Merge branch 'cxt_course' into yuanke 
Conflicts:
	app/controllers/student_work_controller.rb
	db/schema.rb
 2016-04-28 10:49:05 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +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
yuanke c357971e8a 课程列表、项目列表等修改 2016-04-27 16:02:52 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
yuanke dac717bd97 列表左边菜单收缩 2016-04-27 14:12:56 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00