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

1695 Commits

Author SHA1 Message Date
cxt 322868f063 班级的课程id变为空时打印日志 2016-08-11 15:58:49 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
yuanke b8155cc1c2 班级通知修改 2016-08-11 11:05:19 +08:00
cxt 7edb30754b student_works添加字段commit_time，记录学生作品实际的提交时间 2016-08-10 16:50:27 +08:00
huang 5ad063b830 记录接受PR用户信息，并且唯一性判断 2016-08-10 16:27:41 +08:00
Tim e85f9373c8 点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改 2016-08-10 15:37:08 +08:00
huang 1588f5cfca 开发环境下不启动elastic 2016-08-09 16:31:14 +08:00
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。 2016-08-09 09:23:06 +08:00
cxt 5b8883960b Merge branch 'cxt_course' into develop 2016-08-05 18:52:09 +08:00
cxt f5a2d6acdb 班级作品：学生提交作品弹出作品校验框，点击重试后，作品列表中默认生成的作品记录就没有了 2016-08-05 17:33:31 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
yuanke 55afb84aef 模版消息标题加上句号，审核模版消息再次点击显示修改 2016-08-04 15:32:25 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
yuanke a4281b4934 Merge branch 'develop' into weixin_guange 2016-08-02 15:51:29 +08:00
daiao fc1fc0bd7d 单位审核bug修复 2016-08-01 15:44:18 +08:00
yuanke fa43924330 微信项目二维码修改 2016-08-01 13:54:10 +08:00
huang c7f2ab0415 修复创建英文名字的项目标题为“为项目讨论区的问题” 2016-08-01 13:51:11 +08:00
yuanke f0cf7adcdf 加入项目邀请码 2016-08-01 11:14:03 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
cxt 98a2ebd682 Merge branch 'cxt_course' into develop 2016-07-29 21:54:33 +08:00
daiao d6178ec7dd 管理员界面单位申请 2016-07-29 21:45:52 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 21:39:00 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 20:52:18 +08:00
huang 643b06484b 消息表添加字段 2016-07-29 20:50:55 +08:00
huang 0bf9b5c6e6 消息红点记录 个人主页添加加入项目入口 2016-07-29 20:31:24 +08:00
cxt d0f83aab64 去掉姓和名之间的空格 2016-07-29 20:24:04 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
cxt 848c56d54e 班级主页身份切换、成员管理页面的多重身份 2016-07-29 14:34:42 +08:00
daiao 6bd9f47222 Merge branch 'dev_shcool' into develop 
Conflicts:
	db/schema.rb
 2016-07-28 20:02:57 +08:00
daiao 50ec127c5b 单位名称列表功能 2016-07-28 20:01:22 +08:00
huang a8fa4a55e3 项目申请消息发送 2016-07-28 16:22:33 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
huang 4a9eec0cce 完成项目邀请及公共弹框的封装 2016-07-28 14:42:36 +08:00
huang c6bc5c9cb8 Merge branch 'dev_shcool' into rep_quality 
Conflicts:
	db/schema.rb
 2016-07-28 10:19:37 +08:00
huang 2f79e521ca 单位批准发送消息；申请单位给系统每位管理员发送消息 2016-07-27 11:20:12 +08:00
daiao 9e788c9b6f 单位批准及消息框架搭建 2016-07-27 10:46:48 +08:00
huang d51295127d issue删除回复删除附件的问题 同事关联删除 2016-07-26 16:13:20 +08:00
huang 2c8f94c899 去掉ID转换成用户login 2016-07-26 09:02:47 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
huang 774650c819 项目邀请码直接数据库读取，权限修改 2016-07-25 15:22:34 +08:00
yuanke b9b9a867f4 项目 2016-07-25 15:20:01 +08:00
huang 84d1adbf25 生成邀请码 2016-07-25 14:36:52 +08:00
huang be88914e39 去掉id转换用户名 2016-07-25 13:59:10 +08:00
huang 35172dab59 管理员界面单位申请框架 2016-07-25 10:59:08 +08:00
huang 43c6301223 id转换成用户名 2016-07-25 09:47:14 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
huang 537cc20e06 已repository_id为范围，version唯一性控制 2016-07-22 10:34:59 +08:00
huang 4e4ff4958f 修改changeset触发事件 2016-07-21 17:19:45 +08:00
huang 466a25c121 提交后更新项目动态表update时间 2016-07-21 17:02:50 +08:00
huang 246923a335 版本库新增提交次数表，增加至项目动态 2016-07-21 16:09:07 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
cxt f3c95906d8 项目缺陷的二级回复 2016-07-21 10:30:48 +08:00
huang f979e80f24 Gitlab数据清理及迁移，主要是历史数据 2016-07-20 17:05:55 +08:00
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合 2016-07-20 17:00:18 +08:00
huang 14e6db457b rake 2016-07-20 09:38:23 +08:00
huang 0c0dfbd093 changeset关联 2016-07-19 17:38:11 +08:00
huang cf04bb5ec6 迁移上线 2016-07-19 15:59:52 +08:00
huang facf3ae8f8 提交次数写入动态中 2016-07-18 16:45:49 +08:00
cxt e260c0b7cc Merge branch 'cxt_course' into develop 2016-07-15 15:49:27 +08:00
cxt 05fe987a8b 新手注册三条留言 2016-07-15 15:43:35 +08:00
yuanke 15ccf5cfbe Merge branch 'yuanke' into develop 2016-07-13 15:56:44 +08:00
yuanke b4ac13c157 修改编程作业没main函数系统评分100的BUG 2016-07-13 09:36:43 +08:00
guange 8279d9385c 区分是课程邀请，还是意见反馈 2016-07-09 10:13:05 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
guange 5c0468f8fd 二维码过期改为一个月有效期 2016-07-08 17:18:09 +08:00
guange 068c8967e1 新增班级时名称为1个字符时报错 2016-07-08 17:04:17 +08:00
cxt cc4b24cdb9 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-08 13:18:46 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
huang e588321ada Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 11:31:02 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
huang b90c90bc60 add model error_list 2016-07-07 14:22:48 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
yuanke da19bbd3a0 优化了下修改资料界面的代码 2016-07-05 09:02:34 +08:00
guange 48fb02a2d6 管理课程 2016-07-04 17:04:06 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +08:00
cxt 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
 2016-07-01 11:31:51 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 11:30:24 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
