Commit Graph

2022 Commits

Author SHA1 Message Date
cxt 5ea6913278 配置修改 2016-06-06 11:19:10 +08:00
cxt 6a25adb37e 最新动态改成我的动态,提示修改 2016-06-06 11:13:35 +08:00
cxt ee12b3540b 消息弹窗的还原、微信配置修改 2016-06-06 11:05:25 +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 4367cf2233 Merge branch 'yuanke' into develop 2016-06-03 15:01:37 +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
yuanke 0d38fa53a2 1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别? 和cn等
5.KE缩进修改等
2016-06-02 13:55:40 +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 27a9170318 组织添加设为精品项目,热门课程 2016-06-01 17:38:41 +08:00
guange 814fde878e 从后台获取openid即可 2016-05-31 20:19:45 +08:00
guange 7b5a7a93f5 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:40:54 +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 c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31:08 +08:00
cxt 4d5ee5a722 微信的欢迎图片及欢迎词的修改,测试版的配置 2016-05-26 15:27:31 +08:00
cxt e62a4cc646 绑定新的微信公众号 2016-05-23 16:29:38 +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 5cefedd20a Merge branch 'hjq_beidou' into develop
Conflicts:
	db/schema.rb
2016-05-20 15:35:08 +08:00
cxt c165d0b37e 作业二级回复的模板通知 2016-05-20 14:52:47 +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 99cbf0b54e 资源引用消息通知 2016-05-19 11:32:58 +08:00
huang 658ea0cf1e 资源引用 结构搭建 数据创建 2016-05-18 14:49:13 +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
guange 5dff3556fb 配置出错 2016-05-14 16:46:27 +08:00
guange b681e3a597 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-14 16:02:11 +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 2d701b7d03 Merge branch 'cxt_course' into develop 2016-05-13 11:34:39 +08:00
huang 343e9d9434 修改日志分割关闭 2016-05-13 11:32:50 +08:00
huang 37ee03374e 完成设置名师功能 2016-05-13 09:53:22 +08:00
huang ad2f12c9d0 名师列表搜索功能 2016-05-12 15:02:23 +08:00
cxt 7761bd5313 微信模板消息的“有新缺陷了”改成“有新的问题动态了” 2016-05-12 10:49:12 +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
huang 52c8593b09 组织教师列表sql优化 2016-05-11 16:20:55 +08:00
guange 67d552b2e3 [deprecated] I18n.enforce_available_locales will default to true in the future. If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false to avoid this message. 2016-05-11 14:05:51 +08:00
huang 43f06c0826 版本库ZIP下载 2016-05-11 13:44:15 +08:00
cxt 9bc8ccbb9e 教辅可只评语不评分 2016-05-11 09:18:55 +08:00
txz ec3a077b22 微信意见反馈按钮文字错误 2016-05-10 14:48:40 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
cxt f6d7df7393 管理员界面添加“分享作业申请”列表 2016-05-09 18:40:21 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-05-06 22:02:22 +08:00
cxt c6c3625029 题目申请说明内容较长时,会导致被申请者收不到消息 2016-05-06 18:47:38 +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 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +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 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 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
huang 79cd36f297 二级域名排序 2016-05-05 14:39:27 +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
cxt 121aca7505 缺陷模板消息 2016-05-05 09:09:45 +08:00
cxt 06586f9e4b 导出作业成绩中添加作品描述的导出 2016-05-04 16:43:37 +08:00
guange 250ed8c981 添加key 2016-05-04 16:33:56 +08:00
cxt 6c184b9248 题库的分享请求 2016-05-04 16:17:37 +08:00
guange 0635c1e98b 添加单点登录controller 2016-05-04 14:05:46 +08:00
huang 48002eb247 二级目录讨论区添加帖子回复功能 2016-05-03 19:03:28 +08:00
cxt 341927506a Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-04-29 15:58:05 +08:00
cxt 53bf0dcd7a 题库加入所有私有作业、并可通过提交申请来导入私有作业 2016-04-29 15:46:26 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +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 a893f88ede 微信模版本地丢了 2016-04-28 10:52:55 +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 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
yuanke 23f48b7189 项目列表、项目讨论区列表 2016-04-27 09:54:49 +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 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
guange 2e01a1f17b Merge remote-tracking branch 'origin/develop' into guange_dev 2016-04-24 10:40:36 +08:00
huang 98da0ce6ca 修改版本库提示 2016-04-21 16:33:20 +08:00
cxt aed3818273 点击模板消息跳到微信详情页面 2016-04-20 14:44:10 +08:00
yuanke 5aba3fb11b 修改查重有时候失败的问题 2016-04-15 18:48:39 +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
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke
Conflicts:
	db/schema.rb
