Commit Graph

17889 Commits

Author SHA1 Message Date
cxt fced64cc96 点击子域名申请消息报404 2016-11-29 16:22:58 +08:00
cxt 4814c1db3d 叠层中的回复、赞的显隐 2016-11-29 15:29:30 +08:00
daiao b9ef98bc19 Merge branch 'dai_ao' into develop 2016-11-29 14:46:19 +08:00
daiao b2de81394e 项目PullRequest列表,显示创建者的名字 2016-11-29 14:44:28 +08:00
cxt 97f40e4697 匿评状态的调整 2016-11-29 14:38:26 +08:00
cxt cb67e136d6 作业的关联项目列表显示内容更新 2016-11-29 14:06:25 +08:00
daiao e7b2b1edfa Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
	app/controllers/pull_requests_controller.rb
2016-11-29 12:28:31 +08:00
daiao 43cd4f55ac Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
	app/controllers/pull_requests_controller.rb
2016-11-29 12:27:40 +08:00
daiao e4d43cc163 项目pull request 项目消息框架搭建 2016-11-29 12:25:15 +08:00
daiao fe18d17a82 Merge branch 'dai_ao' into develop 2016-11-29 12:11:47 +08:00
cxt fcadf65688 班级学生列表:删除成员时,成员列表未自动刷新 2016-11-29 11:14:35 +08:00
cxt 896f8a2ac7 班级活跃度个数为0时不显示 2016-11-29 11:03:05 +08:00
daiao 7ea9f00054 pull request 改动对比显示 代码封装 2016-11-29 10:52:57 +08:00
cxt 4c45518913 管理员界面无法搜索英文名称的课程 2016-11-29 10:22:54 +08:00
cxt 3f35b7f806 贴吧回复改版 2016-11-29 09:36:38 +08:00
daiao ece69b9e7a 完成项目比较功能(样式未完,待设计) 2016-11-28 17:16:43 +08:00
daiao f359b26344 我的issue导出excel功能 2016-11-28 16:50:09 +08:00
daiao 2cbc7bca33 我的Issue导出功能 2016-11-28 16:11:52 +08:00
daiao 3f5e840e76 commit_diff json数据转换成OpenStruct类型 2016-11-28 16:08:04 +08:00
daiao 2c664dcd21 我的issue导出功能(未完) 2016-11-28 15:32:02 +08:00
huang ace999e331 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-28 15:30:24 +08:00
huang 082f397fd5 Merge branch 'develop' into dev_newproject 2016-11-28 15:26:32 +08:00
huang 6d14353ef7 commit_diff 2016-11-28 15:25:26 +08:00
huang 5601ae0f54 pull request的一些提示改进 2016-11-28 12:18:03 +08:00
daiao 2a768cbd49 Innov用户消息通知报500,并将Pull request的登录名改为姓名 2016-11-28 11:32:28 +08:00
huang 42e301659e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-28 09:24:29 +08:00
daiao d7e067a82e Merge branch 'develop' into dai_ao 2016-11-28 08:43:45 +08:00
guange efb0c9917c . 2016-11-26 17:49:36 +08:00
guange a2439f0a14 git文件比较功能 2016-11-26 17:47:39 +08:00
guange c2629ebdc0 有几处相同的content key 2016-11-26 17:06:17 +08:00
huang ecf5101ef2 pull request 列表增加源项目/姓名 目标项目/姓名 2016-11-25 20:34:59 +08:00
huang 99ac546782 Merge branch 'develop' of https://git.trustie.net/Hjqreturn/trustieforge into develop 2016-11-25 20:14:02 +08:00
huang 8318bced7f pull request添加权限控制 2016-11-25 20:13:37 +08:00
cxt e202a7b99c 二级回复 2016-11-25 20:13:01 +08:00
cxt ba03065f9f “未参与”状态的还原 2016-11-25 19:58:27 +08:00
cxt c965f72ce3 还原回复的隐藏 2016-11-25 19:19:38 +08:00
huang 21b13e33ce pull request的时候各种异常类型打印 2016-11-25 19:05:37 +08:00
cxt ae7b8b2857 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-25 18:40:18 +08:00
cxt 9115020a43 匿评状态调整 2016-11-25 18:40:04 +08:00
黄井泉 d54cee6fc5 Merge branch 'dai_ao' into 'develop'
项目头部样式修改



See merge request !26
2016-11-25 18:05:07 +08:00
cxt 8a52e136cf 点击展开回复 2016-11-25 18:01:50 +08:00
黄井泉 735e38745e Merge branch 'yuanke_youhua' into 'develop'
KE工具栏不换行

KE工具栏不换行

See merge request !24
2016-11-25 18:00:04 +08:00
daiao 581250cfea Merge branch 'develop' into dai_ao 2016-11-25 17:55:27 +08:00
黄井泉 3c74bc7465 Merge branch 'develop' into 'develop'
pull requet文件更新对比 正则修改



See merge request !25
2016-11-25 17:54:12 +08:00
huang 872d8295e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-25 17:51:30 +08:00
huang 9c12e774d1 pull request 文件内容正则修改 2016-11-25 17:50:37 +08:00
yuanke b6172fc31f Merge branch 'develop' into yuanke_youhua 2016-11-25 17:45:01 +08:00
yuanke 248276d088 KE工具栏不换行 2016-11-25 17:43:52 +08:00
daiao c640535cca 项目头部样式调整 2016-11-25 17:39:55 +08:00
黄井泉 00c8673f4a Merge branch 'dai_ao' into 'develop'
项目头部样式修改,fork数目不对



See merge request !23
2016-11-25 17:19:15 +08:00