yuanke dfd381fc99 Merge branch 'yuanke_org' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 09:31:19 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
huang 2105d2bbdb Merge branch 'develop' into rep_quality 
Conflicts:
	app/views/repositories/show.html.erb
	db/migrate/20160624103411_add_name_to_quality_analyses.rb
	db/schema.rb
 2016-06-29 14:18:17 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
guange 222855ea79 越过course表的validate,以防save invitecode 失败 2016-06-28 19:19:59 +08:00
guange 3c425edc3c 修复邀请码会变的问题 2016-06-28 17:46:27 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
Your Name dd6b19a8b5 some status of sonar 2016-06-28 14:48:09 +08:00
guange 1e6454efc0 加入我的资源 2016-06-27 17:24:06 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00
guange 05f09c4595 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 11:09:31 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
huang 012eae9b93 gems 2016-06-24 19:54:01 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
 2016-06-24 19:17:26 +08:00
Your Name 537f152562 0 2016-06-24 18:47:54 +08:00
Your Name 244c178758 666 2016-06-24 17:39:10 +08:00
Your Name eae70f9c71 some config 2016-06-24 16:18:17 +08:00
cxt 260759e4db Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:36:03 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
guange 16a9f017b6 error 2016-06-24 15:28:44 +08:00
guange 485d0e3743 ticket处理 2016-06-24 14:59:50 +08:00
Your Name 06fe02890f index for sonar result 2016-06-24 14:59:17 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
Your Name ce6e6116b5 get data from sonar API 2016-06-22 17:09:54 +08:00
Your Name 9e7cde6056 stable version for sonar 2016-06-22 11:25:59 +08:00
cxt c4cea93a44 消息列表的“展开更多”指针手势修改 2016-06-21 13:58:17 +08:00
cxt 4f80e259e8 消息弹窗的延时显示 2016-06-21 11:16:45 +08:00
cxt 860068f7ed 新注册用户的留言 2016-06-21 11:03:50 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
guange 8fd4d518b2 添加邀请码 2016-06-15 13:44:28 +08:00
cxt 6100abe0da 课程大纲 2016-06-14 10:38:11 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +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 3af115ee54 组织新版样式，及方法优化 2016-06-03 12:42:02 +08:00
cxt 2431ef6986 模板消息引起的问题 2016-06-02 13:56:11 +08:00
cxt b72ad364db 微信模板消息：用户绑定成功、作业消息、个人留言、班级通知 2016-06-02 10:39:11 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +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
huang 649b3918c4 通知、消息创建的时候异步发送消息 2016-05-27 15:25:27 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +08:00
huang a4f2ebb73b Merge branch 'develop' into hjq_beidou 2016-05-24 16:12:27 +08:00
huang ed7c6cbcfe 组织新建帖子增减status状态 2016-05-24 09:40:16 +08:00
huang b1c70db28a 上线暂时还原代码 2016-05-23 16:34:31 +08:00
huang a3abf09841 delayjob封装 2016-05-23 16:04:06 +08:00
huang d70f42b413 发布课程通知消息异步发送（测试版） 2016-05-23 15:03:22 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
cxt 40f45ea697 发布通知的微信模板消息内容有重复 2016-05-20 19:13:19 +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
cxt 82568b5951 缺陷状态更改或内容更改时不发模板消息 2016-05-20 11:39:30 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
huang 984f706722 可发送权限控制 2016-05-19 15:59:59 +08:00
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
huang 99cbf0b54e 资源引用消息通知 2016-05-19 11:32:58 +08:00
huang f3f75a57bd 申请资源消息资源发布这收到消息 2016-05-18 17:37:48 +08:00
cxt 670b2c48c7 缺陷的模板消息要细化缺陷类型 2016-05-18 16:08:40 +08:00
cxt 3b3cafbc81 微信模板消息的还原 2016-05-18 14:49:49 +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
guange 1767e1200d school不用Base64解码，两边都是utf8 2016-05-17 15:56:06 +08:00