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

8772 Commits

Author SHA1 Message Date
Tim 53e6b41d93 北斗登录效果调整 2016-04-26 10:02:16 +08:00
huang 255d7e07bc 北斗新界面样式 2016-04-25 18:54:21 +08:00
huang dae6a5ecae 配置八种类型更新 2016-04-25 16:00:52 +08:00
huang 81210fd475 顶部导航及样式 2016-04-25 15:35:32 +08:00
huang 5b763927cc 顶部用户路由 2016-04-25 14:14:26 +08:00
yuanke bb80cad1e3 Merge branch 'yuanke' into yuanke_1 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-25 14:03:27 +08:00
yuanke 639749f02b 修改作业未发布时 加了代码查重按钮 显示错乱的问题. 2016-04-25 11:00:56 +08:00
yuanke d34b3780c8 课程列表修改 2016-04-25 10:44:46 +08:00
huang c1437bb75b 北斗界面 2016-04-24 14:39:33 +08:00
yuanke f6d09e0554 配置中增加一个 隐藏课程信息的功能 2016-04-24 14:23:08 +08:00
guange 2c23b88998 boards#index性能优化 2016-04-24 12:48:03 +08:00
yuanke c8eaf293e7 课程列表 2016-04-24 10:49:33 +08:00
yuanke 81cd30cbda Merge branch 'cxt_course' into yuanke_1 
Conflicts:
	db/schema.rb
 2016-04-23 13:22:28 +08:00
yuanke a4d250e168 博客列表 2016-04-23 13:20:49 +08:00
cxt 379859db67 评分设置 2016-04-22 17:33:49 +08:00
cxt 1d1a44f85f Merge branch 'cxt_course' into develop 2016-04-22 16:33:57 +08:00
cxt 8f6b116c51 作品详情打不开 2016-04-22 14:46:58 +08:00
yuanke 6191c3636d Merge branch 'yuanke' into yuanke_1 
Conflicts:
	public/javascripts/homework.js
 2016-04-22 14:18:30 +08:00
yuanke f503969702 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-22 14:16:26 +08:00
yuanke 016177a078 Merge branch 'yuanke' into develop 2016-04-22 14:14:15 +08:00
yuanke f6a5ffc6a5 测试代码的时候点击一下然后按钮消失等结果返回才出现 2016-04-22 14:13:24 +08:00
yuanke 5c5d212193 博客列表 2016-04-22 13:52:33 +08:00
cxt da73d2b004 Merge branch 'cxt_course' into develop 2016-04-22 12:40:20 +08:00
cxt 7673fc41fb 作品列表页面增加提交作品的入口 2016-04-22 12:37:13 +08:00
cxt 9b4c275869 作品动态添加追加附件功能 2016-04-22 11:27:30 +08:00
cxt 4448cb0891 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 17:02:04 +08:00
cxt 3fe2e81c0e 作业评分设置时比例NAN 2016-04-21 17:01:57 +08:00
cxt 16348654a5 启用匿评和禁用匿评时修改评分设置 2016-04-21 17:00:30 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
yuanke eddea2eabd Merge branch 'yuanke' into yuanke_1 2016-04-21 14:01:54 +08:00
huang 42076a137d 项目统计添加判断 2016-04-21 11:19:21 +08:00
yuanke 5a5afd6d24 Merge branch 'yuanke' into develop 2016-04-21 11:17:30 +08:00
yuanke d538d1967b 解决管理员界面代码测试列表404的问题 2016-04-21 11:16:32 +08:00
huang ba171c49cc 统计 改成 代码统计 2016-04-21 10:42:06 +08:00
huang e8048f8eb7 完成版本库时间UTC与北京时间的转换 
时间国际化问题
 2016-04-21 10:09:52 +08:00
yuanke 85055f2a84 博客列表修改 2016-04-21 09:39:21 +08:00
huang 449bdf2225 完成版本库统计功能 2016-04-20 16:40:44 +08:00
yuanke 8f62cccfd6 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 16:14:26 +08:00
yuanke 29115bca3a 博客列表修改 2016-04-20 16:12:20 +08:00
cxt 06f15735fe Merge branch 'weixin_guange' into develop 2016-04-20 15:15:54 +08:00
yuanke c6174406fb 数据库语句使用rails已有的 2016-04-20 10:39:07 +08:00
yuanke dc3837da76 Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-20 09:59:37 +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 4e4cb309a9 版本库目录最新动态 2016-04-19 15:03:47 +08:00
cxt 87619f4078 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-19 13:03:22 +08:00
cxt 1ded6ddf04 学生无法编辑已提交的编程作品 2016-04-19 13:03:12 +08:00
huang 43f5f821d5 组织未登录用户不显示设置按钮 2016-04-19 11:10:58 +08:00
huang ad3d27d6b0 版本库文件目录 2016-04-19 10:21:12 +08:00
cxt 0cc5eca34b 个人主页的项目列表有重复的项目 2016-04-19 09:58:51 +08:00
huang adc17c5038 代码优化 
文件目录动态获取接口
文件目录显示样式
 2016-04-19 09:34:55 +08:00
huang 200307ec9f 组织模块访问统计修改 2016-04-19 09:18:58 +08:00
cxt 36d82e1315 微信绑定页面出现了两个用户名 2016-04-18 11:24:18 +08:00
yuanke 87c33725e4 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/student_work/work_canrepeat.js.erb
 2016-04-15 19:01:11 +08:00