2016-04-15 14:13:44 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +08:00
cxt 143f3f8f9a 管理员界面增加精品课程的设置 2016-04-15 11:26:56 +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
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
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
cxt f5122d7ef0 微信url切换到正式版 2016-04-13 14:52:18 +08:00
cxt 59f49f586b 上线测试版 2016-04-12 16:32:53 +08:00
huang 04849659de 版本库统计 2016-04-12 16:00:54 +08:00
cxt 2898805aa7 回复的模板消息 2016-04-12 15:12:40 +08:00
cxt 275895f805 模板消息的重构 2016-04-12 11:00:47 +08:00
guange 73ad787e23 修改到正式版 2016-04-09 22:48:10 +08:00
guange cadb5f3f15 更换服务器至test.course.trustie.net 2016-04-09 18:15:54 +08:00
huang 5b744093af 回复application编码问题代码 2016-04-08 16:41:33 +08:00
huang 9fa50e0452 编码问题 2016-04-08 16:19:38 +08:00
huang b5ced6eda9 编码问题 2016-04-08 14:21:54 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
guange 619b07b5c2 服务器上调试openid成功 2016-04-05 16:32:42 +08:00
guange bb5a527f9e 配置新菜单 2016-04-05 15:57:19 +08:00
guange ae08031440 开放跨域 2016-04-05 15:54:30 +08:00
guange 1926f0ba53 修改openid路由 2016-04-02 07:49:36 +08:00
huang 86aecd21b9 上传图片 2016-04-01 23:56:05 +08:00
huang 10371e8bdd 添加附件图片功能 2016-04-01 00:27:34 +08:00
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
cxt 893fad2b48 组织配置里的栏目 “排列做成可编辑的” 2016-03-31 15:21:40 +08:00
Yiang Gan 1c5b22abf4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-03-30 18:02:38 +08:00
Yiang Gan f23c0e7602 最新动态修改 2016-03-30 18:02:33 +08:00
guange b30fad723d 菜单更新 2016-03-30 17:56:45 +08:00
Tim 77e11fe0fe 微信最新动态修改 2016-03-30 17:47:44 +08:00
Yiang Gan 6dc374cf9a 最新动态 2016-03-30 17:41:18 +08:00
guange 91d49e3028 添加附加环境模板 2016-03-30 14:52:11 +08:00
guange 46d5767a6a 去掉elasticsearch多台部署,只要一台即可 2016-03-30 14:45:33 +08:00
cxt c8142b3ee5 作业api 2016-03-30 14:02:35 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
Tim 406bb7930c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
	public/javascripts/wechat/wechat-dev.js
2016-03-28 14:47:11 +08:00
guange 60931dde6a 添加获取openid的功能 2016-03-26 15:52:14 +08:00
Tim 4f7d698076 wechat init 2016-03-26 14:45:57 +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
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +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 093c777b23 Merge branch 'develop' into ouyangxuhua
Conflicts:
	app/views/users/_user_message_course.html.erb
2016-03-17 16:18:30 +08:00
linchun 52af5e4303 修复了管理员界面多个列表的题目问题 2016-03-17 15:05:14 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +08:00
linchun d3ed89d87e sort 2016-03-15 15:23:43 +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
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun
Conflicts:
	db/schema.rb
2016-03-11 17:25:30 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
ouyangxuhua a51ca428be 组织中,增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
linchun 3e70db4e82 Merge branch 'develop' into linchun
Conflicts:
	db/schema.rb
