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

13050 Commits

Author SHA1 Message Date
yuanke 6cea0bfb67 . 2016-08-14 10:56:38 +08:00
yuanke 91a64a67c5 微信注册和绑定判断BUG修改 2016-08-14 10:46:17 +08:00
huang 7c28f97208 get quality analisys update time 2016-08-14 10:45:01 +08:00
huang ff592c106e sonar最新触发时间获取 2016-08-14 10:29:52 +08:00
yuanke 56da43221d 修改绑定登录的地址 2016-08-14 10:28:46 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
yuanke 7c222373dc 修改获取用户关注公众号结果 2016-08-14 09:55:02 +08:00
yuanke 4eec1f5d4e 获取未关注修改 2016-08-14 09:50:43 +08:00
yuanke 8ab003d5ee 分享页提交回复未关注公众号会跳到二维码界面 2016-08-14 09:38:47 +08:00
guange ea85c0c608 . 2016-08-13 21:57:22 +08:00
yuanke 61680c6343 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 18:35:21 +08:00
yuanke 85b3df889c 修改微信获取课程大纲的代码 2016-08-13 18:35:11 +08:00
huang 1f4f03d8ed 修改项目列表中的资源链接 2016-08-13 17:31:09 +08:00
cxt a4a0ef139b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 17:04:16 +08:00
cxt 1374444ec1 左侧项目列表的展开 2016-08-13 17:04:09 +08:00
huang 3ce088002a 留言和已关闭流程修改 2016-08-13 16:53:56 +08:00
huang 896e301b33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 16:43:14 +08:00
huang 966722b920 关闭和打开的时候显示root问题 2016-08-13 16:43:00 +08:00
Tim f67336fbe5 课程信息单词折行 2016-08-13 16:27:29 +08:00
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 15:39:06 +08:00
cxt 35260f2f6d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-08-13 15:36:48 +08:00
cxt f4e965c9fb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-13 15:35:10 +08:00
cxt 2759d562ac 首页项目列表 2016-08-13 15:35:03 +08:00
guange c9d32ca69b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 15:25:07 +08:00
guange 70d58ccf85 恢复授权页 2016-08-13 15:24:52 +08:00
huang 9003040d6a 版本库获取动态API修改 2016-08-13 14:42:24 +08:00
yuanke e06f09406c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 14:41:46 +08:00
guange dde0fbb3c1 迁移用户 2016-08-13 14:39:15 +08:00
daiao 4a9967674a 1. 强制编辑基本资料，在删除单位时给出消息通知 
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像，并连接到申请人主页
 2016-08-13 14:29:33 +08:00