yuanke c1c20fda3b 修改学生也能看到代码查重的BUG 2016-04-15 18:59:47 +08:00
yuanke 3136191de8 查重修改 2016-04-15 18:51:31 +08:00
yuanke 5aba3fb11b 修改查重有时候失败的问题 2016-04-15 18:48:39 +08:00
yuanke 5efd55de2d Merge branch 'yuanke' into develop 2016-04-15 17:37:17 +08:00
yuanke 19a95dfc9c 作业列表加上代码查重 2016-04-15 17:36:23 +08:00
cxt 51478bd232 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 17:21:07 +08:00
cxt b07c3947d6 Merge branch 'cxt_course' into develop 2016-04-15 17:20:55 +08:00
yuanke 3dbedcdcbf Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 17:08:51 +08:00
yuanke 764dffd95e 动态里面加上代码查重 2016-04-15 17:07:38 +08:00
cxt eeecc5ad08 禁用匿评的作业点击评分设置时不应出现缺评扣分的选项 2016-04-15 17:06:45 +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
huang 5e5f677bab 动态中显示默认分支的统计 2016-04-15 16:50:39 +08:00
huang a18daeecd1 版本库统计与动态统一 2016-04-15 16:01:25 +08:00
cxt 4c4afb7a94 在新窗口中打开作业批次列表中的作业 2016-04-15 15:57:49 +08:00
huang a21200ab14 动态中添加分支 2016-04-15 15:53:29 +08:00
cxt 9fdd229b2c Merge branch 'cxt_course' into develop 2016-04-15 15:45:54 +08:00
huang 4a8d572cb1 项目动态中版本库统计样式 2016-04-15 15:38:08 +08:00
cxt 7f3fcb7d01 精品课程列表中的全部课程可点击动态数排序 2016-04-15 14:54:17 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +08:00
yuanke 8eebfd7480 Merge branch 'yuanke' into develop 2016-04-15 12:40:06 +08:00
yuanke 365540cf1f 管理员界面显示代码测试列表的修改 2016-04-15 12:39:22 +08:00
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
cxt 36e8b05f9c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 11:32:38 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +08:00
yuanke e58f1ab94b Merge branch 'yuanke' into develop 2016-04-15 11:29:40 +08:00
yuanke 998106b37b 修改代码查重的一些弹框显示效果等问题 2016-04-15 11:28:20 +08:00
cxt 143f3f8f9a 管理员界面增加精品课程的设置 2016-04-15 11:26:56 +08:00
cxt 3b4f6f4846 添加分班和修改分班名称时刷新学生列表 2016-04-14 17:24:56 +08:00
cxt 829399b8af 个人主页的课程列表和项目列表排序 2016-04-14 16:59:25 +08:00
Tim 5ba2149f43 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-04-14 14:50:31 +08:00
cxt 4e4eb7b759 学生作业积分默认显示两位小数 2016-04-14 14:50:33 +08:00
Tim 37bd547d87 作业下拉框效果 2016-04-14 14:50:16 +08:00
Tim f479277a96 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-04-14 14:38:34 +08:00
yuanke 36f3d61915 Merge branch 'yuanke' into develop 2016-04-14 14:36:30 +08:00
yuanke 25fd655a56 修改转不到查重结果页面的BUG 2016-04-14 14:35:50 +08:00
huang fddf03d80c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-14 13:44:14 +08:00
huang 7d8715e82b Merge branch 'hjq_beidou' into develop 2016-04-14 13:43:58 +08:00
huang 2a00c4ddd7 版本库统计show权限统计 2016-04-14 13:39:19 +08:00
cxt d948536a10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-14 12:33:15 +08:00
cxt e5b07c6c12 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 12:33:11 +08:00
cxt 19861ba8c6 超级管理员的组织可关联所有公开课程和项目 2016-04-14 12:30:33 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
huang c87611dfec 动态中添加版本库统计 2016-04-14 11:18:17 +08:00
huang ef28266225 曲线颜色 2016-04-14 10:37:38 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
huang 12efc10759 图标曲线 总变更为+ 2016-04-14 10:10:31 +08:00
huang adf6cca435 完成代码行数的提交和统计 2016-04-13 20:39:20 +08:00
cxt f97699037b 冲突解决 2016-04-13 16:58:44 +08:00
cxt 2befcd6634 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-13 16:52:52 +08:00
cxt 2889353844 作品列表中的“未参与”增加tip：“该作品未被匿评” 2016-04-13 16:27:20 +08:00
cxt 062af3c57a 作业积分出现负分 2016-04-13 16:11:57 +08:00
huang f9c4c4b86f 版本库不同分支之间的统计 2016-04-13 16:03:59 +08:00
cxt 42f960922a 个人主页的项目排序按更新时间排序 2016-04-13 15:39:05 +08:00
cxt a21ea98b37 个人主页中的课程列表出现重复课程 2016-04-13 15:14:35 +08:00
huang f7cb451feb gitlab版本库添加提交信息统计接口 2016-04-13 14:36:43 +08:00
Tim deda05b048 作业下拉选择 2016-04-13 14:23:24 +08:00
cxt 4d581d07b8 作业发布默认选中禁用匿评 2016-04-13 14:14:41 +08:00
cxt fcd1684658 作业列表按更新时间排序 作业列表左上角添加作业的下拉列表 2016-04-13 11:20:38 +08:00
cxt 7fcd229f85 分组作业--作品列表中：点击关联的项目跳转至该项目主页 2016-04-13 10:09:54 +08:00
huang 04849659de 版本库统计 2016-04-12 16:00:54 +08:00
guange 055ba00de5 绑定成功后关闭页面 2016-04-09 23:20:24 +08:00
cxt 5e3e2e64a9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-09 18:35:07 +08:00
cxt 40dba4d463 Merge branch 'develop_new' into develop 2016-04-09 18:34:51 +08:00
huang 3f3048a51b 组织私有课程、项目关联提示 2016-04-08 21:04:06 +08:00
huang cb9fd1d2ba Merge branch 'hjq_beidou' into develop 2016-04-08 18:20:58 +08:00
huang 9f44babff5 去掉作业提交附件中用户名 2016-04-08 18:20:06 +08:00
huang 57716e7efc 解决项目添加成员没选中而导致点击确定发消息的问题 2016-04-08 12:31:40 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
huang bed583b051 提示语 2016-04-08 10:01:54 +08:00
huang 320ed07b31 解决上传图片问题 2016-04-08 09:55:02 +08:00
huang 3501d6f1d6 完成组织模块的开发 2016-04-07 17:05:22 +08:00
huang 8d40950491 项目讨论区锁定后不能回复 2016-04-07 15:20:25 +08:00
huang 623114dc41 解决删除项目的私有资源显示在我的资源中的问题 2016-04-06 19:02:07 +08:00
huang 378dfca006 组织图标只有管理员可以修改 2016-04-06 13:53:40 +08:00
huang a6f6f63d6d 图片上传添加提示 2016-04-06 11:05:13 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
huang c408185b40 Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new 
Conflicts:
	db/schema.rb
 2016-04-05 11:25:25 +08:00
