Commit Graph

17916 Commits

Author SHA1 Message Date
huang c3745be0eb 项目版本库历史记录代码优化及界面调整 2016-12-02 10:21:48 +08:00
陈晓婷 e8ea252e6d Merge branch 'cxt_course' into 'cxt_course'
未参与匿评的缺评扣分



See merge request !33
2016-12-02 10:19:52 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop'
课程相关bug修复;叠层回复的“回复”、“赞”的显隐



See merge request !32
2016-12-02 10:14:07 +08:00
cxt 0afed6624d 未参与匿评的缺评扣分 2016-12-02 10:04:11 +08:00
daiao 7a8c937173 项目issue列表,讨论区,版本库,pullrequests,里程碑及其里程碑详情页面,数据为空时,页面调整 2016-12-01 17:29:14 +08:00
huang 9ee36f05bc 资源库专业分类model创建 2016-12-01 15:57:42 +08:00
cxt 423018fa15 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-01 15:47:46 +08:00
cxt 11256c213f Merge remote-tracking branch 'remotes/cxt_new/develop' into cxt_course 2016-12-01 15:44:38 +08:00
daiao c745f69e95 项目成员列表,fork列表,关注列表样式调整。并修改小铃铛消息的班级加入的申请文字 2016-12-01 15:44:15 +08:00
cxt c33bf1b163 测验头部和新建题目的改版 2016-12-01 15:42:07 +08:00
黄井泉 97e9da652b Merge branch 'develop' into 'develop'
消息列表代码优化

消息列表代码优化

See merge request !31
2016-12-01 14:43:26 +08:00
daiao eeb57401d9 优化消息列表代码 2016-12-01 14:40:58 +08:00
daiao c960b401f6 修复消息列表为匿名用户 2016-12-01 14:16:36 +08:00
daiao 233ce0428b 消息列表改为用户名 2016-12-01 13:55:15 +08:00
daiao 2e5cd96bb9 pullrequest发送消息 2016-12-01 11:31:48 +08:00
cxt a2af654a91 具体作业的标题行右侧显示内容变更 2016-11-30 15:53:51 +08:00
黄井泉 494e581beb Merge branch 'dev_newproject' into 'develop'
版本库文件历史变更显示(行数、变更内容等)、pull request的一些该井



See merge request !27
2016-11-30 11:01:20 +08:00
huang 890b0e80fd 邮件发送至发送邮件重要信息, 去掉掉按天发送功能 2016-11-30 10:58:13 +08:00
cxt c47f41307e 分班的学生列表,请将“导出成绩”直接显示出来,且不需要“成员管理”入口 2016-11-30 10:44:15 +08:00
cxt f4ea4e2add 班级的学生列表,标题行显示的“导出列表”换成“导出成绩” 2016-11-30 10:40:53 +08:00
huang dbc8c5811a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
	app/controllers/pull_requests_controller.rb
2016-11-30 09:55:45 +08:00
huang 934b219454 pull request创建的一些改进 2016-11-30 09:52:59 +08:00
huang 9fa4b5613a pullrequest发送消息 2016-11-30 08:37:56 +08:00
huang 1299be5384 pullrequest(井泉修改) 2016-11-29 18:22:43 +08:00
daiao 2cee4448ea pullrequest消息通知(未完) 2016-11-29 18:19:29 +08:00
huang a19f6ffd38 项目文件历史记录显示内容区分历史新增和删除
项目变更文件高亮显示
2016-11-29 17:05:14 +08:00
daiao ea30873665 创建,或关闭PullRequest时,发送消息(未完) 2016-11-29 17:02:36 +08:00
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