huang 93f8ac31f1 项目资源库新分页及ajax刷新 2016-08-13 14:17:50 +08:00
yuanke 3a83b40a64 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 14:04:05 +08:00
yuanke a979bd3d54 微信修改绑定成功的模版消息内容 2016-08-13 14:03:53 +08:00
guange 7b28d2d183 . 2016-08-13 13:57:27 +08:00
guange fc74e714ee . 2016-08-13 13:53:21 +08:00
huang 00f032816c 版本库获取方式修改 2016-08-13 13:48:23 +08:00
guange a761bfe3f8 . 2016-08-13 11:37:37 +08:00
huang 37df983009 项目列表 2016-08-13 11:13:11 +08:00
guange b9cf2527a4 merge 2016-08-13 11:11:24 +08:00
guange 3130296e69 修改微信个人信息获取实现 2016-08-13 11:09:48 +08:00
yuanke 852c7929b6 修改审批通知链接 2016-08-13 10:39:32 +08:00
huang 1b19d227f9 项目列表样式及连接 2016-08-13 10:17:38 +08:00
yuanke 88e23dca80 微信回复自动注册及获取微信昵称修改 2016-08-12 18:19:21 +08:00
yuanke 3051b82ac2 调试 2016-08-12 18:03:58 +08:00
yuanke 697e857806 调试 2016-08-12 18:00:09 +08:00
yuanke e21f7a34bd 调试 2016-08-12 17:46:44 +08:00
yuanke 1a835a25db 调试 2016-08-12 17:38:24 +08:00
yuanke 9b52c1504e 调试 2016-08-12 17:33:45 +08:00
yuanke 2ff83aff81 调试 2016-08-12 17:30:48 +08:00
huang ce9c2d3d06 搜索的时候分页刷新 2016-08-12 17:25:20 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
huang 047eea125d 课程资源分页及局部刷新 2016-08-12 17:05:46 +08:00
yuanke bd12ea169d 调试 2016-08-12 16:58:48 +08:00
yuanke 5b208202a0 调试 2016-08-12 15:38:17 +08:00
yuanke ae437912d8 调试 2016-08-12 15:06:28 +08:00
yuanke ae13435de6 调试 2016-08-12 14:47:54 +08:00
yuanke d60857eaea 调试 2016-08-12 14:41:56 +08:00
yuanke 9fcb43b949 调试 2016-08-12 14:29:19 +08:00
yuanke 1f8ea39765 调试 2016-08-12 14:25:45 +08:00
yuanke 2cfd876f2f 调试 2016-08-12 14:17:50 +08:00
yuanke c307f7769f 调试 2016-08-12 14:13:53 +08:00
huang 7efc8ccac6 新建项目，增加项目名称输入例 2016-08-12 14:11:15 +08:00
yuanke ded55ca022 调试 2016-08-12 14:08:27 +08:00
yuanke fd036d758e 调试 2016-08-12 13:50:44 +08:00
yuanke bce3513424 分享修改 2016-08-12 12:09:20 +08:00
yuanke 24a0bfea77 分享修改 2016-08-12 12:05:14 +08:00
yuanke 822ca15c78 分享修改 2016-08-12 11:34:09 +08:00
yuanke e4194288ce 微信获取用户信息修改 2016-08-12 10:59:12 +08:00
yuanke 5c42cdb39c 分享内容时改为用户信息授权方式 2016-08-12 10:40:36 +08:00
cxt 85cd113cf9 日志修改 2016-08-12 10:20:58 +08:00
yuanke 64eacc2d5e 微信默认注册修改 2016-08-12 10:10:10 +08:00
yuanke 6af15b7121 微信自动绑定用户修改 2016-08-12 09:23:09 +08:00
yuanke 3a000a360a appid 修改 2016-08-11 17:30:06 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00
cxt 03c093fb13 班级作业列表中“赞”和“取消点赞”不可用 2016-08-11 16:34:00 +08:00
cxt 4a25b6357b 我的作业报500 2016-08-11 16:12:48 +08:00
cxt 951390092b 我的作业报500 2016-08-11 15:59:38 +08:00
cxt 322868f063 班级的课程id变为空时打印日志 2016-08-11 15:58:49 +08:00
huang 8eaeea299a 相同分支和项目消息JS提示 2016-08-11 15:19:58 +08:00
yuanke 03551dfba9 项目申请BUG修改 2016-08-11 15:19:47 +08:00
yuanke 96bc405a19 修改项目申请相关BUG 2016-08-11 15:06:32 +08:00
cxt 80b8fc4444 “我的作业”中有挂起的作业时会报500 2016-08-11 14:44:43 +08:00
huang 3df8a46634 PUll request代码简化及reverse评论 2016-08-11 14:16:13 +08:00
yuanke 14e70541db 平台加入项目发微信模版消息 2016-08-11 11:22:42 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
yuanke 72a7a1e9f2 已是项目成员则之前的申请都改为拒绝 2016-08-11 11:13:37 +08:00
huang 41ad5ca444 修改Gitlab接口返回创建时间 2016-08-11 11:11:49 +08:00
yuanke b8155cc1c2 班级通知修改 2016-08-11 11:05:19 +08:00
Tim f4445619d2 题库预览弹框样式调整 2016-08-11 11:02:40 +08:00
yuanke f100d3ebea 项目发起人显示名称修改 2016-08-11 11:00:52 +08:00
yuanke a1dfdae58d 修改班级通知模版消息的跳转 2016-08-11 10:54:14 +08:00
huang a9942fd4b3 change integer to A 2016-08-11 10:48:48 +08:00
Tim 59a76c3b9a 调整组织上传资源弹窗位置 2016-08-11 10:47:22 +08:00
yuanke 0d69fa0cc0 微信私有动态内容加上提示 2016-08-11 10:33:22 +08:00
cxt bae0562b97 适用专业和先修课程的换行显示 2016-08-11 10:32:57 +08:00
cxt 9b8470b813 编辑分组作业后点确定，原来设置的基于项目实施会被取消 2016-08-11 10:23:44 +08:00
huang 88e35c7431 quality list 2016-08-11 10:02:59 +08:00
yuanke 7c5240b386 微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复 2016-08-11 09:58:45 +08:00
huang 1605ef601c conflict 2016-08-11 09:50:20 +08:00
huang 56afad9242 质量分析列表中添加时间和版本 2016-08-11 09:48:29 +08:00
huang b14cdb0b6d some log 2016-08-11 09:47:49 +08:00
cxt d99348c245 测验描述超出边框 2016-08-11 09:46:41 +08:00
Tim 83323e7d18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-10 17:19:42 +08:00
Tim ba7f9ed735 班级、项目侧导航文字缩小 2016-08-10 17:19:32 +08:00
huang b046f24b44 合并信息提交 2016-08-10 16:54:58 +08:00
cxt 7edb30754b student_works添加字段commit_time，记录学生作品实际的提交时间 2016-08-10 16:50:27 +08:00
huang 98a8702ba6 记录谁合并的pull request请求 2016-08-10 16:49:48 +08:00
huang 5ad063b830 记录接受PR用户信息，并且唯一性判断 2016-08-10 16:27:41 +08:00
cxt 71326c901d 学生在启动匿评后再提交作品，此时该学生及该学生的作品是不被匿评的，应该是“查看作品” 2016-08-10 16:09:13 +08:00
Tim f5f88c5204 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-10 16:09:13 +08:00
yuanke 57737ff15d 微信细节优化 2016-08-10 16:08:30 +08:00
Tim e85f9373c8 点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改 2016-08-10 15:37:08 +08:00
huang 8af8147ebb 代码分析列表加上时间 2016-08-10 14:47:50 +08:00
cxt a50ac2d79d 禁用匿评的作业提交时不要显示“提示：作品名称和描述中不要出现真实的姓名信息”的提示 2016-08-10 14:22:05 +08:00
huang 8270344794 job 2016-08-10 11:01:20 +08:00
huang f2a13540a2 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-10 10:59:10 +08:00
huang e2557aede8 test jenkins 2016-08-10 10:58:47 +08:00
cxt 0cc9fafddb “关注、粉丝”页面中分页显示要紧跟上面的内容 2016-08-09 17:21:11 +08:00
cxt 0ed508a887 题库预览弹窗的调整 2016-08-09 17:09:36 +08:00
huang 5ae59f6b6c 邀请码去掉前后空格 2016-08-09 17:06:50 +08:00
yuanke 66357c4024 修改分享链接 2016-08-09 17:01:06 +08:00
cxt 9594aada50 Merge branch 'cxt_course' into develop 
Conflicts:
	public/javascripts/application.js
 2016-08-09 16:42:23 +08:00