cxt c3ee4dadfb 作品提交确认框的高度添加限制 2016-04-05 11:24:13 +08:00
huang 73297230d1 权限控制 2016-04-02 00:31:36 +08:00
huang e4b5a4df05 500wenti 2016-04-02 00:14:48 +08:00
huang 0bcd2ddcf8 0 2016-04-02 00:02:09 +08:00
huang 0dc7b1f621 上传图片 2016-04-02 00:00:36 +08:00
huang 86aecd21b9 上传图片 2016-04-01 23:56:05 +08:00
huang 0459856a2c 上线logo更换 2016-04-01 21:30:32 +08:00
huang ac1b3338c5 logo图标替换 2016-04-01 20:10:28 +08:00
huang 218a6b9358 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-01 19:25:01 +08:00
huang 007419f9cc 精华样式问题 2016-04-01 18:38:05 +08:00
huang 94478829b6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-01 17:23:37 +08:00
huang 9e7c595e55 组织发送动态的显示 2016-04-01 17:23:15 +08:00
linchun 02ebaf23d1 修改管理员界面组织列表总组织的链接 2016-04-01 16:17:26 +08:00
linchun 0798046847 Merge branch 'develop' into linchun 2016-04-01 15:56:51 +08:00
linchun c1c19f6d60 修改管理员界面作业列表报500错误的bug 2016-04-01 15:54:59 +08:00
huang aee695e94d 组织动态添加poll、 2016-04-01 11:48:13 +08:00
huang 25da925497 课程列表显示内容统一 2016-04-01 11:38:20 +08:00
huang 638280a07e 样式问题 2016-04-01 10:31:16 +08:00
huang 8f4ff2bf91 列表样式问题 2016-04-01 10:20:31 +08:00
huang 92a08dc606 作业500问题 
admin组织编辑500问题
 2016-04-01 09:37:31 +08:00
huang 10371e8bdd 添加附件图片功能 2016-04-01 00:27:34 +08:00
huang 5ce14991cf 新闻链接问题 2016-03-31 21:32:19 +08:00
huang 12c3de6dc9 500问题 2016-03-31 21:14:07 +08:00
huang d71035159a 修改more链接 2016-03-31 20:54:01 +08:00
huang ba658e44c0 组织more权限 2016-03-31 20:46:55 +08:00
huang 5866dfb7ff 登录 
没内容more
logo不加链接
 2016-03-31 20:12:20 +08:00
huang 865f274c61 修改登录 2016-03-31 19:56:29 +08:00
huang 230dab6d9d 栏目样式 2016-03-31 19:42:05 +08:00
huang 1fdd562bd3 修改组织一些功能jibug 2016-03-31 19:33:43 +08:00
huang 756a2db4aa 组织配置样式问题 
链接more空白问题
 2016-03-31 19:04:31 +08:00
huang 67d1798163 修改news500问题 2016-03-31 18:11:29 +08:00
huang 7490c7f90d 添加图片链接和用户名链接 2016-03-31 17:51:23 +08:00
huang 45343a44b8 修改链接 2016-03-31 17:13:40 +08:00
huang 6af8c48d3b Merge branch 'hjq_beidou' into develop 2016-03-31 17:06:30 +08:00
huang f662bfa40b 组织科配置 2016-03-31 17:06:00 +08:00
huang c431658333 setting中后台编辑 2016-03-31 16:19:59 +08:00
linchun 2af261056c h回复改过的分页错误代码，修改有误 2016-03-31 15:33:48 +08:00
huang 1ccb3a2c41 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-31 15:25:24 +08:00
huang c6f6030e10 组织新样式 2016-03-31 15:25:02 +08:00
cxt 893fad2b48 组织配置里的栏目 “排列做成可编辑的” 2016-03-31 15:21:40 +08:00
linchun 914117230e 解决管理员界面用户列表报500错误的bug，，分页错误 2016-03-31 15:15:11 +08:00
huang cf946687d0 类型 2016-03-31 14:02:35 +08:00
huang 3465a39285 添加配置 
隐藏不显示
 2016-03-31 13:07:12 +08:00
