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

9725 Commits

Author SHA1 Message Date
huang 5ad063b830 记录接受PR用户信息，并且唯一性判断 2016-08-10 16:27:41 +08:00
huang 8af8147ebb 代码分析列表加上时间 2016-08-10 14:47:50 +08:00
cxt a50ac2d79d 禁用匿评的作业提交时不要显示“提示：作品名称和描述中不要出现真实的姓名信息”的提示 2016-08-10 14:22:05 +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
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
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
huang b7bccc7d22 PR添加评论 列表页面 2016-08-09 14:00:36 +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
huang d1b4e83fee 完成pull request 关闭功能 2016-08-09 10:29:18 +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
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
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
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
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
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
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
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
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
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
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
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