2016-03-08 11:29:58 +08:00
linchun 3c66a29767 完善课程资源列表,完成项目资源列表 2016-03-08 11:01:08 +08:00
linchun b7f4b584f2 完成管理员界面课程资源列表 2016-03-07 16:46:02 +08:00
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 18:37:46 +08:00
cxt 4f3055c990 讨论区改为问答区,且放开课程的“问答区”,就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +08:00
huang bbbf13084e 修改搜索功能,页面跳转 2016-03-04 16:05:58 +08:00
linchun bb8a6af13e admin界面添加精品课程页面,目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +08:00
cxt 6416b01037 课程里的“课程作业”改为“作业” 2016-03-04 14:28:06 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
2016-03-04 09:33:38 +08:00
guange 79004e1328 修改绑定流程 2016-03-03 23:27:05 +08:00
huang 5fd36c0e78 课程、项目、组织资源导入 2016-03-03 17:15:47 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
guange c33b35383d 修改菜单 2016-03-01 17:13:06 +08:00
guange d5e8945619 修改菜单 2016-03-01 17:06:40 +08:00
guange 445bae6de9 patch mysql5.7的create table 2016-03-01 16:13:13 +08:00
guange a7220a535e 修改wechat配置 2016-03-01 14:33:36 +08:00
guange 8f5645e5c1 修改wechat配置 2016-03-01 14:32:10 +08:00
guange 15d5fe127e merge 2016-02-28 21:30:40 +08:00
guange a83cb2a1fa merge 2016-02-28 21:28:54 +08:00
cxt 5b4cec2c05 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	db/schema.rb
2016-02-26 16:26:51 +08:00
cxt e3e2c37f12 超级管理员的最近登录用户列表添加老师列表 2016-02-26 16:26:20 +08:00
newuser d747ec854d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	db/schema.rb
2016-02-26 14:55:28 +08:00
cxt c93b4d109a 作业动态添加子菜单:公开作品/取消公开 2016-02-25 16:18:24 +08:00
huang 40fb140b6d 版本库提交记录diff信息 2016-02-23 15:09:15 +08:00
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop
Conflicts:
	db/schema.rb
2016-02-23 13:36:05 +08:00
ouyangxuhua d2267106c2 修复team.trustie.net的侧栏点击后没有显示栏目内容的问题 2016-02-23 13:07:42 +08:00
cxt a2e60944be 已发布资源的延期发布 2016-02-23 11:04:19 +08:00
huang a7470e059d 历史版本提供附件下载功能 2016-02-20 16:19:35 +08:00
guange eed6250145 secdomain问题 2016-02-02 17:36:11 +08:00
cxt 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 15:51:49 +08:00
guange 28035dfc47 子域名处理 2016-02-02 12:40:00 +08:00
guange bb0ff4a14c elasticsearch在开发环境下的补丁,默认不开启 2016-01-29 20:31:25 +08:00
ouyangxuhua 7b56dc7f8e 管理员界面,解决编辑组织报错的问题 2016-01-29 18:43:14 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度;2.https://www.trustie.net/manual/feedback链接到帮助中心;3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
huang 83ff449946 项目、课程资源 浏览 改成 上传文件 2016-01-22 21:51:31 +08:00
huang e063470a57 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:30:07 +08:00
huang faf1fcaf22 issue回复局部刷新
附件浏览问题
昵称改成登录名
2016-01-22 17:27:21 +08:00
ouyangxuhua d7b17b455d Merge branch 'szzh' into develop 2016-01-22 10:27:32 +08:00
ouyangxuhua 5e72734bee 增加3个url定制路由 2016-01-22 09:25:58 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
2016-01-21 16:10:29 +08:00
huang ff475fb00b Merge branch 'szzh' into develop 2016-01-21 15:35:38 +08:00
huang 524e152b24 Issue截止时间到了邮件提醒 2016-01-21 11:19:08 +08:00
huang 7de48f143e issue状态修改 2016-01-21 10:38:07 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
2016-01-20 17:05:28 +08:00
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
guange 96d0b2e717 绑定用户事件 2016-01-19 14:07:59 +08:00
guange 9f667588c4 添加菜单 2016-01-19 11:50:59 +08:00
ouyangxuhua 909e0e846b 路由配置问题 2016-01-18 11:06:08 +08:00
ouyangxuhua f796aa1489 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-18 10:54:17 +08:00
ouyangxuhua 03df9abfeb 增加域名唯一性判断 2016-01-18 10:43:22 +08:00
huang f52b0c1cc6 标记精品课程,精品课程推荐 2016-01-18 10:16:29 +08:00
ouyangxuhua c6aaaff8d1 对有子域名的组织,栏目的链接应不含有组织及其id 2016-01-18 10:07:12 +08:00
guange 080cc71912 wechat 路由修改 2016-01-16 11:59:09 +08:00
guange 5f6a3cac04 wechat init 2016-01-16 11:54:59 +08:00
guange 744b246930 配置修改 2016-01-15 23:15:06 +08:00