cxt 37e3377fd3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new 2016-03-31 09:44:35 +08:00
cxt 6a5b79cf6d 管理员的作业页面报500 2016-03-31 09:44:21 +08:00
huang da1438b04e Merge branch 'hjq_beidou' into develop 2016-03-30 19:34:03 +08:00
huang 8f43341f81 新建组织为空的情况 2016-03-30 19:17:29 +08:00
huang b64e8a5f9e 完成所有图片自动适应转换 2016-03-30 19:02:41 +08:00
huang bded9f2e98 图片自动获取功能 2016-03-30 18:35:47 +08:00
huang 0244008b32 一些链接和样式 2016-03-30 17:33:22 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
linchun d98eb8748e 修改管理员界面作业列表的截止时间为作业发布时间，并且按时间倒序排列 2016-03-30 14:17:12 +08:00
huang f2106d0045 more链接添加，区分两种模式 2016-03-29 20:33:16 +08:00
huang a26cf19b86 配置中配置模式 2016-03-29 20:14:07 +08:00
huang 8a6a1b94ee 组织资源的统计与权限 2016-03-29 20:09:47 +08:00
huang 961a264e05 创建时间统一date 2016-03-29 19:04:51 +08:00
cxt c59ee4b35c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-29 18:25:16 +08:00
huang 65e80b1978 用户图像样式 2016-03-29 18:25:16 +08:00
cxt 668a724064 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new 2016-03-29 18:22:51 +08:00
cxt 69373468ae 作品详情打不开 2016-03-29 18:22:41 +08:00
alan 9452254b62 去掉缓存机制 2016-03-29 17:39:20 +08:00
huang 2728cccd41 Merge branch 'develop' into hjq_beidou 2016-03-29 16:54:44 +08:00
huang 7c9e20c9bf 登录注册样式 2016-03-29 16:51:50 +08:00
huang d28a46c48a 北斗资源库板块 2016-03-29 16:45:14 +08:00
alan e4fc9f39e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-29 16:43:52 +08:00
yuanke be1351a4d8 Merge branch 'yuanke' into develop 2016-03-29 15:56:02 +08:00
yuanke ef5d8abf38 修改编程作业提示服务器出错的BUG 2016-03-29 15:54:44 +08:00
alan 03d855f5d5 修改资源区分页问题 2016-03-29 15:46:13 +08:00
ouyangxuhua 7f0959c972 题库发送输入框中文能正常输入并调整样式；调整发送功能的其他样式 2016-03-29 15:25:22 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-29 13:51:46 +08:00
huang 2b9ddf3594 组织新版 2016-03-29 13:43:28 +08:00
cxt 3a4265a0dd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_resource_share_for_orgs.html.erb
	app/views/users/_resource_share_for_project_popup.html.erb
	app/views/users/search_user_project.js.erb
 2016-03-29 12:49:19 +08:00
cxt 8d6093f1b9 Merge branch 'alan_develop' into develop 
Conflicts:
	app/views/users/_resource_share_for_orgs.html.erb
	app/views/users/_resource_share_for_project_popup.html.erb
	app/views/users/_resource_share_popup.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-03-29 12:42:12 +08:00
ouyangxuhua 56f8d4854b 恢复代码 2016-03-29 12:38:02 +08:00
alan e9069f0225 fix merge bug 2016-03-29 12:29:23 +08:00
alan eb1c6ccf85 Merge branch 'alan_develop' into develop 
Conflicts:
	app/views/users/_resource_share_for_orgs.html.erb
	app/views/users/_resource_share_for_project_popup.html.erb
	app/views/users/_resource_share_popup.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-03-29 11:36:49 +08:00
