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

1946 Commits

Author SHA1 Message Date
yuanke b68e227531 没激活的帐号界面 2016-06-22 14:04:47 +08:00
guange 13273d02de 修正了安全问题，不暴露openid 2016-06-22 12:11:34 +08:00
huang e3b6bd19e1 修改质量分支控制器名 2016-06-21 16:50:45 +08:00
huang 36e47fa8b1 代码质量分析，弹框参数传递 2016-06-20 14:21:40 +08:00
huang 88b838a89a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-06-17 11:33:48 +08:00
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
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
huang 6707868915 登录页面新样式 2016-06-16 15:52:54 +08:00
yuanke 2781605670 课程资源描述增加可编辑 2016-06-16 14:04:12 +08:00
cxt c50d307e89 分组作业添加成员后再次打开，数据未保存 2016-06-14 17:36:12 +08:00
huang c6bd5e6d31 饼状图 2016-06-14 09:57:53 +08:00
huang 0c25e3b13d 版本库质量分析 ssh链接 2016-06-13 15:21:29 +08:00
cxt 3a8a61e404 在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序 2016-06-13 11:10:28 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
guange 1cb63055cb api可以通过openid来认证 2016-06-12 17:18:05 +08:00
guange cbc4f2f6fd 菜单更新 2016-06-12 15:05:45 +08:00
guange d3c45fd133 使用jquery1.3比较小 2016-06-12 13:40:14 +08:00
huang 3e3c300273 Merge branch 'cxt_course' into develop 2016-06-08 11:37:58 +08:00
guange b965698fdf merge 2016-06-07 17:45:19 +08:00
guange 33780759a9 修改为html5mode 2016-06-07 16:39:42 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
cxt 91f7e950ee 正式版微信 2016-06-06 12:22:52 +08:00
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