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

1845 Commits

Author SHA1 Message Date
cxt a03c0f68c2 提交作品 2016-12-23 16:58:50 +08:00
cxt 544702e11f 新建题目 2016-12-23 14:41:21 +08:00
cxt 5a27b84e97 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 17:13:25 +08:00
cxt 9331525304 竞赛消息的调整 2016-12-22 17:13:10 +08:00
huang b74c034237 项目配置添加ke编辑 base中去掉配置 2016-12-22 16:39:54 +08:00
huang 55e1b0d8f2 settings 路由， 组织管理员、裁判、参赛人员方法封装 2016-12-22 14:50:26 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
huang 611494ec93 系统消息只显示30天前的 2016-12-16 19:36:37 +08:00
huang f71ccb6c67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 16:30:25 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
cxt bc16476646 首页待办任务个数的计算调整 2016-12-16 15:28:45 +08:00
huang 7f3b29830e 个人主页任务显示tip简化，及没有内容不显示 2016-12-16 14:21:51 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
huang 5b93bf2b4d pull request中如果登录名在Trustie中不存在则有匿名改成登录名；匿名用户改成邮箱显示 2016-12-15 14:36:08 +08:00
daiao 0f328d36e1 代码改进 2016-12-12 10:00:05 +08:00
daiao fb62d4f1b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-12-09 20:00:07 +08:00
黄井泉 b8eee2b131 Merge branch 'cxt_course' into 'develop' 
本周上线任务



See merge request !50
 2016-12-09 16:43:00 +08:00
daiao 224c0b686c 个人首页的课程社区 2016-12-08 09:59:22 +08:00
huang a1a96e4667 issue编辑优化，性能简单优化 2016-12-08 09:55:41 +08:00
huang 122946804d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-12-08 09:36:36 +08:00
huang c84d17bd6a 用户邮箱没注册时候显示用户邮箱方法封装 2016-12-08 09:36:01 +08:00
cxt c24f9b8c3b 作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评” 2016-12-07 17:23:52 +08:00
daiao 69d9228808 个人主页的消息页面 2016-12-07 15:13:51 +08:00
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00
cxt 5a6e64beb2 Revert "测验头部和新建题目的改版" 
This reverts commit c33bf1b163.

Conflicts:
	public/stylesheets/css/courses.css
 2016-12-06 15:02:32 +08:00
cxt 5bbe9e71ba Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into sx_cxt 
Conflicts:
	db/schema.rb
 2016-12-06 14:12:40 +08:00
daiao 35fdf9a8a7 个人首页头部及其左侧导航(未完) 2016-12-06 09:36:13 +08:00
huang 66066e6899 commit导出方法及显示页面 2016-12-05 14:52:46 +08:00
huang 20e07bb1ba 学生列表得分显示 2016-12-03 10:56:35 +08:00
黄井泉 42775a82f9 Merge branch 'cxt_course' into 'develop' 
班级作业增加设置选项：成绩公开范围



See merge request !37
 2016-12-02 14:53:55 +08:00
cxt 2fd4cb9064 班级作业增加设置选项：成绩公开范围 2016-12-02 13:30:49 +08:00
daiao 77f252b538 Merge branch 'develop' into dai_ao 
Conflicts:
	app/controllers/pull_requests_controller.rb
	app/views/users/_user_message_course.html.erb
	app/views/users/_user_message_forge.html.erb
 2016-12-02 13:26:41 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop' 
课程相关bug修复；叠层回复的“回复”、“赞”的显隐



See merge request !32
 2016-12-02 10:14:07 +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 c33bf1b163 测验头部和新建题目的改版 2016-12-01 15:42:07 +08:00
daiao 2e5cd96bb9 pullrequest发送消息 2016-12-01 11:31:48 +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
daiao 2cee4448ea pullrequest消息通知（未完） 2016-11-29 18:19:29 +08:00
daiao b2de81394e 项目PullRequest列表，显示创建者的名字 2016-11-29 14:44:28 +08:00
cxt 3f35b7f806 贴吧回复改版 2016-11-29 09:36:38 +08:00
huang 42e301659e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-28 09:24:29 +08:00
huang ecf5101ef2 pull request 列表增加源项目/姓名 目标项目/姓名 2016-11-25 20:34:59 +08:00
cxt e202a7b99c 二级回复 2016-11-25 20:13:01 +08:00
cxt c965f72ce3 还原回复的隐藏 2016-11-25 19:19:38 +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
daiao f1b6e67e50 项目头部样式修改，fork数目错误 2016-11-25 17:10:49 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
daiao 599d233176 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 2016-11-25 10:49:57 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00