huang b80bc98fcb 组织首页 2016-03-29 11:31:58 +08:00
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua 2016-03-29 10:21:29 +08:00
alan 90fd52970b fix bugger on 资源区 2016-03-29 10:15:18 +08:00
ouyangxuhua 598f69abb0 组织显示模式暂时隐藏 2016-03-29 09:35:07 +08:00
alan 395fb8fae6 修改pagination,资源区bug 2016-03-28 22:37:01 +08:00
ouyangxuhua 1a1d5b4c49 解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题 2016-03-28 19:20:09 +08:00
cxt 8e7d25a483 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-28 17:20:52 +08:00
cxt f46985c8bc 作品点赞报500 2016-03-28 17:20:46 +08:00
huang 64f13a04cc 动态500问题 2016-03-28 17:09:42 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
cxt 33c9331c7b 课程设置为私有/公开 课程头部未刷新 2016-03-28 15:35:24 +08:00
huang 74a4e80795 Merge branch 'ouyangxuhua' into hjq_beidou 2016-03-28 15:11:37 +08:00
huang 9fc227d619 资源库问题 2016-03-28 14:50:26 +08:00
huang 4b6b5504ca 北斗框架（未完） 2016-03-28 14:11:40 +08:00
ouyangxuhua 67ff9fb6e2 组织显示模式功能 2016-03-28 13:03:13 +08:00
ouyangxuhua f4b4bf40de 增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择 2016-03-28 11:24:31 +08:00
huang 326730f6b1 北斗框架 2016-03-28 10:39:09 +08:00
yuanke 2ceef7d3e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 21:12:22 +08:00
yuanke ef49715b08 编程测试加个results为空判断 2016-03-25 21:11:13 +08:00
yuanke a58ba8080c 编程作业加个日志 2016-03-25 21:06:25 +08:00
huang c7c96e0c6a 公共资源附件名编辑问题 2016-03-25 20:37:32 +08:00
huang fc006d64bb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:11:45 +08:00
huang 1bf494f661 课程推荐资源统计数 2016-03-25 20:11:26 +08:00
cxt 0d5bad1ddd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:11:00 +08:00
cxt 35faa12d4d 组织编辑文章无法提交 2016-03-25 20:10:53 +08:00
ouyangxuhua f0d6bb7fae Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:08:20 +08:00
ouyangxuhua 26b81fb8b3 组织文章列表回复问题解决 2016-03-25 20:07:55 +08:00
huang 777e585d4d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 19:21:07 +08:00
huang ba25f41bcb 添加教师统计数、学生统计数 2016-03-25 19:20:36 +08:00
ouyangxuhua 00d2542964 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 19:09:48 +08:00
ouyangxuhua 0f4d2e40fb 添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整 2016-03-25 19:09:25 +08:00
alan e764075bd6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:36:53 +08:00
alan 16831e19d9 merge 晓婷的课程留言 2016-03-25 17:34:32 +08:00
ouyangxuhua 2261081dc2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:17:15 +08:00
alan 6862480632 修改当用户没有项目时，报错 2016-03-25 17:16:45 +08:00
ouyangxuhua cca2527401 组织栏目新建文章样式调整 2016-03-25 17:16:36 +08:00
alan 4587e728d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:07:42 +08:00
alan 05d66f41f9 fix bug when user don't have courses or projects 2016-03-25 17:07:30 +08:00
yuanke 4c47dae88b Merge branch 'develop' into yuanke 2016-03-25 16:38:21 +08:00
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/migrate/20160324074942_add_index_to_forge_activities.rb
 2016-03-25 16:33:22 +08:00
huang cca570e75c 课程相关优化 2016-03-25 16:30:00 +08:00
alan 3b48b3add7 refactor cache 2016-03-25 16:26:33 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-25 16:16:55 +08:00
alan 4f5e083707 优化个人主页，缓存设置 2016-03-25 16:06:14 +08:00
yuanke 674b63d106 Merge branch 'develop' into yuanke 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
 2016-03-25 15:59:49 +08:00
huang e02ad85bbb 项目动态关联优化（主要优化查询次数） 2016-03-25 15:58:17 +08:00
huang 9ce39d2f4a Issue模块动态优化 2016-03-25 15:46:40 +08:00
ouyangxuhua 9f8ad41533 Merge branch 'ouyangxuhua' into develop 2016-03-25 15:42:37 +08:00
cxt 46a05d1000 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 15:37:15 +08:00
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua 2016-03-25 15:32:38 +08:00
yuanke dea947e9ce Merge branch 'develop' into yuanke 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
	public/javascripts/homework.js
	public/stylesheets/new_user.css
 2016-03-25 14:58:17 +08:00
yuanke c6361406b5 代码评测超时优化 2016-03-25 14:43:51 +08:00
huang 9549d695f6 讨论区局部优化 2016-03-25 14:29:58 +08:00
alan aeb694a68e 修改《删除blog_comment时删除user_activities内容》 2016-03-25 13:57:00 +08:00
ouyangxuhua 7b24b053a5 Merge branch 'develop' into ouyang 2016-03-25 12:35:13 +08:00
ouyangxuhua 5cc31fb511 组织资源栏目排序，带过滤条件，如tag类型、搜索条件等 2016-03-25 12:30:33 +08:00
huang ff2340baf9 课程统计信息优化 2016-03-25 10:42:26 +08:00
alan 04b4823ac2 user_activities 加cache 2016-03-25 10:27:28 +08:00
huang cb4b26762d 课程base优化 2016-03-25 09:56:45 +08:00
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题 2016-03-24 17:03:51 +08:00
huang 9cbe719c5e 项目动态表添加索引 2016-03-24 16:44:54 +08:00
huang 88185b1f34 点击作品消息，作品展开 2016-03-24 15:04:50 +08:00
huang 77419dc2d4 Merge branch 'develop' into hjq_new_course 2016-03-24 14:00:45 +08:00
huang a9ef2c28e2 项目创建类型迁移 2016-03-24 13:57:52 +08:00
alan a0e11a787f 修改个人主页不能展开更多 2016-03-24 13:57:01 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
ouyangxuhua 589f939bbd 消息类型“学生再次提交作业”中的链接，应该打开学生作品 2016-03-24 11:39:38 +08:00
alan 0d049bbe1f refactor new_base_user 2016-03-24 10:07:39 +08:00
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-24 09:37:06 +08:00
huang 185ad829cd 项目访问速度优化 2016-03-24 09:36:46 +08:00
alan 13e265b7d2 优化 layouts/_user_projects 和 layouts/_user_courses页面 2016-03-23 18:25:50 +08:00
ouyangxuhua 1579a86f9f 老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示 2016-03-23 17:19:25 +08:00
cxt fe35bb3b44 学生打开作品列表报500 2016-03-23 14:42:27 +08:00
ouyangxuhua 6b3e9ba4b3 新建组织时，点击私有或者公开选项，允许游客下载选项及时响应 2016-03-23 14:29:30 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
cxt aa1cbcdf87 课程留言动态加入个人动态 2016-03-22 16:44:53 +08:00
cxt f90b25b230 作业附件的用户名省略号太早 2016-03-22 15:50:06 +08:00
ouyangxuhua fcb189d874 编辑组织栏目的顺序时，不需要弹窗 2016-03-22 14:10:36 +08:00
ouyangxuhua 675b1ad403 1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。 2016-03-22 13:51:19 +08:00
huang e20fe85ddf 消息去掉tip 2016-03-21 18:16:50 +08:00
huang 70d594659e 课程英雄榜代码封装 2016-03-21 16:50:24 +08:00
huang e06695b56b 课程活跃度代码封装 2016-03-21 16:45:49 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
yuanke a10830c90f Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-21 14:40:47 +08:00
ouyangxuhua 4fa1288411 添加组织栏目后，栏目子域名输入框设置为空 2016-03-21 12:29:25 +08:00
linchun 6284b8d4f9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:57:59 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
ouyangxuhua 84703a3e01 组织配置中的添加成员，链接使用https://www形式 2016-03-18 16:35:36 +08:00
cxt 74e77bf347 题库的来源排序不可用 
题库的分布时间排序
 2016-03-18 16:23:24 +08:00