cxt a3011c319b 我的题库显示我的所有作业 2016-08-09 16:40:56 +08:00
huang 1588f5cfca 开发环境下不启动elastic 2016-08-09 16:31:14 +08:00
cxt 8de8035441 班级首页顶部加上主讲老师的链接 2016-08-09 16:17:58 +08:00
huang 4f3b41f323 详情页面提供分页（评论、变更、提交） 2016-08-09 16:11:49 +08:00
cxt 65f6b0fc70 新建课程报500 2016-08-09 15:50:23 +08:00
huang 867434531d pull request 列表页面添加分页 2016-08-09 15:28:06 +08:00
cxt 4a527dc84e Merge branch 'cs_optimize_txz' into develop 2016-08-09 15:25:01 +08:00
cxt 739edd68bf Merge branch 'cxt_course' into develop 2016-08-09 15:24:07 +08:00
cxt c891a41ef1 打印log 2016-08-09 15:23:21 +08:00
huang dcdc09d864 修改gitlab api接口 2016-08-09 15:02:15 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
yuanke 001b48869d 微信：修改一些头像的路径 2016-08-09 14:09:13 +08:00
huang b7bccc7d22 PR添加评论 列表页面 2016-08-09 14:00:36 +08:00
yuanke c787bb5bcd 动态去掉认证，加上出错提示 2016-08-09 10:55:16 +08:00
huang e7f01e5363 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-09 10:54:51 +08:00
huang 6319a1bac6 PR添加评论定义 2016-08-09 10:53:44 +08:00
Tim 5838e8f810 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-09 10:45:33 +08:00
Tim 5dd6244a34 pull request添加留言 2016-08-09 10:45:14 +08:00
cxt 547aae0743 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-09 10:40:25 +08:00
cxt 2951259d23 左侧项目列表的展开 2016-08-09 10:40:00 +08:00
cxt 153e02c4fa 消息列表报500 2016-08-09 10:39:32 +08:00
cxt 40dc9b761f 未配置课程的班级报404 2016-08-09 10:39:12 +08:00
cxt 6c9a4a6620 首页的左侧项目栏无法展开 2016-08-09 10:38:44 +08:00
huang d1b4e83fee 完成pull request 关闭功能 2016-08-09 10:29:18 +08:00
yuanke b53979d91c 修改微信头像不显示的BUG，动态暂时全部去掉认证！ 2016-08-09 10:20:21 +08:00
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。 2016-08-09 09:23:06 +08:00
huang 26c11693fd Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-08 15:24:27 +08:00
huang 518d6bacbe 添加关闭pull request功能 2016-08-08 15:23:55 +08:00
yuanke 762fdfe634 微信修改 2016-08-05 20:31:51 +08:00
huang ecc6f5601e 接受请求后显示admin问题 2016-08-05 20:14:19 +08:00
huang 2bdf3d573b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 19:45:06 +08:00
huang 20fac3852d 合并信息 2016-08-05 19:44:52 +08:00
daiao 85c16ca9e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 19:02:41 +08:00
daiao e89d7398aa 申请管理消息通知 2016-08-05 19:02:05 +08:00
cxt 90e480f7e9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 18:52:39 +08:00
cxt 5b8883960b Merge branch 'cxt_course' into develop 2016-08-05 18:52:09 +08:00
Tim 0200590a70 待处理合并无更新内容时，页尾显示偏移bug 2016-08-05 18:42:14 +08:00
cxt d3db6719eb “我的作业”中编辑作业不跳转到“题库”，而是返回到“我的作业” 2016-08-05 18:41:32 +08:00
huang 910fe0f48c css 2016-08-05 18:23:03 +08:00
huang f54eafce76 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 18:12:29 +08:00
huang a46aba1491 样式调整 2016-08-05 18:12:08 +08:00
cxt 55637808ff 班级作品：两种角色的成员，先学生身份提交作品，再教辅身份评阅自己的作品，评阅结果不能自动刷新 2016-08-05 18:07:54 +08:00
Tim ee1d30b277 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 18:01:23 +08:00
Tim cd30f94d72 题库发送预览弹框位置及可拖拽js更新 2016-08-05 18:01:11 +08:00
huang 42e616bdea Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 18:00:32 +08:00
huang 7c484b4f4a 页面显示问题 2016-08-05 18:00:10 +08:00
Tim 920e470f6d pull request列表省略号显示 2016-08-05 17:51:39 +08:00
cxt f5a2d6acdb 班级作品：学生提交作品弹出作品校验框，点击重试后，作品列表中默认生成的作品记录就没有了 2016-08-05 17:33:31 +08:00
Tim d4f08f6498 课程logo替换，邀请码样式更改，班级路径显示主讲教师 2016-08-05 17:30:13 +08:00
cxt ea4f0d7d9d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 16:52:01 +08:00
cxt aaaeb4b8da 子域名申请消息报错 2016-08-05 16:51:51 +08:00
huang 3afdeda4d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 16:42:44 +08:00
huang af7e507279 合并权限 2016-08-05 16:42:06 +08:00
huang 3ef2509d27 报告人员加入项目不用提醒 2016-08-05 16:35:22 +08:00
cxt e7e873e0df Merge branch 'dev_shcool' into develop 
Conflicts:
	app/helpers/users_helper.rb
 2016-08-05 16:32:10 +08:00
