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

2125 Commits

Author SHA1 Message Date
huang d647f7153a 新建里程碑术语 2016-09-27 20:01:23 +08:00
huang 70d58ea28e 版本库导出代码统计功能 2016-09-27 15:10:52 +08:00
daiao 1c33e6481f 问题issue列表及其动态的目标版本改为里程碑， 2016-09-27 10:48:39 +08:00
huang b1496e1874 项目邀请码去掉冒号 2016-09-27 09:15:19 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-09-26 22:21:45 +08:00
huang 3ace67f706 版本库库代码统计导出excel功能 2016-09-26 16:17:21 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
Tim c718cb2144 新建issue时，增加评审，来源，实际工时选项 2016-09-21 15:27:32 +08:00
huang 2ae7dd0087 项目issue导出excel功能 2016-09-21 10:18:40 +08:00
huang 4d97dd3889 去掉项目module中dts测试工具 2016-09-19 17:22:30 +08:00
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
daiao ed448f0087 Merge branch 'develop' into dev_shcool 
Conflicts:
	db/schema.rb
 2016-09-09 09:31:17 +08:00
yuanke 5b8ecf6657 微信头像刷新修改 2016-09-08 18:50:09 +08:00
yuanke 18fbf305c1 微信上传头像大小限制为1M 2016-09-07 16:16:53 +08:00
yuanke c9c63eeb85 微信修改资料后台代码 2016-09-06 14:41:22 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool 
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
 2016-09-05 13:47:39 +08:00
yuanke 10017d2c69 微信增加解除绑定功能 2016-09-05 11:02:34 +08:00
daiao 27ad94eac2 组织配置界面，成员列表分页 2016-09-02 13:25:01 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +08:00
yuanke 8a6ad89973 issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等 2016-08-30 14:08:10 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 16:23:07 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
cxt 60beb2abab 首页左侧班级和项目列表的收藏功能 2016-08-25 11:30:47 +08:00
yuanke 4932b9fad8 班级留言不显示 2016-08-25 10:55:22 +08:00
cxt 56b74b755b 取消收藏 2016-08-24 17:30:30 +08:00
yuanke e0957113d8 项目issue模版消息提醒 2016-08-24 11:28:50 +08:00
yuanke bd3911c072 . 2016-08-24 11:22:34 +08:00
yuanke f8dfe85156 项目issue增加模版消息 2016-08-24 11:03:38 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
Tim f67336fbe5 课程信息单词折行 2016-08-13 16:27:29 +08:00
cxt 2759d562ac 首页项目列表 2016-08-13 15:35:03 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
yuanke a1dfdae58d 修改班级通知模版消息的跳转 2016-08-11 10:54:14 +08:00
yuanke 7c5240b386 微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复 2016-08-11 09:58:45 +08:00
yuanke 57737ff15d 微信细节优化 2016-08-10 16:08:30 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
huang 6319a1bac6 PR添加评论定义 2016-08-09 10:53:44 +08:00
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。 2016-08-09 09:23:06 +08:00
huang 518d6bacbe 添加关闭pull request功能 2016-08-08 15:23:55 +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
huang 515649beb6 接受PR局部刷新及跳转 2016-08-04 15:07:15 +08:00
yuanke ee019cd364 修改测试版微信加入项目审核通知 2016-08-04 14:47:39 +08:00
cxt cecf917764 从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用” 2016-08-03 15:00:16 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00
huang be081f5c66 添加Api（提交内容，改动）及相关方法路由 2016-08-03 13:57:59 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
guange a1d3bbbfa9 解决ruby2.3执行sql出错的bug 2016-08-01 19:17:16 +08:00
guange fc38ef6a3f 增加了一个查看服务器内网ip的middleware，利于以后分析问题，headers为X-Response-Ip 2016-08-01 19:16:51 +08:00
huang 3660f8cbce gitlab相关方法的封装 2016-08-01 17:38:37 +08:00
huang b718803bd9 修改控制器名称及控制器查询访问权限 2016-08-01 16:54:31 +08:00
huang 96b04f39b1 pull requests框架搭建（路由控制器、views） 2016-08-01 15:33:47 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-07-29 22:03:45 +08:00
daiao 39478eb4e4 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 
Conflicts:
	app/views/admin/applied_schools.html.erb
	app/views/admin/has_applied_schools.html.erb
 2016-07-29 21:50:19 +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
yuanke 1f47eb5ea8 单位申请列表修改 2016-07-29 21:19:09 +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
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +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
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
daiao 5b30036639 单位名称列表功能 2016-07-29 16:11:26 +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
yuanke 14d0a91b0b 修改下微信菜单 2016-07-28 19:05:52 +08:00
yuanke 1489ab015a 微信模版消息标题加上句号 2016-07-28 17:55:37 +08:00
yuanke 93844e757c 微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改 2016-07-28 17:26:57 +08:00
yuanke 20d9e613b6 正式、测试版配置 2016-07-28 15:39:27 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
yuanke cf65e6748b 微信项目相关功能开发，班级角色功能等 2016-07-28 14:49:45 +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 7413298aad 项目邀请码申请及弹框 2016-07-28 10:18:35 +08:00
huang 29edd60ce6 Merge branch 'daiao_dev' into dev_shcool 2016-07-27 10:54:38 +08:00
daiao 9e788c9b6f 单位批准及消息框架搭建 2016-07-27 10:46:48 +08:00
cxt 1f8fa1c70a 班级动态去掉“>” 2016-07-26 17:16:42 +08:00
cxt feb45a07bf 课程列表分为我创建的课程和我加入的课程 2016-07-26 16:45:36 +08:00
huang 463c09f02c 项目邀请弹框 2016-07-26 08:55:07 +08:00
daiao 5883b451ca 在管理员界面添加单位名称列表 2016-07-25 18:31:28 +08:00
guange 652e56dec4 忽略wechat.yml 2016-07-25 18:16:47 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
yuanke b9b9a867f4 项目 2016-07-25 15:20:01 +08:00
huang 84d1adbf25 生成邀请码 2016-07-25 14:36:52 +08:00
cxt 0564ddb6ea 课程大纲的回复 2016-07-25 13:56:26 +08:00
huang 35172dab59 管理员界面单位申请框架 2016-07-25 10:59:08 +08:00
daiao 9ff728f080 Merge branch 'develop' into daiao_dev 
Conflicts:
	app/views/layouts/_syllabus_base_info.html.erb
 2016-07-25 10:03:50 +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
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
yuanke d975067e13 微信正式版配置 2016-07-21 17:52:52 +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
daiao b7cf7a2468 Merge branch 'develop' into daiao_dev 2016-07-21 09:55:47 +08:00
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合 2016-07-20 17:00:18 +08:00