cxt fdcd44e240 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:07:43 +08:00
cxt d967a31ec9 课程报500 2016-03-18 16:07:34 +08:00
alan 7d4e0c5d8a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:00:00 +08:00
alan 20cdec0cab Merge branch 'alan_develop' into develop 2016-03-18 15:59:21 +08:00
alan 66d2558f87 修复《issue具体页面样式》 2016-03-18 15:58:23 +08:00
ouyangxuhua a1fbe8b886 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:33:17 +08:00
huang 0413eb1c02 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:23:53 +08:00
alan 2b07671d95 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:21:01 +08:00
huang 8b09be83e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:18:31 +08:00
huang fc6210eada 资源导入，搜索条件中导入400问题 2016-03-18 15:17:49 +08:00
cxt 9917e802cb 课程推荐的资源统计 2016-03-18 15:15:25 +08:00
cxt e167a28d49 课程推荐的作业统计 2016-03-18 14:59:34 +08:00
ouyangxuhua c64910d343 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 14:53:52 +08:00
cxt a482b76207 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 14:53:52 +08:00
cxt dc4a7ee2e6 Merge branch 'cxt_course' into develop 2016-03-18 14:53:43 +08:00
cxt e34f2e45db 管理员界面的课程列表和项目列表分页 2016-03-18 14:53:06 +08:00
ouyangxuhua 5c22b23f3a Merge branch 'develop' into ouyangxuhua 2016-03-18 14:52:51 +08:00
cxt b1f3395bd1 修改作品描述框和名称框的提示文字 2016-03-18 14:45:42 +08:00
ouyangxuhua b5964fba0b 组织超链接问题 2016-03-18 14:44:39 +08:00
linchun d3635067b7 Merge remote-tracking branch 'remotes/origin/develop' into linchun 2016-03-18 13:01:39 +08:00
linchun 66a7827eb2 组织列表增加分页功能，学校列表调整分页 2016-03-18 12:55:55 +08:00
linchun f8a88767c0 管理员用户列表增加单位信息 2016-03-18 12:44:16 +08:00
huang 2fe1100da6 去掉课程使者帖子中时间 2016-03-18 12:34:41 +08:00
huang 888c024e9e 资源库ajax局部刷新 2016-03-18 12:23:59 +08:00
huang 4876e6669a 课程附件局部刷新 2016-03-18 11:04:43 +08:00
cxt 119b12349b 作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交 2016-03-18 10:56:35 +08:00
ouyangxuhua 1eafad6468 鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00
alan 6f5a4d429d 修改《issue详情页面样式乱了》 2016-03-17 21:17:30 +08:00
cxt 2466184d8a 编辑作业的时候，还要选择作业发布的课程不合理，影响体验 
编辑作业时layout根据来源而不同
 2016-03-17 17:34:29 +08:00
ouyangxuhua 34d1aef256 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 17:09:04 +08:00
ouyangxuhua 282a720916 私有组织下的资源栏目，没有发送文件功能 2016-03-17 17:08:42 +08:00
huang 1b0bcd0c05 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:37:24 +08:00
huang cefa6efc1b 项目动态中加入附件 2016-03-17 16:36:57 +08:00
cxt b8b34f7861 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:23:47 +08:00
cxt 368c70b14d Merge branch 'cxt_course' into develop 2016-03-17 16:23:38 +08:00
cxt 1489c8d924 课程简介没有内容就不要显示 2016-03-17 16:22:29 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
cxt 602864bd71 个人主页课程列表: 1、增加学期信息 2、排序不对 2016-03-17 16:17:33 +08:00
cxt 10da3e1e53 题库样式调整 2016-03-17 16:11:04 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-17 16:06:36 +08:00
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/files/_org_subfield_list.html.erb
	db/schema.rb
 2016-03-17 16:06:05 +08:00