cxt fb5a969fd3 消息弹窗 2016-08-05 16:30:08 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
daiao 7fbca5f260 单位审查消息及其BUG修复 2016-08-05 16:14:26 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang dd768c2913 Merge branch 'cs_optimize_txz' into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-08-05 15:30:03 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
huang 43a4e0a2bf fork成功不跳转提示 2016-08-05 15:23:52 +08:00
huang 308b050612 link to路由问题 2016-08-05 14:43:44 +08:00
huang b62ac02c15 自身分支创建PR修改 2016-08-05 14:19:09 +08:00
Tim 56452d69f4 侧导航字体大小，颜色更改 2016-08-05 14:11:35 +08:00
huang 4ec8cc9a50 PR新建相关功能完善 2016-08-05 11:19:36 +08:00
huang f3c0c25d76 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-05 11:10:59 +08:00
huang b86b2299a7 fork分支选择 js 2016-08-05 11:10:39 +08:00
Tim c679b986d6 侧导航新增请求快捷链接 2016-08-05 11:07:44 +08:00
huang b297446778 select选择框 2016-08-05 10:42:06 +08:00
cxt f9bfe278c0 多重身份的学生匿评变为了教辅评分 2016-08-05 10:03:47 +08:00
huang ab6acb460e forke项目发送pull request API 2016-08-04 19:32:44 +08:00
huang f4bda16469 fork分支PR 2016-08-04 18:30:04 +08:00
yuanke bb46aa4745 微信点击已审批模版消息进入界面显示修改 2016-08-04 18:09:54 +08:00
huang 5419103268 修改API(gitlab中创建所有pullrequest为Admin的问题) 2016-08-04 17:01:19 +08:00
cxt b7c05fed4a 首页样式和js调整 2016-08-04 16:33:51 +08:00
huang 99fa39371d 接受请求ajax刷新 2016-08-04 15:36:02 +08:00
yuanke 55afb84aef 模版消息标题加上句号，审核模版消息再次点击显示修改 2016-08-04 15:32:25 +08:00
huang 9eb084c3bd Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/_show.html.erb
 2016-08-04 15:08:05 +08:00