cxt 6b8ae56ce4 Merge branch 'alan_develop' into develop 2016-03-17 16:04:06 +08:00
huang 03597b85ff 解决项目被淹没问题 2016-03-17 16:02:36 +08:00
cxt 0f80f0e377 作品列表：已禁用了匿评的作业就不要显示“匿评截止时间”了 2016-03-17 15:54:10 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
cxt a1f393c117 批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样 2016-03-17 15:21:09 +08:00
cxt 2eefdcd0ee 批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样 2016-03-17 15:17:00 +08:00
huang 42d89c7ed0 课程导语发送这改成课堂使者 2016-03-17 15:12:28 +08:00
alan 8e41b19563 消息列表取消tip 2016-03-17 15:09:08 +08:00
linchun 52af5e4303 修复了管理员界面多个列表的题目问题 2016-03-17 15:05:14 +08:00
cxt a8780be9b4 提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子 2016-03-17 15:03:34 +08:00
alan a4e2fd741e 删除issue，返回页面不变 2016-03-17 14:13:29 +08:00
huang ee40255d7e 资源库bytes改成b 2016-03-17 14:09:13 +08:00
huang 0d1fc409d1 版本库提示同一高度 2016-03-17 13:58:55 +08:00
huang ab3fc0fb2c 成员提供真实姓名 2016-03-17 13:02:32 +08:00
huang c8eb2d9c95 项目、组织添加资源历史版本下载 2016-03-17 12:49:00 +08:00
huang b3faef601b 修复资源库样式问题 2016-03-17 12:43:35 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +08:00
ouyangxuhua 805784a858 组织内的链接加上Setting.protocol 2016-03-17 10:52:19 +08:00
huang 0a881f14e8 导入添加自动搜索 2016-03-16 17:06:11 +08:00
alan 4d82f0c959 在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》 2016-03-16 16:03:53 +08:00
linchun 34c9f54510 完成了管理员界面学校列表 2016-03-16 15:24:41 +08:00
alan 3b63071dee 修复《issue的展开和收起在属性表格的上面》 2016-03-16 15:12:50 +08:00
ouyangxuhua ea6de1407e Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
 2016-03-16 12:36:15 +08:00
alan 5343759f2f Merge branch 'FX-alan-search-404' into alan_develop 2016-03-16 11:16:41 +08:00
ouyangxuhua 9bac560906 超级管理员有编辑和删除博客的权限 2016-03-16 10:00:21 +08:00
cxt 879f9a0ad5 对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天 2016-03-15 17:21:12 +08:00
cxt e97690e2f2 “导入作业”改为“从题库选用” 2016-03-15 16:47:57 +08:00
cxt 90d664bbca 学生提交作品时描述框可以直接插入图片，作品列表也直接显示图片。 2016-03-15 16:36:10 +08:00
huang a10475fa65 公共资源删除、新建代码优化 2016-03-15 16:28:35 +08:00
linchun 7d5a5f1de2 完成项目资源列表中的排序（资源大小，上传时间，下载次数） 2016-03-15 16:14:53 +08:00
linchun 3fcf192430 完成了课程资源列表的排序（上传时间，资源大小，下载次数） 2016-03-15 15:59:49 +08:00
huang 22ce591c36 资源库添加搜索过滤 2016-03-15 15:42:20 +08:00
linchun d3ed89d87e sort 2016-03-15 15:23:43 +08:00
ouyangxuhua 70f4bb1c14 Merge branch 'develop' into ouyangxuhua 2016-03-15 14:22:38 +08:00
ouyangxuhua fe0d31d9c4 1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示 2016-03-15 14:17:06 +08:00
ouyangxuhua b716e593b5 组织下的链接问题 2016-03-15 13:49:44 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00
ouyangxuhua 2a46d60433 组织下的链接的host_name均使用Setting.host_name 2016-03-15 11:19:03 +08:00
huang 5681d329d6 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/news_controller.rb
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-15 11:12:24 +08:00
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/public.css
 2016-03-15 11:09:11 +08:00
cxt 5476016b79 调整题库高度与资源库一致 2016-03-15 09:47:58 +08:00
linchun 4da8a3828f 用户最新列表单位完成，修改了点击最后两页报错的问题 2016-03-15 09:47:27 +08:00
linchun df4ad9f597 完成管理员界面最近登录列表单位信息 2016-03-15 09:31:35 +08:00
huang 2b21213b7f 公共资源库，排序 2016-03-15 09:26:26 +08:00
huang 3bfaddc80f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-14 18:31:09 +08:00
ouyangxuhua 15dfaf67b2 测试版环境，登陆注册改成https://test.forge. 2016-03-14 18:29:50 +08:00
huang a7990a4c3c Merge branch 'yuanke' into develop 2016-03-14 18:25:26 +08:00
ouyangxuhua c0edd91c3d 登陆注册链接改为www. 2016-03-14 18:20:19 +08:00
yuanke 27a2aad3d6 修改KE贴吧回复添加视频图片不能显示的BUG 2016-03-14 18:19:23 +08:00
huang a1cae3f592 admin教师单位获取 2016-03-14 17:50:07 +08:00
ouyangxuhua 46b50ab065 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-14 17:46:47 +08:00
linchun a1bef60bb5 Merge branch 'linchun' of https://git.trustie.net/jacknudt/trustieforge into linchun 2016-03-14 17:41:14 +08:00
linchun 96f65f338c 用户列表添加单位 2016-03-14 17:40:49 +08:00
huang 3d06d5a503 Merge branch 'yuanke' into develop 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-14 17:31:53 +08:00
yuanke 465a236049 修改KE贴吧等地图片显示不出来的问题 2016-03-14 17:16:11 +08:00
cxt d2a8acf87b 个人主页--首页显示不全，右下角也应该显示展开按钮 2016-03-14 17:11:23 +08:00
cxt c770fd157c 题库：题目描述变窄，缺省文字：【尹刚提供】 2016-03-14 16:33:16 +08:00
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示 2016-03-14 15:39:45 +08:00
cxt 3d1f7cc0a8 提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值 2016-03-14 15:02:37 +08:00
cxt 1aa5450e4a 题库支持按发布者、来源、类型的排序 2016-03-14 14:39:58 +08:00
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名 2016-03-14 11:00:55 +08:00
alan 0998ca3974 Merge branch 'develop' into FX-alan-search-404 2016-03-14 10:25:39 +08:00
alan ce6d63ccaf 重构user.find 2016-03-14 10:24:50 +08:00
cxt 7d2bb572b2 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	public/stylesheets/new_user.css
 2016-03-11 19:43:36 +08:00