huang 515649beb6 接受PR局部刷新及跳转 2016-08-04 15:07:15 +08:00
Tim 33467d3152 已处理页面样式；新建时选择项目刷新分支js 2016-08-04 15:04:27 +08:00
yuanke ee019cd364 修改测试版微信加入项目审核通知 2016-08-04 14:47:39 +08:00
huang 54a9fadbd1 判断合并和未合并的pr 2016-08-04 14:24:32 +08:00
huang 362e95d103 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-04 14:11:53 +08:00
huang 7084a3fed9 新建pull request的时候JS控制标题不能为空 2016-08-04 14:11:24 +08:00
yuanke 12a9c95c01 微信项目及班级邀请码相关BUG修改 2016-08-04 14:07:35 +08:00
Tim 6f1b7f827e Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-04 14:05:07 +08:00
Tim b8a40862ce 改变行代码格式化，不折行 2016-08-04 14:04:55 +08:00
huang 1f5c4a800f 代码没有改动时候提示 2016-08-04 11:35:04 +08:00
huang 0b3e1f558c Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/show.html.erb
 2016-08-04 11:15:38 +08:00
huang 21747d02a2 新建PR成功后JS跳转HTML跳转，相关页面局部刷新，及错误提示 2016-08-04 11:13:31 +08:00
cxt 6c7b53f7d4 首页左侧栏 2016-08-04 11:05:34 +08:00
yuanke aaa1c01eed 微信动态分享图片修改 2016-08-04 10:47:35 +08:00
Tim f444d6fab0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/_form.html.erb
 2016-08-04 10:46:18 +08:00