cxt 98f7ad19f6 Merge branch 'linchun' into develop 2016-03-11 19:34:33 +08:00
cxt 7f302305ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 19:31:22 +08:00
cxt 46d22980c9 Merge branch 'cxt_course' into develop 2016-03-11 19:31:06 +08:00
guange 45c51ef8db merge 2016-03-11 18:51:41 +08:00
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
cxt 12c60547ad 题库支持按引用数和发布时间排序 2016-03-11 18:06:43 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-11 17:25:30 +08:00
cxt 1d93c6c56b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-11 16:18:10 +08:00
cxt e02bde6f65 作品列表支持按学生姓名和学号排序 2016-03-11 16:17:51 +08:00
huang 97a7694778 访问统计数--views 2016-03-11 15:58:16 +08:00
Tim 45f1cfa477 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 15:51:59 +08:00
Tim 53c281103c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-11 15:49:54 +08:00
Tim de3a4718ab 个人，课程，项目，组织访问量添加 2016-03-11 15:49:24 +08:00
luoquan 901409ebb4 Merge branch 'yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2016-03-11 14:40:07 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
alan 1f5c90185a 修复《顶部搜索“分析”报404错误》 2016-03-11 13:14:32 +08:00
cxt dcd13b9d6b 点击个人主页的课程和项目在新的tab页中打开 2016-03-11 11:34:16 +08:00
cxt 94c1e38066 分组作业动态中的“创建项目”更换颜色 2016-03-11 11:23:16 +08:00
cxt 2812fcd2fb 删除无用代码 2016-03-11 10:45:29 +08:00
luoquan a418c0937d Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
	public/assets/kindeditor/plugins/code/previewcode.css
 2016-03-11 10:21:59 +08:00
luoquan 7d70e63f8d 代码重置 2016-03-11 10:18:10 +08:00
ouyangxuhua bc5ce1fd22 组织下的课程帖子链接参数正确传输 2016-03-11 09:31:36 +08:00
cxt a7b9d8424a 只有全部列表中的学生可编辑分班 2016-03-10 17:41:53 +08:00
ouyangxuhua eb3c0d9334 组织设置为公开后，允许游客下载选项变为可选；老师的提交作业消息不显示 2016-03-10 17:33:22 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
huang 08cb7b642c 附件上传样式 2016-03-10 16:43:25 +08:00
huang 1644442d2e 修改附件描述样式 2016-03-10 16:41:56 +08:00
huang 627580a9ac 标签问题（未完） 2016-03-10 16:25:39 +08:00
cxt c255325300 添加分班 2016-03-10 15:47:03 +08:00
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。 2016-03-10 15:12:16 +08:00
huang 281d31980d Merge branch 'develop' into hjq_new_course 2016-03-10 15:02:34 +08:00
cxt 0fb808e2fd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-10 14:53:23 +08:00
huang c947121e2b 消息不显示问题（未完） 2016-03-10 14:52:49 +08:00
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-03-10 14:52:23 +08:00
cxt cd1409f950 还原学生分班 2016-03-10 14:51:31 +08:00
ouyangxuhua 6cf518e2e4 1.组织的非成员用户，隐藏上传资源/导入资源；2.申请的子域名，一律改成小写 2016-03-10 14:38:33 +08:00
ouyangxuhua 680bdc3d34 组织下的链接改成https://www. 2016-03-10 14:12:50 +08:00
ouyangxuhua f917e96a12 组织栏目中的链接的url更新 2016-03-10 12:47:10 +08:00
cxt 8a4175dc02 点击学生作品列表中的编程作品，代码会跳到上一个作品的详情 2016-03-10 11:40:56 +08:00
cxt f8f36f9f29 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-10 11:15:43 +08:00
cxt cc441826ee 测试代码即提交代码 系统得分为当次的测试得分 2016-03-10 11:15:37 +08:00
Tim 61ce439e74 添加老师对学生的分班操作 2016-03-10 10:02:24 +08:00
ouyangxuhua 16b0bf9c80 更新组织栏目优先级，如果输入不合法，则不作改变 2016-03-10 09:06:07 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
huang 3d2ba83c36 @消息问题修复 2016-03-09 17:22:16 +08:00