Tim cedff021ad 分支下拉框样式；改动样式；无合并内容提示 2016-08-04 10:44:48 +08:00
huang a62ede1a33 先建pull request及局部刷新 2016-08-04 10:08:13 +08:00
yuanke c0579de57d 微信分享内容修改 2016-08-04 10:00:55 +08:00
yuanke 17c98eb9fe 微信分享修改 2016-08-04 09:08:18 +08:00
huang 2e91da4f28 项目分支获取 2016-08-03 17:37:37 +08:00
daiao 7f62de59e1 优化周二代码审查的代码 2016-08-03 17:36:04 +08:00
huang c20b679c22 PR new调整 2016-08-03 17:04:02 +08:00
huang f8b53b8dfc Pull request列表页面分类 2016-08-03 16:54:37 +08:00
yuanke 29e707a88d 微信加入项目修改、二级回复三个回复时多了个边框BUG修改等 2016-08-03 16:31:33 +08:00
huang 9f9eed2e27 隐藏编辑功能 2016-08-03 16:05:29 +08:00
huang 22a8adb64e 添加统计数目 2016-08-03 16:02:42 +08:00
huang b8cccdffda 完成changes数据获取及展示 2016-08-03 15:56:07 +08:00
huang 8e329db4d8 pull request commits样式调整 2016-08-03 15:16:28 +08:00
huang 27e755a0a9 数据获取及展示 2016-08-03 15:06:10 +08:00
cxt f262447ff1 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/user_homeworks.html.erb
 2016-08-03 15:01:43 +08:00
cxt cecf917764 从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用” 2016-08-03 15:00:16 +08:00
Tim a5fe620452 题库翻页居中对齐 2016-08-03 14:57:02 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00
huang 0a9224d036 每次请求提交的代码 2016-08-03 14:43:27 +08:00
cxt bae775ec34 题库的搜索调整 2016-08-03 14:06:47 +08:00
huang be081f5c66 添加Api（提交内容，改动）及相关方法路由 2016-08-03 13:57:59 +08:00
cxt acc3ba121f 测试集的显示、新版分页 2016-08-03 13:46:59 +08:00
cxt 718b13e6c1 新版题库 2016-08-03 11:12:55 +08:00
huang 1cb6809bdf Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/new.html.erb
 2016-08-03 11:09:14 +08:00
huang 182c861b30 创建pull request 2016-08-03 11:07:49 +08:00
Tim e7fa38e52c pull request show页面 2016-08-03 11:00:31 +08:00
yuanke 6ee6cdf28f 微信项目加入审核修改 2016-08-03 10:56:55 +08:00
daiao 5f969c6593 单位审核相关Bug修复 2016-08-03 10:36:03 +08:00
yuanke 65719add19 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-03 09:37:36 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
guange 6f2b84570f 去除调试模式 2016-08-02 17:48:51 +08:00
guange 2a67ec5407 配置登录页菜单 2016-08-02 17:27:40 +08:00
guange 2632f7aa59 引入wechat js sdk 2016-08-02 17:01:10 +08:00
huang 5e9c27b63d 代码封装 2016-08-02 16:38:56 +08:00
Tim b91bb1f0d2 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:37:41 +08:00
Tim c8dce2c2fc 请求处理页面 2016-08-02 16:37:30 +08:00
huang 56a444dac0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:34:31 +08:00
huang 3ce1ac80b4 pull_request ---> new 2016-08-02 16:34:20 +08:00
Tim 09f25588a8 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:10:34 +08:00
Tim 7e440596ab 新建请求，js效果 2016-08-02 16:10:25 +08:00
huang 20bdd23665 pull requtst show 2016-08-02 16:06:51 +08:00
yuanke a4281b4934 Merge branch 'develop' into weixin_guange 2016-08-02 15:51:29 +08:00
yuanke 614e877e6e 微信项目和班级加入修改 2016-08-02 15:50:15 +08:00
huang d286d3fe06 pullrequest头部 2016-08-02 15:44:25 +08:00
Tim 3e95b070d0 合并请求代码 2016-08-02 15:00:05 +08:00
huang 7658844a28 鼠标经过弹框消息提示 2016-08-02 14:53:33 +08:00
huang 94b36e227c 申请加入项目消息刷新，同时更新其它管理员的消息状态 2016-08-02 13:03:33 +08:00
huang 0b113bb985 项目邀请码识别小写 2016-08-02 11:25:19 +08:00
Tim 65d4af1307 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 10:03:57 +08:00
Tim 9af8757ceb 项目合并请求 2016-08-02 10:03:42 +08:00
huang 3660f8cbce gitlab相关方法的封装 2016-08-01 17:38:37 +08:00
Tim 1fc617d5fa pull request页面删除 2016-08-01 16:57:55 +08:00
Tim e33bbfff3f Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-01 16:53:44 +08:00
huang b718803bd9 修改控制器名称及控制器查询访问权限 2016-08-01 16:54:31 +08:00
Tim be36755d95 代码合并页面 2016-08-01 16:53:33 +08:00
huang 685f9d8090 项目左侧权限控制 2016-08-01 16:19:15 +08:00
daiao 24783705b5 Merge branch 'dev_shcool' into develop 2016-08-01 16:11:47 +08:00
daiao 0ffeec64e3 单位审核bug修复 2016-08-01 16:10:57 +08:00
huang 7c4759f3b7 项目左侧添加pull request入口 2016-08-01 15:52:05 +08:00
yuanke dde89b72fa 加入项目二维码修改 2016-08-01 15:50:21 +08:00
daiao fc1fc0bd7d 单位审核bug修复 2016-08-01 15:44:18 +08:00
yuanke f016027e8f 微信加入项目修改 2016-08-01 15:35:29 +08:00
huang 96b04f39b1 pull requests框架搭建（路由控制器、views） 2016-08-01 15:33:47 +08:00
Tim 08b8e3f1cb 加入班级，项目弹框定位js重写 2016-08-01 15:21:23 +08:00
yuanke 2c86ae3eb2 二维码识别 项目和班级区分 2016-08-01 15:09:36 +08:00
yuanke c1bd3b6bf1 增加日志测试 2016-08-01 14:30:31 +08:00
cxt 18539b45de Merge branch 'dev_shcool' into develop 2016-08-01 14:03:58 +08:00
cxt 6d17329a6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-01 13:58:02 +08:00
cxt 3bc696a597 申请学校的更改 2016-08-01 13:57:55 +08:00
daiao 5272f20de8 单位审核bug的修复 2016-08-01 13:56:37 +08:00
yuanke fa43924330 微信项目二维码修改 2016-08-01 13:54:10 +08:00
huang c7f2ab0415 修复创建英文名字的项目标题为“为项目讨论区的问题” 2016-08-01 13:51:11 +08:00
yuanke 84f0069cbd 打开项目邀请码信息 2016-08-01 11:30:25 +08:00
yuanke 4c9e183cd0 微信菜单点击加入项目修改 2016-08-01 11:24:27 +08:00
yuanke bb0bfa21cc 加入项目邀请码修改 2016-08-01 11:18:01 +08:00
yuanke f0cf7adcdf 加入项目邀请码 2016-08-01 11:14:03 +08:00
huang 3feb0680cc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-01 09:50:31 +08:00
huang f7e8c5232c 个人主页加入项目，如果已经申请了则提示已申请 2016-08-01 09:50:05 +08:00
cxt 87e3707b52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:54:17 +08:00
cxt 0ac906a5cf 消息列表报500 2016-07-29 23:54:10 +08:00
daiao 8e805d382a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:50:39 +08:00
daiao 6ea829131b 单位列表发送消息样式调整 2016-07-29 23:48:12 +08:00
huang 30ce469483 申请加入项目删除邮件 2016-07-29 23:37:31 +08:00
daiao 15227907ea Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:23:11 +08:00
huang 07ff420a6a 退出项目的时候清楚申请信息 2016-07-29 23:23:04 +08:00